Fixed issues with file list length and output params

viniciusam · viniciusam · commit e0de1b4c149e · 2017-04-28T22:03:05.000-03:00
diff --git a/client_source/sqlplus/file_list.bat b/client_source/sqlplus/file_list.bat
@@ -15,12 +15,12 @@ echo begin>%sqlFile%
 echo ^  null;>>%sqlFile%
 
 if not %sourcePath% == "-" (
-    echo   :l_source_files := q'[ut_varchar2_list(>>%sqlFile%
+    echo   open :l_source_files for select * from table(ut_varchar2_list(>>%sqlFile%
     call :FileList %sourcePath%
 )
 
 if not %testPath% == "-" (
-    echo   :l_test_files := q'[ut_varchar2_list(>>%sqlFile%
+    echo   open :l_test_files for select * from table(ut_varchar2_list(>>%sqlFile%
     call :FileList %testPath%
 )
 
@@ -30,9 +30,9 @@ echo />>%sqlFile%
 goto :eof
 
 :FileList
-for /f "tokens=* delims= " %%a in ('dir %projectPath%\%1\* /B /S') do (
+for /f "tokens=* delims= " %%a in ('dir %projectPath%\%1\* /B /S /A:-D') do (
     set "filePath=%%a"
     set filePath=!filePath:%projectPath%=!
     echo ^      '!filePath!^',>>%sqlFile%
 )
-echo       null)]';>>%sqlFile%
+echo       null));>>%sqlFile%
diff --git a/client_source/sqlplus/file_list.sh b/client_source/sqlplus/file_list.sh
@@ -13,7 +13,7 @@ function fileList {
     for f in $(find $projectPath/$1/* -type f | sed "s|$projectPath/||"); do
         echo "      '$f'," >> $sqlFile
     done
-    echo "      null)]';" >> $sqlFile
+    echo "      null));" >> $sqlFile
 }
 
 echo "begin" > $sqlFile
diff --git a/client_source/sqlplus/ut_run.sql b/client_source/sqlplus/ut_run.sql
@@ -130,8 +130,8 @@ var l_paths          varchar2(4000);
 var l_color_enabled  varchar2(5);
 var l_source_path    varchar2(4000);
 var l_test_path      varchar2(4000);
-var l_source_files   clob;
-var l_test_files     clob;
+var l_source_files   refcursor;
+var l_test_files     refcursor;
 var l_run_params_cur refcursor;
 var l_out_params_cur refcursor;
 /*
@@ -186,8 +186,8 @@ declare
     for param in(
       with
         param_vals as(
-          select regexp_substr(column_value,'-([fos])\=?(.*)',1,1,'c',1) param_type,
-                 regexp_substr(column_value,'-([fos])\=(.*)',1,1,'c',2) param_value
+          select regexp_substr(column_value,'-([a-z_]+)\=?(.*)',1,1,'c',1) param_type,
+                 regexp_substr(column_value,'-([a-z_]+)\=?(.*)',1,1,'c',2) param_value
           from table(a_params)
           where column_value is not null)
       select param_type, param_value
@@ -349,6 +349,7 @@ spool &&client_path/run_in_background.sql.tmp
 declare
   l_reporter_id   varchar2(250);
   l_reporter_name varchar2(250);
+  l_file_path     varchar2(32767);
   procedure p(a_text varchar2) is begin dbms_output.put_line(a_text); end;
 begin
   p(  'set serveroutput on size unlimited format truncated');
@@ -364,10 +365,22 @@ begin
     loop
       fetch :l_run_params_cur into l_reporter_id, l_reporter_name;
       exit when :l_run_params_cur%notfound;
-        if lower(l_reporter_name) in ('ut_coveralls_reporter', 'ut_coverage_sonar_reporter') then
-          p('  v_reporter := '||l_reporter_name||'( a_file_paths => '||:l_source_files||' );');
+        if lower(l_reporter_name) in ('ut_coveralls_reporter', 'ut_coverage_sonar_reporter', 'ut_coverage_html_reporter') then
+          p('  v_reporter := '||l_reporter_name||'( a_file_paths => ut_varchar2_list(');
+          loop
+            fetch :l_source_files into l_file_path;
+            exit when :l_source_files%notfound or l_file_path is null;
+            p('      '''||l_file_path||''',');
+          end loop;
+            p('      null));');
         elsif lower(l_reporter_name) = ('ut_sonar_test_reporter') then
-          p('  v_reporter := '||l_reporter_name||'( a_file_paths => '||:l_test_files||' );');
+          p('  v_reporter := '||l_reporter_name||'( a_file_paths => ut_varchar2_list(');
+          loop
+            fetch :l_test_files into l_file_path;
+            exit when :l_test_files%notfound or l_file_path is null;
+            p('      '''||l_file_path||''',');
+          end loop;
+            p('      null));');
         else
           p('  v_reporter := '||l_reporter_name||'();');
         end if;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ function fileList {`
`13`	`13`	`for f in $(find $projectPath/$1/* -type f \| sed "s\|$projectPath/\|\|"); do`
`14`	`14`	`echo " '$f'," >> $sqlFile`
`15`	`15`	`done`
`16`		`- echo " null)]';" >> $sqlFile`
	`16`	`+ echo " null));" >> $sqlFile`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`echo "begin" > $sqlFile`