Merge branch 'develop' into bugfix/fix_for_duplicate_paths

jgebal · web-flow · commit d28bdddf0e65 · 2017-05-12T01:03:06.000+01:00
diff --git a/client_source/sqlplus/file_list b/client_source/sqlplus/file_list
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+
+# All parameters are required. This way, users can't pass empty string as parameter.
+invalidArgs=0
+[ -z "$1" ] && invalidArgs=1
+[ -z "$2" ] && invalidArgs=1
+[ -z "$3" ] && invalidArgs=1
+[ -z "$4" ] && invalidArgs=1
+
+if [ $invalidArgs -eq 1 ]; then
+    echo Usage: ut_run.sh "project_path" "scan_path" "sql_param_name" "output_file"
+    exit 1
+fi
+
+# Remove trailing slashes.
+projectPath=${1%/}
+scanPath=$2
+sqlParamName=$3
+outputFile=$4
+
+fullScanPath="$projectPath/$scanPath"
+
+if [ ! -d "$fullScanPath" ]; then
+    echo "begin" > $outputFile
+    echo "  open :$sqlParamName for select null from dual;" >> $outputFile
+    echo "end;" >> $outputFile
+    echo "/" >> $outputFile
+    exit 0
+fi
+
+echo "declare" > $outputFile
+echo "    l_list ut_varchar2_list := ut_varchar2_list();" >> $outputFile
+echo "begin" >> $outputFile
+for f in $(find $fullScanPath/* -type f | sed "s|$projectPath/||"); do
+    echo "    l_list.extend; l_list(l_list.last) := '$f';" >> $outputFile
+done
+echo "    open :$sqlParamName for select * from table(l_list);" >> $outputFile
+echo "end;" >> $outputFile
+echo "/" >> $outputFile
diff --git a/client_source/sqlplus/file_list.bat b/client_source/sqlplus/file_list.bat
@@ -0,0 +1,43 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+REM All parameters are required. This way, users can't pass empty string as parameter.
+set invalidArgs=0
+if "%1" == "" set invalidArgs=1
+if "%2" == "" set invalidArgs=1
+if "%3" == "" set invalidArgs=1
+if "%4" == "" set invalidArgs=1
+
+if %invalidArgs% == 1 (
+    echo Usage: ut_run.bat "project_path" "scan_path" "sql_param_name" "output_file"
+    exit /b 1
+)
+
+set projectPath=%~1
+set scanPath=%~2
+set sqlParamName=%~3
+set outputFile=%~4
+
+REM Remove trailing slashes.
+if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
+set fullScanPath="%projectPath%\%scanPath%"
+
+if not exist "%fullScanPath%\*" (
+    echo begin>%outputFile%
+    echo ^  open :%sqlParamName% for select null from dual;>>%outputFile%
+    echo end;>>%outputFile%
+    echo />>%outputFile%
+    exit /b 0
+)
+
+echo declare>%outputFile%
+echo ^    l_list ut_varchar2_list := ut_varchar2_list();>>%outputFile%
+echo begin>>%outputFile%
+for /f "tokens=* delims= " %%a in ('dir %fullScanPath%\* /B /S /A:-D') do (
+    set "filePath=%%a"
+    set filePath=!filePath:%projectPath%\=!
+    echo ^    l_list.extend; l_list^(l_list.last^) := '!filePath!^';>>%outputFile%
+)
+echo ^    open :%sqlParamName% for select * from table(l_list);>>%outputFile%
+echo end;>>%outputFile%
+echo />>%outputFile%
diff --git a/client_source/sqlplus/ut_run b/client_source/sqlplus/ut_run
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+clientDir="$(dirname "$(readlink -f "$0")")"
+projectDir="$(pwd)"
+
+if [[ "$clientDir" != "${clientDir% *}" ]]; then
+    echo "Error: ut_run script path cannot have spaces."
+    exit 1
+fi
+
+if [[ "$#" -eq 0 ]] ; then
+    echo "Usage: ut_run user/password@database [options...]"
+    exit 1
+fi
+
+sqlplus /nolog @"$clientDir/ut_run.sql" "$clientDir" "$projectDir" "$@"
diff --git a/client_source/sqlplus/ut_run.bat b/client_source/sqlplus/ut_run.bat
@@ -0,0 +1,16 @@
+@echo off
+
+set clientDir=%~dp0
+set projectDir=%__CD__%
+
+if not "%clientDir%" == "%clientDir: =%" (
+    echo Error: ut_run script path cannot have spaces.
+    exit /b 1
+)
+
+if "%1" == "" (
+    echo Usage: ut_run user/password@database [options...]
+    exit /b 1
+)
+
+sqlplus /nolog @"%clientDir%\ut_run.sql" '%clientDir%' '%projectDir%' %*
diff --git a/client_source/sqlplus/ut_run.sql b/client_source/sqlplus/ut_run.sql
diff --git a/docs/userguide/ut_run-script.md b/docs/userguide/ut_run-script.md
