Merge pull request #33 from jasonlyle88/develop

jasonlyle88 · web-flow · commit 3d4f797c57cd · 2024-11-08T10:34:30.000-05:00
Version 1.08.00
diff --git a/source/lb_unit_tests/context-filtering-property.xml b/source/lb_unit_tests/context-filtering-property.xml
@@ -19,6 +19,8 @@
     <changeSet
         id="context-filtering-property"
         author="jlyle"
+        runOnChange="true"
+        runAlways="true"
     >
         <sql endDelimiter="/">
             begin
diff --git a/source/lb_unit_tests/property-cannot-be-reset.xml b/source/lb_unit_tests/property-cannot-be-reset.xml
@@ -18,6 +18,8 @@
     <changeSet
         id="context-filtering-property"
         author="jlyle"
+        runOnChange="true"
+        runAlways="true"
     >
         <sql endDelimiter="/">
             begin
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript-with-child-scripts.xml b/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript-with-child-scripts.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ora="http://www.oracle.com/xml/ns/dbchangelog-ext"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.17.xsd"
+>
+    <changeSet
+        id="relative-to-changelog-works-for-runApexScript-with-child-script-drop-table-setup"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <preConditions onFail="CONTINUE">
+                <tableExists tableName="lb_ut_rtcwfraswcs"/>
+        </preConditions>
+        <dropTable tableName="lb_ut_rtcwfraswcs"/>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runApexScript-with-child-script-create-table"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <createTable tableName="lb_ut_rtcwfraswcs">
+            <column name="id" type="int"/>
+        </createTable>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runApexScript-with-child-script"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <ora:runApexScript ownerName="jlyle" sourceType="FILE" objectType="SCRIPT" objectName="test_script" relativeToChangelogFile="true" >
+            <ora:source>
+                relative-to-changelog-works-for-runApexScript-with-child-scripts/script.sql
+            </ora:source>
+        </ora:runApexScript>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runApexScript-with-child-script-verify"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <sql endDelimiter="/">
+            declare
+                l_count number;
+            begin
+                select count(1)
+                into l_count
+                from lb_ut_rtcwfraswcs;
+
+                if l_count != 1 then
+                    raise_application_error(-20001, 'Failed');
+                end if;
+            end;
+            /
+        </sql>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runApexScript-with-child-script-drop-table-cleanup"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <preConditions onFail="CONTINUE">
+                <tableExists tableName="lb_ut_rtcwfraswcs"/>
+        </preConditions>
+        <dropTable tableName="lb_ut_rtcwfraswcs"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript-with-child-scripts/script.sql b/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript-with-child-scripts/script.sql
@@ -0,0 +1 @@
+@@ "sub/subscript1.sql"
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript-with-child-scripts/sub/subscript1.sql b/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript-with-child-scripts/sub/subscript1.sql
@@ -0,0 +1,4 @@
+insert into lb_ut_rtcwfraswcs(id)
+values(1);
+
+commit;
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript.xml b/source/lb_unit_tests/relative-to-changelog-works-for-runApexScript.xml
@@ -8,6 +8,8 @@
     <changeSet
         id="relative-to-changelog-works-for-runApexScript"
         author="jlyle"
+        runOnChange="true"
+        runAlways="true"
     >
         <ora:runApexScript ownerName="jlyle" sourceType="FILE" objectType="SCRIPT" objectName="test_script" relativeToChangelogFile="true" >
             <ora:source>
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript-with-child-scripts.xml b/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript-with-child-scripts.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ora="http://www.oracle.com/xml/ns/dbchangelog-ext"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.17.xsd"
+>
+    <changeSet
+        id="relative-to-changelog-works-for-runOracleScript-with-child-script-drop-table-setup"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <preConditions onFail="CONTINUE">
+                <tableExists tableName="lb_ut_rtcwfroswcs"/>
+        </preConditions>
+        <dropTable tableName="lb_ut_rtcwfroswcs"/>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runOracleScript-with-child-script-create-table"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <createTable tableName="lb_ut_rtcwfroswcs">
+            <column name="id" type="int"/>
+        </createTable>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runOracleScript-with-child-script"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <ora:runOracleScript ownerName="jlyle" sourceType="FILE" objectType="SCRIPT" objectName="test_script" relativeToChangelogFile="true" >
+            <ora:source>
+                relative-to-changelog-works-for-runOracleScript-with-child-scripts/script.sql
+            </ora:source>
+        </ora:runOracleScript>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runOracleScript-with-child-script-verify"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <sql endDelimiter="/">
+            declare
+                l_count number;
+            begin
+                select count(1)
+                into l_count
+                from lb_ut_rtcwfroswcs;
+
+                if l_count != 1 then
+                    raise_application_error(-20001, 'Failed');
+                end if;
+            end;
+            /
+        </sql>
+    </changeSet>
+
+    <changeSet
+        id="relative-to-changelog-works-for-runOracleScript-with-child-script-drop-table-cleanup"
+        author="jlyle"
+        runOnChange="true"
+        runAlways="true"
+    >
+        <preConditions onFail="CONTINUE">
+                <tableExists tableName="lb_ut_rtcwfroswcs"/>
+        </preConditions>
+        <dropTable tableName="lb_ut_rtcwfroswcs"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript-with-child-scripts/script.sql b/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript-with-child-scripts/script.sql
@@ -0,0 +1 @@
+@@ "sub/subscript1.sql"
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript-with-child-scripts/sub/subscript1.sql b/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript-with-child-scripts/sub/subscript1.sql
@@ -0,0 +1,4 @@
+insert into lb_ut_rtcwfroswcs(id)
+values(1);
+
+commit;
diff --git a/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript.xml b/source/lb_unit_tests/relative-to-changelog-works-for-runOracleScript.xml
@@ -8,6 +8,8 @@
     <changeSet
         id="relative-to-changelog-works-for-runOracleScript"
         author="jlyle"
