Merge pull request #29 from jasonlyle88/cross-os-nolog

Improve ability to run on windows

Author: jasonlyle88

source/sqlclUnitTest.sh

@@ -158,6 +158,23 @@ function main() {
         printf -- '%s' "${testResultString}"
     } # getTestResultColorizedString
 
+    function convertToWindowsPath() {
+        local originalUnixPath="$1"
+        local unixPath="${originalUnixPath}"
+        local windowsPath
+
+        # Convert drive letter
+        if [[ "${unixPath:0:1}" == '/' ]]; then
+            windowsPath="${unixPath:1:1}:\\"
+
+            unixPath="${unixPath:3}"
+        fi
+
+        windowsPath="${windowsPath}$(printf -- '%s' "${unixPath}" | sed 's|/|\\|g')"
+
+        printf -- '%s\n' "${windowsPath}"
+    } # convertToWindowsPath
+
     function executeUnitTest() {
         local testType="$1"
         local testFile="$2"
@@ -174,6 +191,10 @@ function main() {
         local resultFile
         local logFile
         local wrapperFile
+        local nologParam
+        local testFileOS
+        local testFilenameOS
+        local testDirectoryOS
 
         testDirectory="$(dirname "${testFile}")"
         testFilename="$(basename "${testFile}")"
@@ -182,6 +203,23 @@ function main() {
 
         cd "${testDirectory}" || return 1
 
+        # Determine cross-os specific variables needed for execute
+        if [[ "${OSTYPE}" == "cygwin" || "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]; then
+            # Handle Windows systems
+            nologParam="//nolog"
+
+            testFileOS="$(convertToWindowsPath "${testFile}")"
+            testDirectoryOS="$(convertToWindowsPath "${testDirectory}")"
+            testFilenameOS="$(convertToWindowsPath "${testFilename}")"
+        else
+            # Handle linux/unix based systems
+            nologParam="/nolog"
+
+            testFileOS="${testFile}"
+            testDirectoryOS="${testDirectory}"
+            testFilenameOS="${testFilename}"
+        fi
+
         # Make sure SQLPATH is not set for SQLcl execution so no login.sql
         # script is runs
         export SQLPATH=""
@@ -202,7 +240,7 @@ function main() {
 				set verify on
 				set echo on
 				show connection
-				@ "${testFile}" "${functionUniqueIdentifier}" "${testDirectory}"
+				@ "${testFileOS}" "${functionUniqueIdentifier}" "${testDirectoryOS}"
 				EOF
             testResultCode=$?
 
@@ -223,10 +261,10 @@ function main() {
                 printf -- 'set verify on\n'
                 printf -- 'set echo on\n'
                 printf -- 'show connection\n'
-                printf -- '@ "%s" "%s" "%s"' "${testFile}" "${functionUniqueIdentifier}" "${testDirectory}"
+                printf -- '@ "%s" "%s" "%s"' "${testFileOS}" "${functionUniqueIdentifier}" "${testDirectoryOS}"
             } > "${wrapperFile}"
 
-            "${sqlclBinary}" -noupdates /nolog "@${wrapperFile}" 1>>"${logFile}" 2>&1
+            "${sqlclBinary}" -noupdates "${nologParam}" "@${wrapperFile}" 1>>"${logFile}" 2>&1
             testResultCode=$?
 
             rm "${wrapperFile}"
@@ -247,7 +285,7 @@ function main() {
 				set verify on
 				set echo on
 				show connection
-				liquibase update -contexts test_context -database-changelog-table-name ${databaseChangelogTableName} -changelog-file ${testFilename}
+				liquibase update -contexts test_context -database-changelog-table-name ${databaseChangelogTableName} -changelog-file ${testFilenameOS}
 				EOF
             testResultCode=$?
         elif [[ "${testType}" = "${testTypeSqlclLiquibaseSearchPath}" ]]; then
@@ -265,7 +303,7 @@ function main() {
 				set verify on
 				set echo on
 				show connection
-				liquibase update -contexts test_context -database-changelog-table-name ${databaseChangelogTableName} -search-path ${testDirectory} -changelog-file ${testFilename}
+				liquibase update -contexts test_context -database-changelog-table-name ${databaseChangelogTableName} -search-path ${testDirectoryOS} -changelog-file ${testFilenameOS}
 				EOF
             testResultCode=$?
         fi
@@ -606,8 +644,8 @@ function main() {
         printf -- '\n' | tee -a "${logMainFile}"
     fi
 
-    sqlParamsWithoutPassword+=("-user" "${databaseUsername}" "-url" "${databaseConnectIdentifier}")
-    sqlParamsWithPassword+=("${sqlParamsWithoutPassword[@]}" "-password" "${databasePassword}")
+    sqlParamsWithoutPassword+=("-user" "\"${databaseUsername}\"" "-url" "\"${databaseConnectIdentifier}\"")
+    sqlParamsWithPassword+=("${sqlParamsWithoutPassword[@]}" "-password" "\"${databasePassword}\"")
 
     if ! "${sqlclBinary}" "${sqlParamsDirectConnect[@]}" "${sqlParamsWithPassword[@]}" 1>>"${logMainFile}" 2>&1 <<- EOF
 		show connection

source/sqlcl_direct_unit_tests/sqlcl-liquibase-default-file-relative-to-script-absolute/script.sql

@@ -1,10 +1,13 @@
 -- Make sure the liquibase changelog table exists
+prompt "Run liquibase validate"
 liquibase validate -database-changelog-table-name &1._changelog -changelog-file changelog.xml
 
 -- Call to see if functionality works
+prompt "Run liquibase update"
 liquibase update -database-changelog-table-name &1._changelog -changelog-file changelog.xml -defaults-file liquibase.properties
 
 -- See if any changesets were run
+prompt "Check changesets ran"
 declare
     c_table_name    constant    varchar2(255 char)  :=  '&1._changelog';
     l_count                     number;

source/sqlcl_direct_unit_tests/sqlcl-liquibase-default-file-relative-to-script-relative/script.sql

@@ -1,10 +1,13 @@
 -- Make sure the liquibase changelog table exists
+prompt "Run liquibase validate"
 liquibase validate -database-changelog-table-name &1._changelog -changelog-file changelog.xml
 
 -- Call to see if functionality works
+prompt "Run liquibase update"
 liquibase update -database-changelog-table-name &1._changelog -changelog-file changelog.xml -defaults-file liquibase.properties
 
 -- See if any changesets were run
+prompt "Check changesets ran"
 declare
     c_table_name    constant    varchar2(255 char)  :=  '&1._changelog';
     l_count                     number;

source/sqlcl_direct_unit_tests/sqlcl-liquibase-defaults-file-respected.sql

@@ -1 +1 @@
-liquibase update -database-changelog-table-name &1._changelog -search-path / -defaults-file &2/sqlcl-liquibase-defaults-file-respected/liquibase.properties -changelog-file &2/sqlcl-liquibase-defaults-file-respected/changelog.xml
+liquibase update -database-changelog-table-name &1._changelog -search-path &2 -defaults-file sqlcl-liquibase-defaults-file-respected/liquibase.properties -changelog-file sqlcl-liquibase-defaults-file-respected/changelog.xml