+        runOnChange="true"
+        runAlways="true"
     >
         <ora:runOracleScript ownerName="jlyle" sourceType="FILE" objectType="SCRIPT" objectName="test_script" relativeToChangelogFile="true" >
             <ora:source>
diff --git a/source/sqlclUnitTest.sh b/source/sqlclUnitTest.sh
@@ -167,6 +167,9 @@ function main() {
         if [[ "${unixPath:0:1}" == '/' ]]; then
             windowsPath="${unixPath:1:1}:\\"
 
+            # Ensure the drive letter is upper case
+            windowsPath="$(toUpperCase "${windowsPath}")"
+
             unixPath="${unixPath:3}"
         fi
 
@@ -303,6 +306,7 @@ function main() {
 				set verify on
 				set echo on
 				show connection
+                prompt "Provided search path: '${testDirectoryOS}'"
 				liquibase update -contexts test_context -database-changelog-table-name ${databaseChangelogTableName} -search-path ${testDirectoryOS} -changelog-file ${testFilenameOS}
 				EOF
             testResultCode=$?
diff --git a/source/sqlcl_direct_unit_tests/sqlcl-liquibase-databasechangelog-filename-directory-seperator.sql b/source/sqlcl_direct_unit_tests/sqlcl-liquibase-databasechangelog-filename-directory-seperator.sql
@@ -22,7 +22,7 @@ end;
 /
 
 -- Check filename directory separator directions
-prompt "Check changesets ran"
+prompt "Check databasechangelog.filename directory seperator characters"
 declare
     c_root          constant    varchar2(255 char)  :=  'sqlcl-liquibase-databasechangelog-filename-directory-seperator';
     c_table_name    constant    varchar2(255 char)  :=  '&1._changelog';
diff --git a/source/sqlcl_direct_unit_tests/sqlcl-liquibase-search-path.sql b/source/sqlcl_direct_unit_tests/sqlcl-liquibase-search-path.sql
@@ -1,15 +1,3 @@
-begin
-    for x in (
-        select *
-        from user_tables
-        where table_name = 'DATABASECHANGELOG'
-    )
-    loop
-        execute immediate 'truncate table databasechangelog';
-    end loop;
-end;
-/
-
 liquibase update -database-changelog-table-name &1._changelog -search-path &2/sqlcl-liquibase-search-path -changelog-file changelog.xml
 
 declare

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`<changeSet`
`20`	`20`	`id="context-filtering-property"`
`21`	`21`	`author="jlyle"`
	`22`	`+ runOnChange="true"`
	`23`	`+ runAlways="true"`
`22`	`24`	`>`
`23`	`25`	`<sql endDelimiter="/">`
`24`	`26`	`begin`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`<changeSet`
`19`	`19`	`id="context-filtering-property"`
`20`	`20`	`author="jlyle"`
	`21`	`+ runOnChange="true"`
	`22`	`+ runAlways="true"`
`21`	`23`	`>`
`22`	`24`	`<sql endDelimiter="/">`
`23`	`25`	`begin`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +insert into lb_ut_rtcwfraswcs(id)
 +values(1);
++
 +commit;
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`<changeSet`
`9`	`9`	`id="relative-to-changelog-works-for-runApexScript"`
`10`	`10`	`author="jlyle"`
	`11`	`+ runOnChange="true"`
	`12`	`+ runAlways="true"`
`11`	`13`	`>`
`12`	`14`	`<ora:runApexScript ownerName="jlyle" sourceType="FILE" objectType="SCRIPT" objectName="test_script" relativeToChangelogFile="true" >`
`13`	`15`	`<ora:source>`