From c9db1ca83c18496a969ff99961d9e874ce704a90 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Tue, 10 Jan 2023 14:37:19 +0200 Subject: [PATCH 01/33] Advanced harness suite test --- .github/workflows/ci.yml | 84 ++++++++++--------- pom.xml | 7 +- .../redshift/addCheckConstraint.sql | 1 + .../redshift/addCheckConstraint.xml | 14 ++++ .../redshift/addForeignKeyConstraint.sql | 7 ++ .../redshift/addForeignKeyConstraint.xml | 49 +++++++++++ .../expectedChangelog/redshift/column.sql | 1 + .../expectedChangelog/redshift/column.xml | 23 +++++ .../redshift/createFunction.sql | 9 ++ .../redshift/createFunction.xml | 25 ++++++ .../redshift/createIndex.sql | 3 + .../redshift/createIndex.xml | 24 ++++++ .../redshift/createPackage.sql | 1 + .../redshift/createPackage.xml | 21 +++++ .../redshift/createPackageBody.sql | 1 + .../redshift/createPackageBody.xml | 63 ++++++++++++++ .../redshift/createProcedure.xml | 25 ++++++ .../redshift/createSynonym.sql | 1 + .../redshift/createTable.sql | 1 + .../redshift/createTrigger.xml | 40 +++++++++ .../expectedChangelog/redshift/createView.sql | 5 ++ .../expectedChangelog/redshift/createView.xml | 15 ++++ .../expectedChangelog/redshift/primary.sql | 1 + .../expectedChangelog/redshift/primary.xml | 26 ++++++ .../expectedChangelog/redshift/unique.sql | 3 + .../expectedChangelog/redshift/unique.xml | 27 ++++++ .../snapshot/changelogs/addColumn.xml | 23 +++++ .../changelogs/addForeignKeyConstraint.xml | 47 +++++++++++ .../snapshot/changelogs/addPrimaryKey.xml | 28 +++++++ .../changelogs/addUniqueConstraint.xml | 27 ++++++ .../snapshot/changelogs/createIndex.xml | 24 ++++++ .../snapshot/changelogs/createSequence.xml | 19 +++++ .../snapshot/changelogs/createTable.xml | 15 ++++ .../snapshot/changelogs/createView.xml | 23 +++++ .../changelogs/snapshotCaalogAndSchema.xml | 15 ++++ .../snapshot/expectedSnapshot/addColumn.json | 51 +++++++++++ .../addForeignKeyConstraint.json | 27 ++++++ .../expectedSnapshot/addPrimaryKey.json | 28 +++++++ .../expectedSnapshot/addUniqueConstraint.json | 32 +++++++ .../expectedSnapshot/createIndex.json | 21 +++++ .../expectedSnapshot/createSequence.json | 18 ++++ .../expectedSnapshot/createTable.json | 23 +++++ .../snapshot/expectedSnapshot/createView.json | 21 +++++ .../snapshotCaalogAndSchema.json | 20 +++++ .../LiquibaseHarnessAdvancedSuiteIT.groovy | 4 + 45 files changed, 903 insertions(+), 40 deletions(-) create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql create mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addColumn.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addPrimaryKey.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addUniqueConstraint.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createSequence.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createTable.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createView.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/snapshotCaalogAndSchema.xml create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addForeignKeyConstraint.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addUniqueConstraint.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createSequence.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json create mode 100644 src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/snapshotCaalogAndSchema.json create mode 100644 src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c512a90..260f6cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,43 +98,49 @@ jobs: **/target/surefire-reports **/target/jacoco.exec -# integration-test: -# name: Test Harness for Redshift ${{ matrix.redshift }} -# needs: build -# runs-on: ubuntu-latest -# -# strategy: -# fail-fast: false -# matrix: -# redshift: [ "" ] -# -# steps: -# - uses: actions/checkout@v2 -# -# - name: Set up JDK -# uses: actions/setup-java@v2 -# with: -# java-version: 17 -# distribution: 'temurin' -# cache: 'maven' -# -# - name: Build Cache -# uses: actions/cache@v3.0.5 -# with: -# key: build-${{ github.run_number }}-${{ github.run_attempt }} -# path: | -# **/target/** -# ~/.m2/repository/org/liquibase/ -# -# - name: Run Tests -# run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} -# -# - name: Archive Test Results -# if: ${{ always() }} -# uses: actions/upload-artifact@v2 -# with: -# name: test-reports-redshift-${{ matrix.redshift }} -# path: | -# **/target/surefire-reports -# **/target/jacoco.exec + integration-test: + name: Test Harness for Redshift ${{ matrix.redshift }} + needs: build + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + redshift: [ "" ] + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: 'temurin' + cache: 'maven' + + - name: Build Cache + uses: actions/cache@v3.0.5 + with: + key: build-${{ github.run_number }}-${{ github.run_attempt }} + path: | + **/target/** + ~/.m2/repository/org/liquibase/ + + - name: Run Tests + run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} + + - name: Advanced Harness Test Run + env: + LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.LICENSE_KEY }} + run: mvn -Dtest=LiquibaseHarnessAdvancedSuiteTest -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl='${{ secrets.TH_REDSHIFTURL }}' test + + + - name: Archive Test Results + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: test-reports-redshift-${{ matrix.redshift }} + path: | + **/target/surefire-reports + **/target/jacoco.exec diff --git a/pom.xml b/pom.xml index c6e90b1..2681e20 100644 --- a/pom.xml +++ b/pom.xml @@ -107,9 +107,14 @@ org.liquibase liquibase-test-harness - 1.0.8 + 1.0.9 test + + org.yaml + snakeyaml + 1.33 + com.amazon.redshift redshift-jdbc42 diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql new file mode 100644 index 0000000..eaeb5b2 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql @@ -0,0 +1 @@ +ALTER TABLE "posts" ADD CONSTRAINT "test_check_constraint" CHECK (((id > 0))); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml new file mode 100644 index 0000000..3949116 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml @@ -0,0 +1,14 @@ + + + + id > 0 + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql new file mode 100644 index 0000000..b17bf51 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql @@ -0,0 +1,7 @@ +CREATE TABLE "test_table_reference" ("id" INTEGER NOT NULL, "test_column" INTEGER NOT NULL, CONSTRAINT "test_table_reference_pkey" PRIMARY KEY ("id")); + +ALTER TABLE "test_table_reference" ADD CONSTRAINT "test_table_reference_test_column_key" UNIQUE ("test_column"); + +CREATE TABLE "test_table_base" ("id" INTEGER NOT NULL, CONSTRAINT "test_table_base_pkey" PRIMARY KEY ("id")); + +ALTER TABLE "test_table_base" ADD CONSTRAINT "test_fk" FOREIGN KEY ("id") REFERENCES "test_table_reference" ("test_column") ON UPDATE RESTRICT ON DELETE CASCADE; \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml new file mode 100644 index 0000000..4e67958 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql new file mode 100644 index 0000000..061aa52 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql @@ -0,0 +1 @@ +CREATE TABLE "test_table" ("test_column" INTEGER, "varcharColumn" VARCHAR(25), "intColumn" INTEGER, "dateColumn" date); diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml new file mode 100644 index 0000000..75245c8 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql new file mode 100644 index 0000000..1ace2af --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE FUNCTION "public".test_function() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ + BEGIN + RAISE NOTICE 'Test function created'; + RETURN NEW; + END; + $function$; \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml new file mode 100644 index 0000000..6ab0d0a --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml @@ -0,0 +1,25 @@ + + + + CREATE OR REPLACE FUNCTION test_function() + RETURNS trigger + AS $$ + BEGIN + RAISE NOTICE 'Test function created'; + RETURN NEW; + END; + $$ + LANGUAGE plpgsql; + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql new file mode 100644 index 0000000..cd5bf06 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql @@ -0,0 +1,3 @@ +CREATE TABLE "test_table" ("id" INTEGER); + +CREATE INDEX "idx_first_name" ON "test_table"("id"); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml new file mode 100644 index 0000000..825d697 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql new file mode 100644 index 0000000..47bbf2b --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql @@ -0,0 +1 @@ +INVALID TEST \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml new file mode 100644 index 0000000..437c1e8 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml @@ -0,0 +1,21 @@ + + + + + SET SQL_MODE='ORACLE'; + + + CREATE OR REPLACE PACKAGE test_package AS FUNCTION getSalary(eid INT) + RETURN DECIMAL(10,2); + END; + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql new file mode 100644 index 0000000..47bbf2b --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql @@ -0,0 +1 @@ +INVALID TEST \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml new file mode 100644 index 0000000..bc5dc21 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml @@ -0,0 +1,63 @@ + + + + + SET SQL_MODE='ORACLE'; + + + + + CREATE OR REPLACE PROCEDURE test_procedure + AS + BEGIN + END; + + + + + + + + CREATE OR REPLACE PROCEDURE test_package + AS + BEGIN + END; + + + + + + + + CREATE OR REPLACE PACKAGE test_package AS PROCEDURE test_procedure; + END; + + + SET SQL_MODE='ORACLE'; + DROP PACKAGE test_package; + + + + + CREATE PACKAGE BODY test_package AS testVariable DECIMAL(10,2):=500; + PROCEDURE test_procedure() AS + BEGIN + INSERT INTO posts (id, author_id, title, description, content, inserted_date) values ('6','Jayden','Walter','lillian66@example.com','2010-02-27','1990-02-04 02:32:00'); + END; + END; + + + + SET SQL_MODE='ORACLE'; + DROP PACKAGE BODY test_package; + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml new file mode 100644 index 0000000..e8e9590 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml @@ -0,0 +1,25 @@ + + + + + test procedure + CREATE OR REPLACE PROCEDURE test_procedure() + LANGUAGE 'plpgsql' + AS $$ + BEGIN + END; + $$ + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql new file mode 100644 index 0000000..47bbf2b --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql @@ -0,0 +1 @@ +INVALID TEST \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql new file mode 100644 index 0000000..bf11c26 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql @@ -0,0 +1 @@ +CREATE TABLE "test_table_xml" ("test_column" INTEGER); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml new file mode 100644 index 0000000..5fa53db --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml @@ -0,0 +1,40 @@ + + + + test procedure + CREATE OR REPLACE FUNCTION test_function() + RETURNS trigger + AS $$ + BEGIN + RAISE NOTICE 'Test trigger function created'; + RETURN NEW; + END; + $$ + LANGUAGE plpgsql; + + + DROP FUNCTION test_function() + + + + CREATE TRIGGER test_trigger + BEFORE INSERT ON posts + FOR EACH ROW EXECUTE PROCEDURE test_function(); + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql new file mode 100644 index 0000000..6c3a799 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql @@ -0,0 +1,5 @@ +CREATE VIEW "test_view" AS SELECT authors.id, + authors.first_name, + authors.last_name, + authors.email + FROM authors;; \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml new file mode 100644 index 0000000..8478a89 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml @@ -0,0 +1,15 @@ + + + + + select id, first_name, last_name, email from authors + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql new file mode 100644 index 0000000..ca2ae49 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql @@ -0,0 +1 @@ +CREATE TABLE "test_table" ("id" INTEGER NOT NULL, CONSTRAINT "test_pk" PRIMARY KEY ("id")); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml new file mode 100644 index 0000000..9baa7da --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql new file mode 100644 index 0000000..1533662 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql @@ -0,0 +1,3 @@ +CREATE TABLE "test_table" ("id" INTEGER); + +ALTER TABLE "test_table" ADD CONSTRAINT "test_unique_constraint" UNIQUE ("id"); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml new file mode 100644 index 0000000..1ead84f --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addColumn.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addColumn.xml new file mode 100644 index 0000000..75245c8 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addColumn.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml new file mode 100644 index 0000000..abe9492 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addPrimaryKey.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addPrimaryKey.xml new file mode 100644 index 0000000..0a9dc72 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addPrimaryKey.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addUniqueConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addUniqueConstraint.xml new file mode 100644 index 0000000..1ead84f --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addUniqueConstraint.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml new file mode 100644 index 0000000..825d697 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createSequence.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createSequence.xml new file mode 100644 index 0000000..821bda3 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createSequence.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createTable.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createTable.xml new file mode 100644 index 0000000..76c50a9 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createTable.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createView.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createView.xml new file mode 100644 index 0000000..b582ec3 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createView.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + select test_column from view_table + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/snapshotCaalogAndSchema.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/snapshotCaalogAndSchema.xml new file mode 100644 index 0000000..76c50a9 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/snapshotCaalogAndSchema.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json new file mode 100644 index 0000000..00a0742 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json @@ -0,0 +1,51 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.Column": [ + { + "column": { + "name": "test_column", + "nullable": true, + "type": { + "typeName": "INT4" + } + } + }, + { + "column": { + "name": "varcharColumn", + "nullable": true, + "type": { + "typeName": "VARCHAR" + } + } + }, + { + "column": { + "name": "intColumn", + "nullable": true, + "type": { + "typeName": "INT4" + } + } + }, + { + "column": { + "name": "dateColumn", + "nullable": true, + "type": { + "typeName": "DATE" + } + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addForeignKeyConstraint.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addForeignKeyConstraint.json new file mode 100644 index 0000000..17ab940 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addForeignKeyConstraint.json @@ -0,0 +1,27 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table_base" + } + }, + { + "table": { + "name": "test_table_reference" + } + } + ], + "liquibase.structure.core.ForeignKey": [ + { + "foreignKey": { + "deferrable": false, + "initiallyDeferred": false, + "name": "test_fk" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json new file mode 100644 index 0000000..e2a5b5a --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json @@ -0,0 +1,28 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.Index": [ + { + "index": { + "name": "test_pk", + "unique": true + } + } + ], + "liquibase.structure.core.PrimaryKey": [ + { + "primaryKey": { + "name": "test_pk" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addUniqueConstraint.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addUniqueConstraint.json new file mode 100644 index 0000000..1a824fd --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addUniqueConstraint.json @@ -0,0 +1,32 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.Index": [ + { + "index": { + "name": "test_unique_constraint", + "unique": true + } + } + ], + "liquibase.structure.core.UniqueConstraint": [ + { + "uniqueConstraint": { + "deferrable": false, + "disabled": false, + "initiallyDeferred": false, + "name": "test_unique_constraint", + "validate": true + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json new file mode 100644 index 0000000..dc55425 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json @@ -0,0 +1,21 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.Index": [ + { + "index": { + "name": "idx_first_name", + "unique": false + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createSequence.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createSequence.json new file mode 100644 index 0000000..2735a7a --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createSequence.json @@ -0,0 +1,18 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Sequence": [ + { + "sequence": { + "incrementBy": "1\\!\\{java.math.BigInteger\\}", + "maxValue": "9223372036854775807\\!\\{java.math.BigInteger\\}", + "minValue": "1\\!\\{java.math.BigInteger\\}", + "name": "test_sequence", + "startValue": "1\\!\\{java.math.BigInteger\\}", + "willCycle": false + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json new file mode 100644 index 0000000..0e8ebac --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json @@ -0,0 +1,23 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "snapshot_test_table" + } + } + ], + "liquibase.structure.core.Column": [ + { + "column": { + "name": "snapshot_test_column", + "type": { + "typeName": "INT4" + } + } + } + ] + } + } +} diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json new file mode 100644 index 0000000..7174c47 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json @@ -0,0 +1,21 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "view_table" + } + } + ], + "liquibase.structure.core.View": [ + { + "view": { + "definition": "SELECT view_table.test_column\n FROM view_table;", + "name": "test_view" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/snapshotCaalogAndSchema.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/snapshotCaalogAndSchema.json new file mode 100644 index 0000000..0c410a6 --- /dev/null +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/snapshotCaalogAndSchema.json @@ -0,0 +1,20 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Catalog": [ + { + "catalog": { + "name": "lbcat" + } + } + ], + "liquibase.structure.core.Schema": [ + { + "schema": { + "name": "public" + } + } + ] + } + } +} diff --git a/src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy b/src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy new file mode 100644 index 0000000..d4ab0cc --- /dev/null +++ b/src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy @@ -0,0 +1,4 @@ +import liquibase.harness.AdvancedHarnessSuite + +class LiquibaseHarnessAdvancedSuiteIT extends AdvancedHarnessSuite { +} \ No newline at end of file From 67c1c71d5d181c54ec623845b6ffa0810b2c1c08 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 13:31:08 +0200 Subject: [PATCH 02/33] CICD test --- .github/workflows/ci.yml | 3 +-- src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy | 4 ---- src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy | 4 ++++ 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy create mode 100644 src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 260f6cd..92672ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,8 +132,7 @@ jobs: - name: Advanced Harness Test Run env: LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.LICENSE_KEY }} - run: mvn -Dtest=LiquibaseHarnessAdvancedSuiteTest -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl='${{ secrets.TH_REDSHIFTURL }}' test - + run: mvn -B jacoco:prepare-agent surefire:test -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Archive Test Results if: ${{ always() }} diff --git a/src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy b/src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy deleted file mode 100644 index d4ab0cc..0000000 --- a/src/test/groovy/LiquibaseHarnessAdvancedSuiteIT.groovy +++ /dev/null @@ -1,4 +0,0 @@ -import liquibase.harness.AdvancedHarnessSuite - -class LiquibaseHarnessAdvancedSuiteIT extends AdvancedHarnessSuite { -} \ No newline at end of file diff --git a/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy b/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy new file mode 100644 index 0000000..fc93da6 --- /dev/null +++ b/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy @@ -0,0 +1,4 @@ +import liquibase.harness.AdvancedHarnessSuite + +class LiquibaseHarnessAdvancedSuiteTest extends AdvancedHarnessSuite { +} \ No newline at end of file From 55d82697be726ae1959c6b56701e5741aff52b2b Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 13:40:04 +0200 Subject: [PATCH 03/33] CICD test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92672ad..fb706b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: - name: Advanced Harness Test Run env: LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.LICENSE_KEY }} - run: mvn -B jacoco:prepare-agent surefire:test -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test + run: mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Archive Test Results if: ${{ always() }} From b0d7a142a7b80ad196390452014814ca769d2beb Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 13:44:13 +0200 Subject: [PATCH 04/33] CICD test --- .github/workflows/ci.yml | 2 +- src/test/resources/harness-config.yml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb706b2..2b2edae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: ~/.m2/repository/org/liquibase/ - name: Run Tests - run: mvn -B jacoco:prepare-agent surefire:test -DfailIfNoTests=true + run: mvn -B jacoco:prepare-agent surefire:test -Dtest="RedshiftDatabaseTest" -DfailIfNoTests=true - name: Archive Test Results if: ${{ always() }} diff --git a/src/test/resources/harness-config.yml b/src/test/resources/harness-config.yml index 41ba9a4..3dc8635 100644 --- a/src/test/resources/harness-config.yml +++ b/src/test/resources/harness-config.yml @@ -3,7 +3,6 @@ context: testContext databasesUnderTest: - name: redshift - version: {version} - url: jdbc:redshift://{account_id}.redshift.amazonaws.com:5439 - username: {username} - password: {password} \ No newline at end of file + url: DBENDPOINT + username: USERNAME + password: PASSWORD \ No newline at end of file From d08b7576ccab6da5cbdd190d33d21b5a1b81abf5 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 13:46:31 +0200 Subject: [PATCH 05/33] CICD test --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b2edae..01c8570 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,8 +126,8 @@ jobs: **/target/** ~/.m2/repository/org/liquibase/ - - name: Run Tests - run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} +# - name: Run Tests +# run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} - name: Advanced Harness Test Run env: From e6e812fd0f39f47f45b60e14f46fb477a618d4ae Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 14:41:21 +0200 Subject: [PATCH 06/33] CICD test --- .../expectedChangelog/redshift/createTable.sql | 2 +- .../snapshot/changelogs/{ => redshift}/addColumn.xml | 0 .../{ => redshift}/addForeignKeyConstraint.xml | 5 ----- .../snapshot/changelogs/{ => redshift}/addPrimaryKey.xml | 0 .../changelogs/{ => redshift}/addUniqueConstraint.xml | 2 +- .../snapshot/changelogs/{ => redshift}/createIndex.xml | 9 --------- .../changelogs/{ => redshift}/createSequence.xml | 0 .../snapshot/changelogs/{ => redshift}/createTable.xml | 0 .../snapshot/changelogs/{ => redshift}/createView.xml | 0 .../{ => redshift}/snapshotCaalogAndSchema.xml | 0 .../expectedSnapshot/{ => redshift}/addColumn.json | 8 ++++---- .../{ => redshift}/addForeignKeyConstraint.json | 0 .../expectedSnapshot/{ => redshift}/addPrimaryKey.json | 8 -------- .../{ => redshift}/addUniqueConstraint.json | 0 .../expectedSnapshot/{ => redshift}/createIndex.json | 8 -------- .../expectedSnapshot/{ => redshift}/createSequence.json | 0 .../expectedSnapshot/{ => redshift}/createTable.json | 2 +- .../expectedSnapshot/{ => redshift}/createView.json | 2 +- .../{ => redshift}/snapshotCaalogAndSchema.json | 0 19 files changed, 8 insertions(+), 38 deletions(-) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/addColumn.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/addForeignKeyConstraint.xml (89%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/addPrimaryKey.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/addUniqueConstraint.xml (95%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/createIndex.xml (65%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/createSequence.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/createTable.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/createView.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/{ => redshift}/snapshotCaalogAndSchema.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/addColumn.json (86%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/addForeignKeyConstraint.json (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/addPrimaryKey.json (66%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/addUniqueConstraint.json (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/createIndex.json (51%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/createSequence.json (100%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/createTable.json (91%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/createView.json (79%) rename src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/{ => redshift}/snapshotCaalogAndSchema.json (100%) diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql index bf11c26..79997c2 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql @@ -1 +1 @@ -CREATE TABLE "test_table_xml" ("test_column" INTEGER); \ No newline at end of file +CREATE TABLE "test_table_sql" ("test_column" INTEGER); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addColumn.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addColumn.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addColumn.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addColumn.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addForeignKeyConstraint.xml similarity index 89% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addForeignKeyConstraint.xml index abe9492..20b05ec 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/addForeignKeyConstraint.xml +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addForeignKeyConstraint.xml @@ -26,11 +26,6 @@ - - - - - diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createIndex.xml similarity index 65% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createIndex.xml index 825d697..eeb1f25 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createIndex.xml +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createIndex.xml @@ -12,13 +12,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createSequence.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createSequence.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createSequence.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createSequence.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createTable.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createTable.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createTable.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createTable.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createView.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createView.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/createView.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createView.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/snapshotCaalogAndSchema.xml b/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/snapshotCaalogAndSchema.xml rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addColumn.json similarity index 86% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addColumn.json index 00a0742..8907c0c 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addColumn.json +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addColumn.json @@ -14,7 +14,7 @@ "name": "test_column", "nullable": true, "type": { - "typeName": "INT4" + "typeName": "int4" } } }, @@ -23,7 +23,7 @@ "name": "varcharColumn", "nullable": true, "type": { - "typeName": "VARCHAR" + "typeName": "varchar" } } }, @@ -32,7 +32,7 @@ "name": "intColumn", "nullable": true, "type": { - "typeName": "INT4" + "typeName": "int4" } } }, @@ -41,7 +41,7 @@ "name": "dateColumn", "nullable": true, "type": { - "typeName": "DATE" + "typeName": "date" } } } diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addForeignKeyConstraint.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addForeignKeyConstraint.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addPrimaryKey.json similarity index 66% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addPrimaryKey.json index e2a5b5a..38b2c85 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addPrimaryKey.json +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addPrimaryKey.json @@ -8,14 +8,6 @@ } } ], - "liquibase.structure.core.Index": [ - { - "index": { - "name": "test_pk", - "unique": true - } - } - ], "liquibase.structure.core.PrimaryKey": [ { "primaryKey": { diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addUniqueConstraint.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/addUniqueConstraint.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createIndex.json similarity index 51% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createIndex.json index dc55425..a88b65c 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createIndex.json +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createIndex.json @@ -7,14 +7,6 @@ "name": "test_table" } } - ], - "liquibase.structure.core.Index": [ - { - "index": { - "name": "idx_first_name", - "unique": false - } - } ] } } diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createSequence.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createSequence.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createSequence.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createSequence.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createTable.json similarity index 91% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createTable.json index 0e8ebac..7fe07f5 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createTable.json +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createTable.json @@ -13,7 +13,7 @@ "column": { "name": "snapshot_test_column", "type": { - "typeName": "INT4" + "typeName": "int4" } } } diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createView.json similarity index 79% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createView.json index 7174c47..65f3a2d 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/createView.json +++ b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createView.json @@ -11,7 +11,7 @@ "liquibase.structure.core.View": [ { "view": { - "definition": "SELECT view_table.test_column\n FROM view_table;", + "definition": "SELECT view_table.test_column FROM view_table;", "name": "test_view" } } diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/snapshotCaalogAndSchema.json b/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/snapshotCaalogAndSchema.json rename to src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json From a669434a4420930d516f4fc1d2718cd7128be791 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 15:11:00 +0200 Subject: [PATCH 07/33] CICD test --- .../expectedChangelog/redshift/createTable.sql | 2 +- .../snapshot => snapsot}/changelogs/redshift/addColumn.xml | 0 .../changelogs/redshift/addForeignKeyConstraint.xml | 0 .../snapshot => snapsot}/changelogs/redshift/addPrimaryKey.xml | 0 .../changelogs/redshift/addUniqueConstraint.xml | 0 .../snapshot => snapsot}/changelogs/redshift/createIndex.xml | 0 .../snapshot => snapsot}/changelogs/redshift/createSequence.xml | 0 .../snapshot => snapsot}/changelogs/redshift/createTable.xml | 0 .../snapshot => snapsot}/changelogs/redshift/createView.xml | 0 .../changelogs/redshift/snapshotCaalogAndSchema.xml | 0 .../expectedSnapshot/redshift/addColumn.json | 0 .../expectedSnapshot/redshift/addForeignKeyConstraint.json | 0 .../expectedSnapshot/redshift/addPrimaryKey.json | 0 .../expectedSnapshot/redshift/addUniqueConstraint.json | 0 .../expectedSnapshot/redshift/createIndex.json | 0 .../expectedSnapshot/redshift/createSequence.json | 0 .../expectedSnapshot/redshift/createTable.json | 0 .../expectedSnapshot/redshift/createView.json | 0 .../expectedSnapshot/redshift/snapshotCaalogAndSchema.json | 0 19 files changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/addColumn.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/addForeignKeyConstraint.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/addPrimaryKey.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/addUniqueConstraint.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/createIndex.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/createSequence.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/createTable.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/createView.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/changelogs/redshift/snapshotCaalogAndSchema.xml (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/addColumn.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/addForeignKeyConstraint.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/addPrimaryKey.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/addUniqueConstraint.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/createIndex.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/createSequence.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/createTable.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/createView.json (100%) rename src/main/resources/liquibase/harness/{generateChangelog/snapshot => snapsot}/expectedSnapshot/redshift/snapshotCaalogAndSchema.json (100%) diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql index 79997c2..bf11c26 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql @@ -1 +1 @@ -CREATE TABLE "test_table_sql" ("test_column" INTEGER); \ No newline at end of file +CREATE TABLE "test_table_xml" ("test_column" INTEGER); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addColumn.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addColumn.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addColumn.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addColumn.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addForeignKeyConstraint.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addForeignKeyConstraint.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addForeignKeyConstraint.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addPrimaryKey.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addPrimaryKey.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addPrimaryKey.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addPrimaryKey.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addUniqueConstraint.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addUniqueConstraint.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/addUniqueConstraint.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addUniqueConstraint.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createIndex.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createIndex.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createIndex.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createIndex.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createSequence.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createSequence.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createSequence.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createSequence.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createTable.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createTable.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createTable.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createTable.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createView.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createView.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/createView.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createView.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/snapshotCaalogAndSchema.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml rename to src/main/resources/liquibase/harness/snapsot/changelogs/redshift/snapshotCaalogAndSchema.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addColumn.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addColumn.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addColumn.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addColumn.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addForeignKeyConstraint.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addForeignKeyConstraint.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addPrimaryKey.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addPrimaryKey.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addPrimaryKey.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addPrimaryKey.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addUniqueConstraint.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addUniqueConstraint.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createIndex.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createIndex.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createIndex.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createIndex.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createSequence.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createSequence.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createSequence.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createSequence.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createTable.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createTable.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createTable.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createTable.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createView.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createView.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/createView.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createView.json diff --git a/src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json rename to src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json From 334440cf91b78c522e8749eeb4e09203569e71c9 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 15:25:03 +0200 Subject: [PATCH 08/33] CICD test --- .../redshift/addCheckConstraint.sql | 1 + .../redshift/addCheckConstraint.xml | 14 +++++ .../redshift/addForeignKeyConstraint.sql | 7 +++ .../redshift/addForeignKeyConstraint.xml | 49 +++++++++++++++ .../expectedChangelog/redshift/column.sql | 1 + .../expectedChangelog/redshift/column.xml | 23 +++++++ .../redshift/createFunction.sql | 9 +++ .../redshift/createFunction.xml | 25 ++++++++ .../redshift/createIndex.sql | 3 + .../redshift/createIndex.xml | 24 +++++++ .../redshift/createPackage.sql | 1 + .../redshift/createPackage.xml | 21 +++++++ .../redshift/createPackageBody.sql | 1 + .../redshift/createPackageBody.xml | 63 +++++++++++++++++++ .../redshift/createProcedure.xml | 25 ++++++++ .../redshift/createSynonym.sql | 1 + .../redshift/createTable.sql | 1 + .../redshift/createTrigger.xml | 40 ++++++++++++ .../expectedChangelog/redshift/createView.sql | 5 ++ .../expectedChangelog/redshift/createView.xml | 15 +++++ .../expectedChangelog/redshift/primary.sql | 1 + .../expectedChangelog/redshift/primary.xml | 26 ++++++++ .../expectedChangelog/redshift/unique.sql | 3 + .../expectedChangelog/redshift/unique.xml | 27 ++++++++ .../changelogs/redshift/addColumn.xml | 23 +++++++ .../redshift/addForeignKeyConstraint.xml | 42 +++++++++++++ .../changelogs/redshift/addPrimaryKey.xml | 28 +++++++++ .../redshift/addUniqueConstraint.xml | 27 ++++++++ .../changelogs/redshift/createIndex.xml | 15 +++++ .../changelogs/redshift/createSequence.xml | 19 ++++++ .../changelogs/redshift/createTable.xml | 15 +++++ .../changelogs/redshift/createView.xml | 23 +++++++ .../redshift/snapshotCaalogAndSchema.xml | 15 +++++ .../expectedSnapshot/redshift/addColumn.json | 51 +++++++++++++++ .../redshift/addForeignKeyConstraint.json | 27 ++++++++ .../redshift/addPrimaryKey.json | 20 ++++++ .../redshift/addUniqueConstraint.json | 32 ++++++++++ .../redshift/createIndex.json | 13 ++++ .../redshift/createSequence.json | 18 ++++++ .../redshift/createTable.json | 23 +++++++ .../expectedSnapshot/redshift/createView.json | 21 +++++++ .../redshift/snapshotCaalogAndSchema.json | 20 ++++++ 42 files changed, 818 insertions(+) create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addColumn.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addPrimaryKey.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createSequence.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createTable.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createView.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createSequence.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json create mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql new file mode 100644 index 0000000..eaeb5b2 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql @@ -0,0 +1 @@ +ALTER TABLE "posts" ADD CONSTRAINT "test_check_constraint" CHECK (((id > 0))); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml new file mode 100644 index 0000000..3949116 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml @@ -0,0 +1,14 @@ + + + + id > 0 + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql new file mode 100644 index 0000000..b17bf51 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql @@ -0,0 +1,7 @@ +CREATE TABLE "test_table_reference" ("id" INTEGER NOT NULL, "test_column" INTEGER NOT NULL, CONSTRAINT "test_table_reference_pkey" PRIMARY KEY ("id")); + +ALTER TABLE "test_table_reference" ADD CONSTRAINT "test_table_reference_test_column_key" UNIQUE ("test_column"); + +CREATE TABLE "test_table_base" ("id" INTEGER NOT NULL, CONSTRAINT "test_table_base_pkey" PRIMARY KEY ("id")); + +ALTER TABLE "test_table_base" ADD CONSTRAINT "test_fk" FOREIGN KEY ("id") REFERENCES "test_table_reference" ("test_column") ON UPDATE RESTRICT ON DELETE CASCADE; \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml new file mode 100644 index 0000000..4e67958 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql new file mode 100644 index 0000000..061aa52 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql @@ -0,0 +1 @@ +CREATE TABLE "test_table" ("test_column" INTEGER, "varcharColumn" VARCHAR(25), "intColumn" INTEGER, "dateColumn" date); diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml new file mode 100644 index 0000000..75245c8 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql new file mode 100644 index 0000000..1ace2af --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE FUNCTION "public".test_function() + RETURNS trigger + LANGUAGE plpgsql +AS $function$ + BEGIN + RAISE NOTICE 'Test function created'; + RETURN NEW; + END; + $function$; \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml new file mode 100644 index 0000000..6ab0d0a --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml @@ -0,0 +1,25 @@ + + + + CREATE OR REPLACE FUNCTION test_function() + RETURNS trigger + AS $$ + BEGIN + RAISE NOTICE 'Test function created'; + RETURN NEW; + END; + $$ + LANGUAGE plpgsql; + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql new file mode 100644 index 0000000..cd5bf06 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql @@ -0,0 +1,3 @@ +CREATE TABLE "test_table" ("id" INTEGER); + +CREATE INDEX "idx_first_name" ON "test_table"("id"); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml new file mode 100644 index 0000000..825d697 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql new file mode 100644 index 0000000..47bbf2b --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql @@ -0,0 +1 @@ +INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml new file mode 100644 index 0000000..437c1e8 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml @@ -0,0 +1,21 @@ + + + + + SET SQL_MODE='ORACLE'; + + + CREATE OR REPLACE PACKAGE test_package AS FUNCTION getSalary(eid INT) + RETURN DECIMAL(10,2); + END; + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql new file mode 100644 index 0000000..47bbf2b --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql @@ -0,0 +1 @@ +INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml new file mode 100644 index 0000000..bc5dc21 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml @@ -0,0 +1,63 @@ + + + + + SET SQL_MODE='ORACLE'; + + + + + CREATE OR REPLACE PROCEDURE test_procedure + AS + BEGIN + END; + + + + + + + + CREATE OR REPLACE PROCEDURE test_package + AS + BEGIN + END; + + + + + + + + CREATE OR REPLACE PACKAGE test_package AS PROCEDURE test_procedure; + END; + + + SET SQL_MODE='ORACLE'; + DROP PACKAGE test_package; + + + + + CREATE PACKAGE BODY test_package AS testVariable DECIMAL(10,2):=500; + PROCEDURE test_procedure() AS + BEGIN + INSERT INTO posts (id, author_id, title, description, content, inserted_date) values ('6','Jayden','Walter','lillian66@example.com','2010-02-27','1990-02-04 02:32:00'); + END; + END; + + + + SET SQL_MODE='ORACLE'; + DROP PACKAGE BODY test_package; + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml new file mode 100644 index 0000000..e8e9590 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml @@ -0,0 +1,25 @@ + + + + + test procedure + CREATE OR REPLACE PROCEDURE test_procedure() + LANGUAGE 'plpgsql' + AS $$ + BEGIN + END; + $$ + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql new file mode 100644 index 0000000..47bbf2b --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql @@ -0,0 +1 @@ +INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql new file mode 100644 index 0000000..bf11c26 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql @@ -0,0 +1 @@ +CREATE TABLE "test_table_xml" ("test_column" INTEGER); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml new file mode 100644 index 0000000..5fa53db --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml @@ -0,0 +1,40 @@ + + + + test procedure + CREATE OR REPLACE FUNCTION test_function() + RETURNS trigger + AS $$ + BEGIN + RAISE NOTICE 'Test trigger function created'; + RETURN NEW; + END; + $$ + LANGUAGE plpgsql; + + + DROP FUNCTION test_function() + + + + CREATE TRIGGER test_trigger + BEFORE INSERT ON posts + FOR EACH ROW EXECUTE PROCEDURE test_function(); + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql new file mode 100644 index 0000000..6c3a799 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql @@ -0,0 +1,5 @@ +CREATE VIEW "test_view" AS SELECT authors.id, + authors.first_name, + authors.last_name, + authors.email + FROM authors;; \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml new file mode 100644 index 0000000..8478a89 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml @@ -0,0 +1,15 @@ + + + + + select id, first_name, last_name, email from authors + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql new file mode 100644 index 0000000..ca2ae49 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql @@ -0,0 +1 @@ +CREATE TABLE "test_table" ("id" INTEGER NOT NULL, CONSTRAINT "test_pk" PRIMARY KEY ("id")); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml new file mode 100644 index 0000000..9baa7da --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql new file mode 100644 index 0000000..1533662 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql @@ -0,0 +1,3 @@ +CREATE TABLE "test_table" ("id" INTEGER); + +ALTER TABLE "test_table" ADD CONSTRAINT "test_unique_constraint" UNIQUE ("id"); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml new file mode 100644 index 0000000..1ead84f --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addColumn.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addColumn.xml new file mode 100644 index 0000000..75245c8 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addColumn.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml new file mode 100644 index 0000000..20b05ec --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addPrimaryKey.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addPrimaryKey.xml new file mode 100644 index 0000000..0a9dc72 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addPrimaryKey.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml new file mode 100644 index 0000000..73cb19c --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml new file mode 100644 index 0000000..eeb1f25 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createSequence.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createSequence.xml new file mode 100644 index 0000000..821bda3 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createSequence.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createTable.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createTable.xml new file mode 100644 index 0000000..76c50a9 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createTable.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createView.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createView.xml new file mode 100644 index 0000000..b582ec3 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createView.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + select test_column from view_table + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml new file mode 100644 index 0000000..76c50a9 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json new file mode 100644 index 0000000..8907c0c --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json @@ -0,0 +1,51 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.Column": [ + { + "column": { + "name": "test_column", + "nullable": true, + "type": { + "typeName": "int4" + } + } + }, + { + "column": { + "name": "varcharColumn", + "nullable": true, + "type": { + "typeName": "varchar" + } + } + }, + { + "column": { + "name": "intColumn", + "nullable": true, + "type": { + "typeName": "int4" + } + } + }, + { + "column": { + "name": "dateColumn", + "nullable": true, + "type": { + "typeName": "date" + } + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json new file mode 100644 index 0000000..17ab940 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json @@ -0,0 +1,27 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table_base" + } + }, + { + "table": { + "name": "test_table_reference" + } + } + ], + "liquibase.structure.core.ForeignKey": [ + { + "foreignKey": { + "deferrable": false, + "initiallyDeferred": false, + "name": "test_fk" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json new file mode 100644 index 0000000..38b2c85 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json @@ -0,0 +1,20 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.PrimaryKey": [ + { + "primaryKey": { + "name": "test_pk" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json new file mode 100644 index 0000000..1a824fd --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json @@ -0,0 +1,32 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ], + "liquibase.structure.core.Index": [ + { + "index": { + "name": "test_unique_constraint", + "unique": true + } + } + ], + "liquibase.structure.core.UniqueConstraint": [ + { + "uniqueConstraint": { + "deferrable": false, + "disabled": false, + "initiallyDeferred": false, + "name": "test_unique_constraint", + "validate": true + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json new file mode 100644 index 0000000..a88b65c --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json @@ -0,0 +1,13 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "test_table" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createSequence.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createSequence.json new file mode 100644 index 0000000..2735a7a --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createSequence.json @@ -0,0 +1,18 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Sequence": [ + { + "sequence": { + "incrementBy": "1\\!\\{java.math.BigInteger\\}", + "maxValue": "9223372036854775807\\!\\{java.math.BigInteger\\}", + "minValue": "1\\!\\{java.math.BigInteger\\}", + "name": "test_sequence", + "startValue": "1\\!\\{java.math.BigInteger\\}", + "willCycle": false + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json new file mode 100644 index 0000000..7fe07f5 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json @@ -0,0 +1,23 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "snapshot_test_table" + } + } + ], + "liquibase.structure.core.Column": [ + { + "column": { + "name": "snapshot_test_column", + "type": { + "typeName": "int4" + } + } + } + ] + } + } +} diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json new file mode 100644 index 0000000..65f3a2d --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json @@ -0,0 +1,21 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Table": [ + { + "table": { + "name": "view_table" + } + } + ], + "liquibase.structure.core.View": [ + { + "view": { + "definition": "SELECT view_table.test_column FROM view_table;", + "name": "test_view" + } + } + ] + } + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json new file mode 100644 index 0000000..0c410a6 --- /dev/null +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json @@ -0,0 +1,20 @@ +{ + "snapshot": { + "objects": { + "liquibase.structure.core.Catalog": [ + { + "catalog": { + "name": "lbcat" + } + } + ], + "liquibase.structure.core.Schema": [ + { + "schema": { + "name": "public" + } + } + ] + } + } +} From a1de912d793b8327d285ec920d103a9d165e7d62 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 15:36:57 +0200 Subject: [PATCH 09/33] CICD test --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2681e20..2841e62 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,11 @@ snakeyaml 1.33 + + org.skyscreamer + jsonassert + 1.5.1 + com.amazon.redshift redshift-jdbc42 From bb946c4901746199f78531e2d17e317bc5125d12 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 16:03:48 +0200 Subject: [PATCH 10/33] CICD test --- .../redshift/addCheckConstraint.sql | 0 .../redshift/addCheckConstraint.xml | 0 .../redshift/addForeignKeyConstraint.sql | 0 .../redshift/addForeignKeyConstraint.xml | 0 .../{expectedChangelog => expectedChangeLog}/redshift/column.sql | 0 .../{expectedChangelog => expectedChangeLog}/redshift/column.xml | 0 .../redshift/createFunction.sql | 0 .../redshift/createFunction.xml | 0 .../redshift/createIndex.sql | 0 .../redshift/createIndex.xml | 0 .../redshift/createPackage.sql | 0 .../redshift/createPackage.xml | 0 .../redshift/createPackageBody.sql | 0 .../redshift/createPackageBody.xml | 0 .../redshift/createProcedure.xml | 0 .../redshift/createSynonym.sql | 0 .../redshift/createTable.sql | 0 .../redshift/createTrigger.xml | 0 .../redshift/createView.sql | 0 .../redshift/createView.xml | 0 .../{expectedChangelog => expectedChangeLog}/redshift/primary.sql | 0 .../{expectedChangelog => expectedChangeLog}/redshift/primary.xml | 0 .../{expectedChangelog => expectedChangeLog}/redshift/unique.sql | 0 .../{expectedChangelog => expectedChangeLog}/redshift/unique.xml | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/addCheckConstraint.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/addCheckConstraint.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/addForeignKeyConstraint.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/addForeignKeyConstraint.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/column.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/column.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createFunction.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createFunction.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createIndex.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createIndex.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createPackage.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createPackage.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createPackageBody.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createPackageBody.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createProcedure.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createSynonym.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createTable.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createTrigger.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createView.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createView.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/primary.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/primary.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/unique.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/unique.xml (100%) diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createProcedure.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createProcedure.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createSynonym.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createSynonym.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTrigger.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTrigger.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml From dfe9e44ae1611121aa0b809bb130524a8e5a3d01 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 16:13:59 +0200 Subject: [PATCH 11/33] CICD test --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2841e62..53caa3c 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,11 @@ liquibase-core ${liquibase.version} + + org.liquibase + liquibase-commercial + ${liquibase.version} + org.spockframework spock-core From 36d86632cdca7212feab27764b09e64a2908c0da Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 11 Jan 2023 17:32:35 +0200 Subject: [PATCH 12/33] CICD test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01c8570..c16ecf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: - name: Advanced Harness Test Run env: - LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.LICENSE_KEY }} + LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.PRO_LICENSE_KEY }} run: mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Archive Test Results From f843b488a9ce195b532cbe83beab36598ca67245 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 12 Jan 2023 12:25:45 +0200 Subject: [PATCH 13/33] Fixing test data --- .../redshift/addForeignKeyConstraint.xml | 5 -- .../redshift/createFunction.xml | 1 + .../redshift/createIndex.sql | 3 - .../redshift/createIndex.xml | 24 ------- .../redshift/createPackage.sql | 1 - .../redshift/createPackage.xml | 21 ------- .../redshift/createPackageBody.sql | 1 - .../redshift/createPackageBody.xml | 63 ------------------- .../expectedChangeLog/redshift/createView.xml | 12 +++- .../expectedChangeLog/redshift/primary.xml | 4 +- .../expectedChangeLog/redshift/unique.xml | 2 - .../redshift/addForeignKeyConstraint.xml | 2 - .../redshift/addUniqueConstraint.xml | 2 - 13 files changed, 15 insertions(+), 126 deletions(-) delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml index 4e67958..591eac6 100644 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml @@ -28,11 +28,6 @@ - - - - - CREATE OR REPLACE FUNCTION test_function() RETURNS trigger + STABLE AS $$ BEGIN RAISE NOTICE 'Test function created'; diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.sql deleted file mode 100644 index cd5bf06..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE TABLE "test_table" ("id" INTEGER); - -CREATE INDEX "idx_first_name" ON "test_table"("id"); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.xml deleted file mode 100644 index 825d697..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createIndex.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.sql deleted file mode 100644 index 47bbf2b..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.sql +++ /dev/null @@ -1 +0,0 @@ -INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.xml deleted file mode 100644 index 437c1e8..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackage.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - SET SQL_MODE='ORACLE'; - - - CREATE OR REPLACE PACKAGE test_package AS FUNCTION getSalary(eid INT) - RETURN DECIMAL(10,2); - END; - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.sql deleted file mode 100644 index 47bbf2b..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.sql +++ /dev/null @@ -1 +0,0 @@ -INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.xml deleted file mode 100644 index bc5dc21..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createPackageBody.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - SET SQL_MODE='ORACLE'; - - - - - CREATE OR REPLACE PROCEDURE test_procedure - AS - BEGIN - END; - - - - - - - - CREATE OR REPLACE PROCEDURE test_package - AS - BEGIN - END; - - - - - - - - CREATE OR REPLACE PACKAGE test_package AS PROCEDURE test_procedure; - END; - - - SET SQL_MODE='ORACLE'; - DROP PACKAGE test_package; - - - - - CREATE PACKAGE BODY test_package AS testVariable DECIMAL(10,2):=500; - PROCEDURE test_procedure() AS - BEGIN - INSERT INTO posts (id, author_id, title, description, content, inserted_date) values ('6','Jayden','Walter','lillian66@example.com','2010-02-27','1990-02-04 02:32:00'); - END; - END; - - - - SET SQL_MODE='ORACLE'; - DROP PACKAGE BODY test_package; - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml index 8478a89..8b6e955 100644 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml @@ -5,8 +5,18 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> + + + + + + + + + + - select id, first_name, last_name, email from authors + select id from test_table_view diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml index 9baa7da..cb98409 100644 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml @@ -6,7 +6,9 @@ http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + + + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml index 1ead84f..fc0e840 100644 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml @@ -15,8 +15,6 @@ diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml index 20b05ec..51054e6 100644 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml @@ -29,8 +29,6 @@ diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml index 73cb19c..fc0e840 100644 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml @@ -15,8 +15,6 @@ From e73177e48545d6c3bff7cecd3982f094f390be22 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 12 Jan 2023 12:59:33 +0200 Subject: [PATCH 14/33] Fixing test data --- .../expectedChangelog/redshift/addForeignKeyConstraint.xml | 2 -- .../expectedChangelog/redshift/createFunction.xml | 3 ++- .../expectedChangelog/{redshift => temp}/column.xml | 0 src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy | 5 +++++ .../expectedChangeLog/redshift/createSynonym.sql | 1 - .../{redshift => temp}/addCheckConstraint.sql | 0 .../{redshift => temp}/addCheckConstraint.xml | 0 .../{redshift => temp}/addForeignKeyConstraint.sql | 0 .../{redshift => temp}/addForeignKeyConstraint.xml | 0 .../expectedChangeLog/{redshift => temp}/column.sql | 0 .../expectedChangeLog/{redshift => temp}/column.xml | 0 .../expectedChangeLog/{redshift => temp}/createFunction.sql | 0 .../expectedChangeLog/{redshift => temp}/createFunction.xml | 0 .../expectedChangeLog/{redshift => temp}/createProcedure.xml | 0 .../expectedChangeLog/temp}/createSynonym.sql | 0 .../expectedChangeLog/{redshift => temp}/createTable.sql | 0 .../expectedChangeLog/{redshift => temp}/createTrigger.xml | 0 .../expectedChangeLog/{redshift => temp}/createView.sql | 0 .../expectedChangeLog/{redshift => temp}/createView.xml | 0 .../expectedChangeLog/{redshift => temp}/primary.sql | 0 .../expectedChangeLog/{redshift => temp}/primary.xml | 0 .../expectedChangeLog/{redshift => temp}/unique.sql | 0 .../expectedChangeLog/{redshift => temp}/unique.xml | 0 .../snapshot/changelogs/{redshift => temp}/addColumn.xml | 0 .../{redshift => temp}/addForeignKeyConstraint.xml | 0 .../snapshot/changelogs/{redshift => temp}/addPrimaryKey.xml | 0 .../changelogs/{redshift => temp}/addUniqueConstraint.xml | 0 .../snapshot/changelogs/{redshift => temp}/createIndex.xml | 0 .../changelogs/{redshift => temp}/createSequence.xml | 0 .../snapshot/changelogs/{redshift => temp}/createTable.xml | 0 .../snapshot/changelogs/{redshift => temp}/createView.xml | 0 .../{redshift => temp}/snapshotCaalogAndSchema.xml | 0 .../expectedSnapshot/{redshift => temp}/addColumn.json | 0 .../{redshift => temp}/addForeignKeyConstraint.json | 0 .../expectedSnapshot/{redshift => temp}/addPrimaryKey.json | 0 .../{redshift => temp}/addUniqueConstraint.json | 0 .../expectedSnapshot/{redshift => temp}/createIndex.json | 0 .../expectedSnapshot/{redshift => temp}/createSequence.json | 0 .../expectedSnapshot/{redshift => temp}/createTable.json | 0 .../expectedSnapshot/{redshift => temp}/createView.json | 0 .../{redshift => temp}/snapshotCaalogAndSchema.json | 0 41 files changed, 7 insertions(+), 4 deletions(-) rename src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/{redshift => temp}/column.xml (100%) delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createSynonym.sql rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/addCheckConstraint.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/addCheckConstraint.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/addForeignKeyConstraint.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/addForeignKeyConstraint.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/column.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/column.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createFunction.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createFunction.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createProcedure.xml (100%) rename src/{main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift => test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp}/createSynonym.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createTable.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createTrigger.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createView.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/createView.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/primary.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/primary.xml (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/unique.sql (100%) rename src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/{redshift => temp}/unique.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/addColumn.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/addForeignKeyConstraint.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/addPrimaryKey.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/addUniqueConstraint.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/createIndex.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/createSequence.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/createTable.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/createView.xml (100%) rename src/test/resources/liquibase/harness/snapshot/changelogs/{redshift => temp}/snapshotCaalogAndSchema.xml (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/addColumn.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/addForeignKeyConstraint.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/addPrimaryKey.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/addUniqueConstraint.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/createIndex.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/createSequence.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/createTable.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/createView.json (100%) rename src/test/resources/liquibase/harness/snapshot/expectedSnapshot/{redshift => temp}/snapshotCaalogAndSchema.json (100%) diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml index 4e67958..4ef5335 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml @@ -36,8 +36,6 @@ diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml index 6ab0d0a..17b006d 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml @@ -10,13 +10,14 @@ encoding="UTF-8" functionName="test_function">CREATE OR REPLACE FUNCTION test_function() RETURNS trigger + STABLE AS $$ BEGIN RAISE NOTICE 'Test function created'; RETURN NEW; END; $$ - LANGUAGE plpgsql; + LANGUAGE sql; diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/temp/column.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/temp/column.xml diff --git a/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy b/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy index fc93da6..dfc397f 100644 --- a/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy +++ b/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy @@ -1,4 +1,9 @@ import liquibase.harness.AdvancedHarnessSuite +import liquibase.harness.config.TestConfig class LiquibaseHarnessAdvancedSuiteTest extends AdvancedHarnessSuite { + static { + //extensions don't distribute their files. Only we store them in src/main/resources. + TestConfig.instance.outputResourcesBase = "src/main/resources" + } } \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createSynonym.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createSynonym.sql deleted file mode 100644 index 47bbf2b..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createSynonym.sql +++ /dev/null @@ -1 +0,0 @@ -INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addCheckConstraint.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createFunction.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createProcedure.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createProcedure.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createSynonym.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createSynonym.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createSynonym.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTable.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTable.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTrigger.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTrigger.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.sql similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.sql rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml rename to src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addColumn.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addColumn.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addColumn.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/addColumn.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addForeignKeyConstraint.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/addForeignKeyConstraint.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addPrimaryKey.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addPrimaryKey.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addPrimaryKey.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/addPrimaryKey.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addUniqueConstraint.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/addUniqueConstraint.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createIndex.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/createIndex.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createSequence.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createSequence.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createSequence.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/createSequence.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createTable.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createTable.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createTable.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/createTable.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createView.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createView.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createView.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/createView.xml diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/snapshotCaalogAndSchema.xml similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/changelogs/redshift/snapshotCaalogAndSchema.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/temp/snapshotCaalogAndSchema.xml diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addColumn.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addColumn.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addForeignKeyConstraint.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addForeignKeyConstraint.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addPrimaryKey.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addPrimaryKey.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addUniqueConstraint.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addUniqueConstraint.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createIndex.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createIndex.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createSequence.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createSequence.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createSequence.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createSequence.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createTable.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createTable.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createView.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createView.json diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/snapshotCaalogAndSchema.json similarity index 100% rename from src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/snapshotCaalogAndSchema.json From 4424ec50318332fbe22918867cc37c91aae71dfe Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Tue, 17 Jan 2023 11:11:54 +0200 Subject: [PATCH 15/33] Fixing test data and updated README.test-harness --- README.test-harness.md | 11 ++++ .../redshift/addForeignKeyConstraint.sql | 0 .../redshift}/addForeignKeyConstraint.xml | 4 +- .../redshift/column.sql | 0 .../redshift}/column.xml | 0 .../redshift/createTable.sql | 0 .../redshift/createView.sql | 0 .../redshift}/createView.xml | 6 +-- .../redshift/primary.sql | 0 .../expectedChangeLog/redshift}/primary.xml | 0 .../redshift/unique.sql | 0 .../expectedChangeLog/redshift}/unique.xml | 0 .../temp}/addCheckConstraint.sql | 0 .../temp}/addCheckConstraint.xml | 0 .../temp}/createFunction.sql | 0 .../temp}/createFunction.xml | 0 .../temp}/createPackage.sql | 0 .../temp}/createPackage.xml | 0 .../temp}/createPackageBody.sql | 0 .../temp}/createPackageBody.xml | 0 .../temp}/createProcedure.xml | 0 .../temp}/createTrigger.xml | 0 .../redshift/addForeignKeyConstraint.xml | 47 ----------------- .../redshift/createIndex.sql | 3 -- .../redshift/createIndex.xml | 24 --------- .../expectedChangelog/redshift/createView.xml | 15 ------ .../expectedChangelog/redshift/primary.xml | 26 ---------- .../expectedChangelog/redshift/unique.xml | 27 ---------- .../LiquibaseHarnessAdvancedSuiteTest.groovy | 6 ++- .../temp/addCheckConstraint.sql | 1 - .../temp/addCheckConstraint.xml | 14 ----- .../temp/addForeignKeyConstraint.sql | 7 --- .../expectedChangeLog/temp/column.sql | 1 - .../expectedChangeLog/temp/column.xml | 23 --------- .../expectedChangeLog/temp/createFunction.sql | 9 ---- .../expectedChangeLog/temp/createFunction.xml | 26 ---------- .../temp/createProcedure.xml | 25 --------- .../expectedChangeLog/temp/createSynonym.sql | 1 - .../expectedChangeLog/temp/createTable.sql | 1 - .../expectedChangeLog/temp/createTrigger.xml | 40 --------------- .../expectedChangeLog/temp/createView.sql | 5 -- .../expectedChangeLog/temp/createView.xml | 25 --------- .../expectedChangeLog/temp/primary.sql | 1 - .../expectedChangeLog/temp/unique.sql | 3 -- .../snapshot/changelogs/temp/addColumn.xml | 23 --------- .../temp/addForeignKeyConstraint.xml | 40 --------------- .../changelogs/temp/addPrimaryKey.xml | 28 ---------- .../changelogs/temp/addUniqueConstraint.xml | 25 --------- .../snapshot/changelogs/temp/createIndex.xml | 15 ------ .../changelogs/temp/createSequence.xml | 19 ------- .../snapshot/changelogs/temp/createTable.xml | 15 ------ .../temp/snapshotCaalogAndSchema.xml | 15 ------ .../expectedSnapshot/temp/addColumn.json | 51 ------------------- .../temp/addForeignKeyConstraint.json | 27 ---------- .../expectedSnapshot/temp/addPrimaryKey.json | 20 -------- .../temp/addUniqueConstraint.json | 32 ------------ .../expectedSnapshot/temp/createIndex.json | 13 ----- .../expectedSnapshot/temp/createSequence.json | 18 ------- .../expectedSnapshot/temp/createTable.json | 23 --------- .../expectedSnapshot/temp/createView.json | 21 -------- .../temp/snapshotCaalogAndSchema.json | 20 -------- 61 files changed, 20 insertions(+), 736 deletions(-) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/addForeignKeyConstraint.sql (100%) rename src/{test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp => main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift}/addForeignKeyConstraint.xml (92%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/column.sql (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/temp => expectedChangeLog/redshift}/column.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createTable.sql (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/createView.sql (100%) rename src/{test/resources/liquibase/harness/snapshot/changelogs/temp => main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift}/createView.xml (82%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/primary.sql (100%) rename src/{test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp => main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift}/primary.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog => expectedChangeLog}/redshift/unique.sql (100%) rename src/{test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp => main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift}/unique.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/addCheckConstraint.sql (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/addCheckConstraint.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createFunction.sql (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createFunction.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createPackage.sql (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createPackage.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createPackageBody.sql (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createPackageBody.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createProcedure.xml (100%) rename src/main/resources/liquibase/harness/generateChangelog/{expectedChangelog/redshift => expectedChangeLog/temp}/createTrigger.xml (100%) delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml rename src/test/groovy/{ => liquibase/ext/redshift}/LiquibaseHarnessAdvancedSuiteTest.groovy (55%) delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createSynonym.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTable.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.sql delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/addColumn.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/addForeignKeyConstraint.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/addPrimaryKey.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/addUniqueConstraint.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/createIndex.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/createSequence.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/createTable.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/changelogs/temp/snapshotCaalogAndSchema.xml delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addColumn.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addForeignKeyConstraint.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addPrimaryKey.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addUniqueConstraint.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createIndex.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createSequence.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createTable.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createView.json delete mode 100644 src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/snapshotCaalogAndSchema.json diff --git a/README.test-harness.md b/README.test-harness.md index 8253481..32560de 100644 --- a/README.test-harness.md +++ b/README.test-harness.md @@ -18,5 +18,16 @@ Redshift specific change objects tests created exclusively to test this extensio `src/test/resources/liquibase/harness/changelogs/redshift` directory. If the directory does not already exist, please create it and add the test files that you would like tested). +#### Executing harness Advanced test +- From your IDE, right click on the `LiquibaseHarnessAdvancedSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. + - Doing so, will allow you to execute Advanced harness suite, which includes GenerateChangelog and Snapshot tests. Test data for these tests will be located in the + `src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift` and `src/main/resources/liquibase/harness/snapshot/changelogs(expectedSnapshot)/redshift`directories. + - If the directories do not already exist, please create them and add the test data files that you would like to be tested. + +##### Alternative ways to run advanced harness test +- Using maven by executing next command: + mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test + - where USERNAME, PASSWORD and URL are connection credentials + #### Troubleshooting notes - If your IDE doesn't allow you to run LiquibaseHarnessSuiteIT as a test class, mark test/groovy folder as test classes folder in your IDE diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml similarity index 92% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml index 591eac6..92943ae 100644 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.xml +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.xml @@ -27,12 +27,10 @@ - + diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/column.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.sql diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/temp/column.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/temp/column.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTable.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.sql diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createView.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml similarity index 82% rename from src/test/resources/liquibase/harness/snapshot/changelogs/temp/createView.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml index b582ec3..4fcbf2c 100644 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createView.xml +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml @@ -5,16 +5,16 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + - + - select test_column from view_table + select test_column from view_test_table diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/primary.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.sql diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml similarity index 100% rename from src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addCheckConstraint.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createFunction.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.sql diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackage.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.sql similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.sql rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.sql diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createPackageBody.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createProcedure.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml similarity index 100% rename from src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createTrigger.xml rename to src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml deleted file mode 100644 index 4ef5335..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/addForeignKeyConstraint.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql deleted file mode 100644 index cd5bf06..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE TABLE "test_table" ("id" INTEGER); - -CREATE INDEX "idx_first_name" ON "test_table"("id"); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml deleted file mode 100644 index 825d697..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createIndex.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml deleted file mode 100644 index 8478a89..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/createView.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - select id, first_name, last_name, email from authors - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml deleted file mode 100644 index 9baa7da..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/primary.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml deleted file mode 100644 index 1ead84f..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangelog/redshift/unique.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy similarity index 55% rename from src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy rename to src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy index dfc397f..faefadd 100644 --- a/src/test/groovy/LiquibaseHarnessAdvancedSuiteTest.groovy +++ b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy @@ -1,7 +1,11 @@ +package liquibase.ext.redshift + import liquibase.harness.AdvancedHarnessSuite import liquibase.harness.config.TestConfig +import liquibase.harness.generateChangelog.GenerateChangelogTest +import liquibase.harness.snapshot.SnapshotObjectTests -class LiquibaseHarnessAdvancedSuiteTest extends AdvancedHarnessSuite { +class LiquibaseHarnessAdvancedSuiteTest extends SnapshotObjectTests { static { //extensions don't distribute their files. Only we store them in src/main/resources. TestConfig.instance.outputResourcesBase = "src/main/resources" diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql deleted file mode 100644 index eaeb5b2..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE "posts" ADD CONSTRAINT "test_check_constraint" CHECK (((id > 0))); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml deleted file mode 100644 index 3949116..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - id > 0 - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.sql deleted file mode 100644 index b17bf51..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addForeignKeyConstraint.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE "test_table_reference" ("id" INTEGER NOT NULL, "test_column" INTEGER NOT NULL, CONSTRAINT "test_table_reference_pkey" PRIMARY KEY ("id")); - -ALTER TABLE "test_table_reference" ADD CONSTRAINT "test_table_reference_test_column_key" UNIQUE ("test_column"); - -CREATE TABLE "test_table_base" ("id" INTEGER NOT NULL, CONSTRAINT "test_table_base_pkey" PRIMARY KEY ("id")); - -ALTER TABLE "test_table_base" ADD CONSTRAINT "test_fk" FOREIGN KEY ("id") REFERENCES "test_table_reference" ("test_column") ON UPDATE RESTRICT ON DELETE CASCADE; \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.sql deleted file mode 100644 index 061aa52..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE TABLE "test_table" ("test_column" INTEGER, "varcharColumn" VARCHAR(25), "intColumn" INTEGER, "dateColumn" date); diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.xml deleted file mode 100644 index 75245c8..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/column.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql deleted file mode 100644 index 1ace2af..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE FUNCTION "public".test_function() - RETURNS trigger - LANGUAGE plpgsql -AS $function$ - BEGIN - RAISE NOTICE 'Test function created'; - RETURN NEW; - END; - $function$; \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml deleted file mode 100644 index 1a9d58b..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - CREATE OR REPLACE FUNCTION test_function() - RETURNS trigger - STABLE - AS $$ - BEGIN - RAISE NOTICE 'Test function created'; - RETURN NEW; - END; - $$ - LANGUAGE plpgsql; - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml deleted file mode 100644 index e8e9590..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - test procedure - CREATE OR REPLACE PROCEDURE test_procedure() - LANGUAGE 'plpgsql' - AS $$ - BEGIN - END; - $$ - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createSynonym.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createSynonym.sql deleted file mode 100644 index 47bbf2b..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createSynonym.sql +++ /dev/null @@ -1 +0,0 @@ -INVALID TEST \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTable.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTable.sql deleted file mode 100644 index bf11c26..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTable.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE TABLE "test_table_xml" ("test_column" INTEGER); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml deleted file mode 100644 index 5fa53db..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - test procedure - CREATE OR REPLACE FUNCTION test_function() - RETURNS trigger - AS $$ - BEGIN - RAISE NOTICE 'Test trigger function created'; - RETURN NEW; - END; - $$ - LANGUAGE plpgsql; - - - DROP FUNCTION test_function() - - - - CREATE TRIGGER test_trigger - BEFORE INSERT ON posts - FOR EACH ROW EXECUTE PROCEDURE test_function(); - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.sql deleted file mode 100644 index 6c3a799..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE VIEW "test_view" AS SELECT authors.id, - authors.first_name, - authors.last_name, - authors.email - FROM authors;; \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.xml deleted file mode 100644 index 8b6e955..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createView.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - select id from test_table_view - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.sql deleted file mode 100644 index ca2ae49..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/primary.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE TABLE "test_table" ("id" INTEGER NOT NULL, CONSTRAINT "test_pk" PRIMARY KEY ("id")); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.sql deleted file mode 100644 index 1533662..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/unique.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE TABLE "test_table" ("id" INTEGER); - -ALTER TABLE "test_table" ADD CONSTRAINT "test_unique_constraint" UNIQUE ("id"); \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addColumn.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addColumn.xml deleted file mode 100644 index 75245c8..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addColumn.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addForeignKeyConstraint.xml deleted file mode 100644 index 51054e6..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addForeignKeyConstraint.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addPrimaryKey.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addPrimaryKey.xml deleted file mode 100644 index 0a9dc72..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addPrimaryKey.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addUniqueConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addUniqueConstraint.xml deleted file mode 100644 index fc0e840..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/addUniqueConstraint.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createIndex.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createIndex.xml deleted file mode 100644 index eeb1f25..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createIndex.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createSequence.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createSequence.xml deleted file mode 100644 index 821bda3..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createSequence.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createTable.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createTable.xml deleted file mode 100644 index 76c50a9..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/createTable.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/snapshotCaalogAndSchema.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/temp/snapshotCaalogAndSchema.xml deleted file mode 100644 index 76c50a9..0000000 --- a/src/test/resources/liquibase/harness/snapshot/changelogs/temp/snapshotCaalogAndSchema.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addColumn.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addColumn.json deleted file mode 100644 index 8907c0c..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addColumn.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "test_table" - } - } - ], - "liquibase.structure.core.Column": [ - { - "column": { - "name": "test_column", - "nullable": true, - "type": { - "typeName": "int4" - } - } - }, - { - "column": { - "name": "varcharColumn", - "nullable": true, - "type": { - "typeName": "varchar" - } - } - }, - { - "column": { - "name": "intColumn", - "nullable": true, - "type": { - "typeName": "int4" - } - } - }, - { - "column": { - "name": "dateColumn", - "nullable": true, - "type": { - "typeName": "date" - } - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addForeignKeyConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addForeignKeyConstraint.json deleted file mode 100644 index 17ab940..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addForeignKeyConstraint.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "test_table_base" - } - }, - { - "table": { - "name": "test_table_reference" - } - } - ], - "liquibase.structure.core.ForeignKey": [ - { - "foreignKey": { - "deferrable": false, - "initiallyDeferred": false, - "name": "test_fk" - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addPrimaryKey.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addPrimaryKey.json deleted file mode 100644 index 38b2c85..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addPrimaryKey.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "test_table" - } - } - ], - "liquibase.structure.core.PrimaryKey": [ - { - "primaryKey": { - "name": "test_pk" - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addUniqueConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addUniqueConstraint.json deleted file mode 100644 index 1a824fd..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/addUniqueConstraint.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "test_table" - } - } - ], - "liquibase.structure.core.Index": [ - { - "index": { - "name": "test_unique_constraint", - "unique": true - } - } - ], - "liquibase.structure.core.UniqueConstraint": [ - { - "uniqueConstraint": { - "deferrable": false, - "disabled": false, - "initiallyDeferred": false, - "name": "test_unique_constraint", - "validate": true - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createIndex.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createIndex.json deleted file mode 100644 index a88b65c..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createIndex.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "test_table" - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createSequence.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createSequence.json deleted file mode 100644 index 2735a7a..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createSequence.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Sequence": [ - { - "sequence": { - "incrementBy": "1\\!\\{java.math.BigInteger\\}", - "maxValue": "9223372036854775807\\!\\{java.math.BigInteger\\}", - "minValue": "1\\!\\{java.math.BigInteger\\}", - "name": "test_sequence", - "startValue": "1\\!\\{java.math.BigInteger\\}", - "willCycle": false - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createTable.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createTable.json deleted file mode 100644 index 7fe07f5..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createTable.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "snapshot_test_table" - } - } - ], - "liquibase.structure.core.Column": [ - { - "column": { - "name": "snapshot_test_column", - "type": { - "typeName": "int4" - } - } - } - ] - } - } -} diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createView.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createView.json deleted file mode 100644 index 65f3a2d..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/createView.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Table": [ - { - "table": { - "name": "view_table" - } - } - ], - "liquibase.structure.core.View": [ - { - "view": { - "definition": "SELECT view_table.test_column FROM view_table;", - "name": "test_view" - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/snapshotCaalogAndSchema.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/snapshotCaalogAndSchema.json deleted file mode 100644 index 0c410a6..0000000 --- a/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/temp/snapshotCaalogAndSchema.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Catalog": [ - { - "catalog": { - "name": "lbcat" - } - } - ], - "liquibase.structure.core.Schema": [ - { - "schema": { - "name": "public" - } - } - ] - } - } -} From 0f6ff9c7737eb4911c36b7929c37f1d057c06443 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Tue, 17 Jan 2023 17:13:51 +0100 Subject: [PATCH 16/33] Updated README.test-harness and added Harness-Foundational test --- .github/workflows/ci.yml | 2 +- README.test-harness.md | 12 +++-- .../LiquibaseHarnessAdvancedSuiteTest.groovy | 4 +- ...iquibaseHarnessFoundaionalSuiteTest.groovy | 11 ++++ .../redshift/createTable.json | 52 +++++++++++++++++++ 5 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy create mode 100644 src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift/createTable.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c16ecf6..ef2afbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: - name: Advanced Harness Test Run env: LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.PRO_LICENSE_KEY }} - run: mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test + run: mvn -Dtest="LiquibaseHarnessFoundationalSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Archive Test Results if: ${{ always() }} diff --git a/README.test-harness.md b/README.test-harness.md index 32560de..f083319 100644 --- a/README.test-harness.md +++ b/README.test-harness.md @@ -24,10 +24,16 @@ Redshift specific change objects tests created exclusively to test this extensio `src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift` and `src/main/resources/liquibase/harness/snapshot/changelogs(expectedSnapshot)/redshift`directories. - If the directories do not already exist, please create them and add the test data files that you would like to be tested. -##### Alternative ways to run advanced harness test +#### Executing harness Foundational test +- From your IDE, right click on the `LiquibaseHarnessFoundationalSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. + - Doing so, will allow you to execute Foundational harness suite. Test data for this test will be located in the + `src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift` directory. + - If the directory does not already exist, please create it and add the test data files that you would like to be tested. + +##### Alternative ways to run harness test suites - Using maven by executing next command: - mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test - - where USERNAME, PASSWORD and URL are connection credentials + mvn -Dtest="TESTSUITE_NAME" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test + - where USERNAME, PASSWORD and URL are connection credentials and TESTSUITE_NAME is the name of test suite you want to execute (LiquibaseHarnessAdvancedSuiteTest, LiquibaseHarnessFoundationalSuiteTest) #### Troubleshooting notes - If your IDE doesn't allow you to run LiquibaseHarnessSuiteIT as a test class, mark test/groovy folder as test classes folder in your IDE diff --git a/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy index faefadd..0e0d63e 100644 --- a/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy +++ b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessAdvancedSuiteTest.groovy @@ -2,10 +2,8 @@ package liquibase.ext.redshift import liquibase.harness.AdvancedHarnessSuite import liquibase.harness.config.TestConfig -import liquibase.harness.generateChangelog.GenerateChangelogTest -import liquibase.harness.snapshot.SnapshotObjectTests -class LiquibaseHarnessAdvancedSuiteTest extends SnapshotObjectTests { +class LiquibaseHarnessAdvancedSuiteTest extends AdvancedHarnessSuite { static { //extensions don't distribute their files. Only we store them in src/main/resources. TestConfig.instance.outputResourcesBase = "src/main/resources" diff --git a/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy new file mode 100644 index 0000000..b2cbcf9 --- /dev/null +++ b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy @@ -0,0 +1,11 @@ +package liquibase.ext.redshift + +import liquibase.harness.FoundationalHarnessSuite +import liquibase.harness.config.TestConfig + +class LiquibaseHarnessFoundaionalSuiteTest extends FoundationalHarnessSuite { + static { + //extensions don't distribute their files. Only we store them in src/main/resources. + TestConfig.instance.outputResourcesBase = "src/main/resources" + } +} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift/createTable.json b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift/createTable.json new file mode 100644 index 0000000..968bdee --- /dev/null +++ b/src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift/createTable.json @@ -0,0 +1,52 @@ +{ + "createTable": [ + { + "comments":"test_comment", + "author":"as", + "description":"sql", + "contexts":"test_context", + "exectype":"EXECUTED", + "labels":"test_label", + "filename":"liquibase\/harness\/compatibility\/foundational\/changelogs\/createTable.xml", + "md5sum":"8:4e697074d57029d3e267ce7507da5cf5", + "id":"1", + "tag":"" + }, + { + "comments":"test_comment", + "author":"as", + "description":"createTable tableName=test_table_yaml", + "contexts":"test_context", + "exectype":"EXECUTED", + "labels":"test_label", + "filename":"liquibase\/harness\/compatibility\/foundational\/changelogs\/createTable.yml", + "md5sum":"8:13bf5dadad410884e263691bc66ee760", + "id":"1", + "tag":"" + }, + { + "comments":"test_comment", + "author":"as", + "description":"createTable tableName=test_table_json", + "contexts":"test_context", + "exectype":"EXECUTED", + "labels":"test_label", + "filename":"liquibase\/harness\/compatibility\/foundational\/changelogs\/createTable.json", + "md5sum":"8:b9ab89365e024967a1da5704f0441428", + "id":"1", + "tag":"" + }, + { + "comments":"test_comment", + "author":"as", + "description":"sql", + "contexts":"test_context", + "exectype":"EXECUTED", + "labels":"test_label", + "filename":"liquibase\/harness\/compatibility\/foundational\/changelogs\/createTable.sql", + "md5sum":"8:3e89383340c9b7c69e4902c53534b7ac", + "id":"1", + "tag":"test_tag" + } + ] +} \ No newline at end of file From 942d39e8cbddc117c6c2275dd777ddea74904d3f Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Tue, 17 Jan 2023 17:18:41 +0100 Subject: [PATCH 17/33] Fix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef2afbc..9af9700 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,8 +130,8 @@ jobs: # run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} - name: Advanced Harness Test Run - env: - LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.PRO_LICENSE_KEY }} +# env: +# LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.PRO_LICENSE_KEY }} run: mvn -Dtest="LiquibaseHarnessFoundationalSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Archive Test Results From 574c0d134b8c063d38f55873cc71078409722dd8 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Tue, 17 Jan 2023 17:21:33 +0100 Subject: [PATCH 18/33] Fix --- ...Test.groovy => LiquibaseHarnessFoundationalSuiteTest.groovy} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/test/groovy/liquibase/ext/redshift/{LiquibaseHarnessFoundaionalSuiteTest.groovy => LiquibaseHarnessFoundationalSuiteTest.groovy} (79%) diff --git a/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundationalSuiteTest.groovy similarity index 79% rename from src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy rename to src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundationalSuiteTest.groovy index b2cbcf9..4710fed 100644 --- a/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundaionalSuiteTest.groovy +++ b/src/test/groovy/liquibase/ext/redshift/LiquibaseHarnessFoundationalSuiteTest.groovy @@ -3,7 +3,7 @@ package liquibase.ext.redshift import liquibase.harness.FoundationalHarnessSuite import liquibase.harness.config.TestConfig -class LiquibaseHarnessFoundaionalSuiteTest extends FoundationalHarnessSuite { +class LiquibaseHarnessFoundationalSuiteTest extends FoundationalHarnessSuite { static { //extensions don't distribute their files. Only we store them in src/main/resources. TestConfig.instance.outputResourcesBase = "src/main/resources" From 9ab9e5fee737e5cb6bb1353b7588f8c13c8163b9 Mon Sep 17 00:00:00 2001 From: Kristyl Gomes <31962545+kristyldatical@users.noreply.github.com> Date: Wed, 18 Jan 2023 22:35:28 -0600 Subject: [PATCH 19/33] Minor text updates --- README.test-harness.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.test-harness.md b/README.test-harness.md index f083319..b472d56 100644 --- a/README.test-harness.md +++ b/README.test-harness.md @@ -18,19 +18,19 @@ Redshift specific change objects tests created exclusively to test this extensio `src/test/resources/liquibase/harness/changelogs/redshift` directory. If the directory does not already exist, please create it and add the test files that you would like tested). -#### Executing harness Advanced test +#### Executing the Harness Advanced test - From your IDE, right click on the `LiquibaseHarnessAdvancedSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. - Doing so, will allow you to execute Advanced harness suite, which includes GenerateChangelog and Snapshot tests. Test data for these tests will be located in the `src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift` and `src/main/resources/liquibase/harness/snapshot/changelogs(expectedSnapshot)/redshift`directories. - If the directories do not already exist, please create them and add the test data files that you would like to be tested. -#### Executing harness Foundational test +#### Executing the Harness Foundational test - From your IDE, right click on the `LiquibaseHarnessFoundationalSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. - Doing so, will allow you to execute Foundational harness suite. Test data for this test will be located in the `src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift` directory. - If the directory does not already exist, please create it and add the test data files that you would like to be tested. -##### Alternative ways to run harness test suites +##### Alternative ways to run the Harness test suites - Using maven by executing next command: mvn -Dtest="TESTSUITE_NAME" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test - where USERNAME, PASSWORD and URL are connection credentials and TESTSUITE_NAME is the name of test suite you want to execute (LiquibaseHarnessAdvancedSuiteTest, LiquibaseHarnessFoundationalSuiteTest) From 5a9b19d3cab24f6d74851f357dd8b299ceb45045 Mon Sep 17 00:00:00 2001 From: Kristyl Gomes <31962545+kristyldatical@users.noreply.github.com> Date: Thu, 19 Jan 2023 14:52:45 -0600 Subject: [PATCH 20/33] Updating step name to Foundational Test Suite --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9af9700..515fe8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,7 +129,7 @@ jobs: # - name: Run Tests # run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} - - name: Advanced Harness Test Run + - name: Harness Foundational Test Suite Run # env: # LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.PRO_LICENSE_KEY }} run: mvn -Dtest="LiquibaseHarnessFoundationalSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test From 8ae24342ae779face28be4a7b0b1f659bc512f58 Mon Sep 17 00:00:00 2001 From: Kristyl Gomes <31962545+kristyldatical@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:24:45 -0600 Subject: [PATCH 21/33] Update README.test-harness.md --- README.test-harness.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.test-harness.md b/README.test-harness.md index b472d56..aa28c7e 100644 --- a/README.test-harness.md +++ b/README.test-harness.md @@ -17,6 +17,12 @@ Update this file to add the connection information for all the databases you wan Redshift specific change objects tests created exclusively to test this extension (These test files will be located in the `src/test/resources/liquibase/harness/changelogs/redshift` directory. If the directory does not already exist, please create it and add the test files that you would like tested). + +#### Executing the Harness Foundational test +- From your IDE, right click on the `LiquibaseHarnessFoundationalSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. + - Doing so, will allow you to execute Foundational harness suite. Test data for this test will be located in the + `src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift` directory. + - If the directory does not already exist, please create it and add the test data files that you would like to be tested. #### Executing the Harness Advanced test - From your IDE, right click on the `LiquibaseHarnessAdvancedSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. @@ -24,12 +30,6 @@ Redshift specific change objects tests created exclusively to test this extensio `src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift` and `src/main/resources/liquibase/harness/snapshot/changelogs(expectedSnapshot)/redshift`directories. - If the directories do not already exist, please create them and add the test data files that you would like to be tested. -#### Executing the Harness Foundational test -- From your IDE, right click on the `LiquibaseHarnessFoundationalSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. - - Doing so, will allow you to execute Foundational harness suite. Test data for this test will be located in the - `src/test/resources/liquibase/harness/compatibility/foundational/expectedResultSet/redshift` directory. - - If the directory does not already exist, please create it and add the test data files that you would like to be tested. - ##### Alternative ways to run the Harness test suites - Using maven by executing next command: mvn -Dtest="TESTSUITE_NAME" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test From 6903d36d663d15ff3a83218abe420b4db4e7098a Mon Sep 17 00:00:00 2001 From: Kristyl Gomes <31962545+kristyldatical@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:46:03 -0600 Subject: [PATCH 22/33] Adding more descriptive content to readme --- README.test-harness.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.test-harness.md b/README.test-harness.md index aa28c7e..04cb855 100644 --- a/README.test-harness.md +++ b/README.test-harness.md @@ -6,17 +6,19 @@ This Liquibase test framework is designed to *also* make it easy for you to test #### Configuring your connections -- We have provided a `harness-config.yml` file in `src/test/resources` directory. -Update this file to add the connection information for all the databases you want the Liquibase Redshift extension to be tested against. - -- Use `harness.initScript.sql` file to create and populate the test database(s) for harness integration tests. - -#### Executing the tests +- Use the provided `harness-config.yml` file in `src/test/resources` directory. +- Update this file to add the connection information for all the databases you want the Liquibase Redshift extension to be tested against. + - *If this config file does not exist, create a new one using this as an example : https://github.com/liquibase/liquibase-test-harness/blob/main/src/test/resources/harness-config.yml* +- Your database under test will need to be created and populated prior to the Harness tests running. + - Use `harness.initScript.sql` file located in the same `src/test/resources` directory to do this preparatory step. + - - *If this config file does not exist, create a new one using this as an example : https://github.com/liquibase/liquibase-test-harness/blob/main/src/test/resources/sqlite/sqlite-init.sql* + +#### Executing the Harness Base test - From your IDE, right click on the `LiquibaseHarnessSuiteIT` test class present in `src/test/groovy` directory. - Doing so, will allow you to execute all the standard change object tests in the liquibase-test-harness as well as the Redshift specific change objects tests created exclusively to test this extension (These test files will be located in the -`src/test/resources/liquibase/harness/changelogs/redshift` directory. If the directory does not already exist, please create - it and add the test files that you would like tested). +`src/test/resources/liquibase/harness/changelogs/redshift` directory. + - If the directory does not already exist, please create it and add the test files that you would like tested). #### Executing the Harness Foundational test - From your IDE, right click on the `LiquibaseHarnessFoundationalSuiteTest` test class present in `src/test/groovy/liquibase/ext/redshift` directory. @@ -32,7 +34,7 @@ Redshift specific change objects tests created exclusively to test this extensio ##### Alternative ways to run the Harness test suites - Using maven by executing next command: - mvn -Dtest="TESTSUITE_NAME" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test + `mvn -Dtest="TESTSUITE_NAME" -DdbName=redshift -DdbUsername=USERNAME -DdbPassword=PASSWORD -DdbUrl=URL test` - where USERNAME, PASSWORD and URL are connection credentials and TESTSUITE_NAME is the name of test suite you want to execute (LiquibaseHarnessAdvancedSuiteTest, LiquibaseHarnessFoundationalSuiteTest) #### Troubleshooting notes From 7f11a42d696e2eb423465087edd8cfed7bb719f0 Mon Sep 17 00:00:00 2001 From: Kristyl Gomes <31962545+kristyldatical@users.noreply.github.com> Date: Thu, 19 Jan 2023 16:27:32 -0600 Subject: [PATCH 23/33] Update README.test-harness.md --- README.test-harness.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.test-harness.md b/README.test-harness.md index 04cb855..a797acd 100644 --- a/README.test-harness.md +++ b/README.test-harness.md @@ -11,7 +11,7 @@ This Liquibase test framework is designed to *also* make it easy for you to test - *If this config file does not exist, create a new one using this as an example : https://github.com/liquibase/liquibase-test-harness/blob/main/src/test/resources/harness-config.yml* - Your database under test will need to be created and populated prior to the Harness tests running. - Use `harness.initScript.sql` file located in the same `src/test/resources` directory to do this preparatory step. - - - *If this config file does not exist, create a new one using this as an example : https://github.com/liquibase/liquibase-test-harness/blob/main/src/test/resources/sqlite/sqlite-init.sql* + - - *If this script file does not exist, create a new one using this as an example : https://github.com/liquibase/liquibase-test-harness/blob/main/src/test/resources/sqlite/sqlite-init.sql* #### Executing the Harness Base test - From your IDE, right click on the `LiquibaseHarnessSuiteIT` test class present in `src/test/groovy` directory. From c9d771c861bb1e661066f87844c7d7279525086a Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 25 Jan 2023 14:23:49 +0100 Subject: [PATCH 24/33] Advanced test fix --- .github/workflows/ci.yml | 8 +-- .../redshift/addForeignKeyConstraint.sql | 8 +-- .../expectedChangeLog/redshift/createView.sql | 8 +-- .../temp/addCheckConstraint.sql | 1 - .../temp/addCheckConstraint.xml | 14 ----- .../expectedChangeLog/temp/createFunction.sql | 9 --- .../expectedChangeLog/temp/createFunction.xml | 26 -------- .../expectedChangeLog/temp/createPackage.sql | 1 - .../expectedChangeLog/temp/createPackage.xml | 21 ------- .../temp/createPackageBody.sql | 1 - .../temp/createPackageBody.xml | 63 ------------------- .../temp/createProcedure.xml | 25 -------- .../expectedChangeLog/temp/createTrigger.xml | 40 ------------ .../snapsot/changelogs/redshift/addColumn.xml | 23 ------- .../changelogs/redshift/addPrimaryKey.xml | 28 --------- .../changelogs/redshift/createSequence.xml | 19 ------ .../changelogs/redshift/createTable.xml | 15 ----- .../changelogs/redshift/createView.xml | 23 ------- .../redshift/snapshotCaalogAndSchema.xml | 15 ----- .../redshift/createSequence.json | 18 ------ .../expectedChangeLog/createTable.xml | 8 +++ .../expectedChangeLog/redshift/column.xml | 11 ++++ .../redshift/createTable.redshift.sql | 5 ++ .../redshift/createView.redshift.sql | 8 +++ .../expectedChangeLog/redshift/createView.xml | 11 ++++ .../expectedChangeLog/redshift/createView.yml | 20 ++++++ .../expectedChangeLog/redshift/unique.xml | 11 ++++ .../redshift/addForeignKeyConstraint.xml | 10 +-- .../redshift/addUniqueConstraint.xml | 2 - .../changelogs/redshift/createIndex.xml | 1 + .../expectedSnapshot/redshift/addColumn.json | 0 .../redshift/addForeignKeyConstraint.json | 9 --- .../redshift/addPrimaryKey.json | 0 .../redshift/addUniqueConstraint.json | 8 --- .../redshift/createIndex.json | 0 .../redshift/createTable.json | 0 .../expectedSnapshot/redshift/createView.json | 0 .../redshift/snapshotCaalogAndSchema.json | 0 38 files changed, 88 insertions(+), 382 deletions(-) delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.sql delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.sql delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml delete mode 100644 src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addColumn.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addPrimaryKey.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createSequence.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createTable.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createView.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/changelogs/redshift/snapshotCaalogAndSchema.xml delete mode 100644 src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createSequence.json create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml create mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/changelogs/redshift/addForeignKeyConstraint.xml (89%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/changelogs/redshift/addUniqueConstraint.xml (91%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/changelogs/redshift/createIndex.xml (86%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/addColumn.json (100%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/addForeignKeyConstraint.json (56%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/addPrimaryKey.json (100%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/addUniqueConstraint.json (73%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/createIndex.json (100%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/createTable.json (100%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/createView.json (100%) rename src/{main/resources/liquibase/harness/snapsot => test/resources/liquibase/harness/snapshot}/expectedSnapshot/redshift/snapshotCaalogAndSchema.json (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9af9700..70e8259 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,13 +126,11 @@ jobs: **/target/** ~/.m2/repository/org/liquibase/ -# - name: Run Tests -# run: mvn -B jacoco:prepare-agent surefire:test -Dredshift.version=${{ matrix.redshift }} + - name: Foundational Harness Test Run + run: mvn -Dtest="LiquibaseHarnessFoundationalSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Advanced Harness Test Run -# env: -# LIQUIBASE_PRO_LICENSE_KEY: ${{ secrets.PRO_LICENSE_KEY }} - run: mvn -Dtest="LiquibaseHarnessFoundationalSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test + run: mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - name: Archive Test Results if: ${{ always() }} diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql index b17bf51..393ea42 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/addForeignKeyConstraint.sql @@ -1,7 +1,3 @@ -CREATE TABLE "test_table_reference" ("id" INTEGER NOT NULL, "test_column" INTEGER NOT NULL, CONSTRAINT "test_table_reference_pkey" PRIMARY KEY ("id")); +INVALID TEST -ALTER TABLE "test_table_reference" ADD CONSTRAINT "test_table_reference_test_column_key" UNIQUE ("test_column"); - -CREATE TABLE "test_table_base" ("id" INTEGER NOT NULL, CONSTRAINT "test_table_base_pkey" PRIMARY KEY ("id")); - -ALTER TABLE "test_table_base" ADD CONSTRAINT "test_fk" FOREIGN KEY ("id") REFERENCES "test_table_reference" ("test_column") ON UPDATE RESTRICT ON DELETE CASCADE; \ No newline at end of file +--Redshift does not support calls to MetaData.getIncomingKeys() and doesn't really support FKs anyway \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql index 6c3a799..6e4a768 100644 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql +++ b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.sql @@ -1,5 +1,3 @@ -CREATE VIEW "test_view" AS SELECT authors.id, - authors.first_name, - authors.last_name, - authors.email - FROM authors;; \ No newline at end of file +CREATE TABLE "view_test_table" ("test_column" INTEGER); + +CREATE VIEW "test_view" AS SELECT view_test_table.test_column FROM view_test_table;; \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql deleted file mode 100644 index eaeb5b2..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE "posts" ADD CONSTRAINT "test_check_constraint" CHECK (((id > 0))); \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml deleted file mode 100644 index 3949116..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/addCheckConstraint.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - id > 0 - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql deleted file mode 100644 index 1ace2af..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE FUNCTION "public".test_function() - RETURNS trigger - LANGUAGE plpgsql -AS $function$ - BEGIN - RAISE NOTICE 'Test function created'; - RETURN NEW; - END; - $function$; \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml deleted file mode 100644 index 17b006d..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createFunction.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - CREATE OR REPLACE FUNCTION test_function() - RETURNS trigger - STABLE - AS $$ - BEGIN - RAISE NOTICE 'Test function created'; - RETURN NEW; - END; - $$ - LANGUAGE sql; - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.sql deleted file mode 100644 index 47bbf2b..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.sql +++ /dev/null @@ -1 +0,0 @@ -INVALID TEST \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.xml deleted file mode 100644 index 437c1e8..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackage.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - SET SQL_MODE='ORACLE'; - - - CREATE OR REPLACE PACKAGE test_package AS FUNCTION getSalary(eid INT) - RETURN DECIMAL(10,2); - END; - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.sql b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.sql deleted file mode 100644 index 47bbf2b..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.sql +++ /dev/null @@ -1 +0,0 @@ -INVALID TEST \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.xml deleted file mode 100644 index bc5dc21..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createPackageBody.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - SET SQL_MODE='ORACLE'; - - - - - CREATE OR REPLACE PROCEDURE test_procedure - AS - BEGIN - END; - - - - - - - - CREATE OR REPLACE PROCEDURE test_package - AS - BEGIN - END; - - - - - - - - CREATE OR REPLACE PACKAGE test_package AS PROCEDURE test_procedure; - END; - - - SET SQL_MODE='ORACLE'; - DROP PACKAGE test_package; - - - - - CREATE PACKAGE BODY test_package AS testVariable DECIMAL(10,2):=500; - PROCEDURE test_procedure() AS - BEGIN - INSERT INTO posts (id, author_id, title, description, content, inserted_date) values ('6','Jayden','Walter','lillian66@example.com','2010-02-27','1990-02-04 02:32:00'); - END; - END; - - - - SET SQL_MODE='ORACLE'; - DROP PACKAGE BODY test_package; - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml deleted file mode 100644 index e8e9590..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createProcedure.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - test procedure - CREATE OR REPLACE PROCEDURE test_procedure() - LANGUAGE 'plpgsql' - AS $$ - BEGIN - END; - $$ - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml b/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml deleted file mode 100644 index 5fa53db..0000000 --- a/src/main/resources/liquibase/harness/generateChangelog/expectedChangeLog/temp/createTrigger.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - test procedure - CREATE OR REPLACE FUNCTION test_function() - RETURNS trigger - AS $$ - BEGIN - RAISE NOTICE 'Test trigger function created'; - RETURN NEW; - END; - $$ - LANGUAGE plpgsql; - - - DROP FUNCTION test_function() - - - - CREATE TRIGGER test_trigger - BEFORE INSERT ON posts - FOR EACH ROW EXECUTE PROCEDURE test_function(); - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addColumn.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addColumn.xml deleted file mode 100644 index 75245c8..0000000 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addColumn.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addPrimaryKey.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addPrimaryKey.xml deleted file mode 100644 index 0a9dc72..0000000 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addPrimaryKey.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createSequence.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createSequence.xml deleted file mode 100644 index 821bda3..0000000 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createSequence.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createTable.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createTable.xml deleted file mode 100644 index 76c50a9..0000000 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createTable.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createView.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createView.xml deleted file mode 100644 index b582ec3..0000000 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createView.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - select test_column from view_table - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/snapshotCaalogAndSchema.xml b/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/snapshotCaalogAndSchema.xml deleted file mode 100644 index 76c50a9..0000000 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/snapshotCaalogAndSchema.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createSequence.json b/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createSequence.json deleted file mode 100644 index 2735a7a..0000000 --- a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createSequence.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "snapshot": { - "objects": { - "liquibase.structure.core.Sequence": [ - { - "sequence": { - "incrementBy": "1\\!\\{java.math.BigInteger\\}", - "maxValue": "9223372036854775807\\!\\{java.math.BigInteger\\}", - "minValue": "1\\!\\{java.math.BigInteger\\}", - "name": "test_sequence", - "startValue": "1\\!\\{java.math.BigInteger\\}", - "willCycle": false - } - } - ] - } - } -} \ No newline at end of file diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml new file mode 100644 index 0000000..060e1f6 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml new file mode 100644 index 0000000..9423d35 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql new file mode 100644 index 0000000..d792761 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql @@ -0,0 +1,5 @@ +-- liquibase formatted sql + +-- changeset yodzh:1674493560417-1 +CREATE TABLE "test_table_xml" ("test_column" INTEGER); + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql new file mode 100644 index 0000000..a028f48 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql @@ -0,0 +1,8 @@ +-- liquibase formatted sql + +-- changeset yodzh:1674562081600-1 +CREATE TABLE "view_test_table" ("test_column" INTEGER); + +-- changeset yodzh:1674562081600-2 +CREATE VIEW "test_view" AS SELECT view_test_table.test_column FROM view_test_table;; + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml new file mode 100644 index 0000000..52da3f7 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml @@ -0,0 +1,11 @@ + + + + + + + + + SELECT view_test_table.test_column FROM view_test_table; + + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml new file mode 100644 index 0000000..1f58cab --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml @@ -0,0 +1,20 @@ +databaseChangeLog: +- changeSet: + id: 1674649765576-1 + author: yodzh (generated) + changes: + - createTable: + columns: + - column: + name: test_column + type: INTEGER + tableName: view_test_table +- changeSet: + id: 1674649765576-2 + author: yodzh (generated) + changes: + - createView: + fullDefinition: false + selectQuery: SELECT view_test_table.test_column FROM view_test_table; + viewName: test_view + diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml new file mode 100644 index 0000000..5f46c97 --- /dev/null +++ b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addForeignKeyConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml similarity index 89% rename from src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addForeignKeyConstraint.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml index 20b05ec..92943ae 100644 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addForeignKeyConstraint.xml +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addForeignKeyConstraint.xml @@ -16,21 +16,21 @@ - - + + + + - + diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addUniqueConstraint.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml similarity index 91% rename from src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addUniqueConstraint.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml index 73cb19c..fc0e840 100644 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/addUniqueConstraint.xml +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/addUniqueConstraint.xml @@ -15,8 +15,6 @@ diff --git a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createIndex.xml b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml similarity index 86% rename from src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createIndex.xml rename to src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml index eeb1f25..3f604c5 100644 --- a/src/main/resources/liquibase/harness/snapsot/changelogs/redshift/createIndex.xml +++ b/src/test/resources/liquibase/harness/snapshot/changelogs/redshift/createIndex.xml @@ -4,6 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> + diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addColumn.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json similarity index 100% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addColumn.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addColumn.json diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addForeignKeyConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json similarity index 56% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addForeignKeyConstraint.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json index 17ab940..bcae3bd 100644 --- a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addForeignKeyConstraint.json +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addForeignKeyConstraint.json @@ -12,15 +12,6 @@ "name": "test_table_reference" } } - ], - "liquibase.structure.core.ForeignKey": [ - { - "foreignKey": { - "deferrable": false, - "initiallyDeferred": false, - "name": "test_fk" - } - } ] } } diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addPrimaryKey.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json similarity index 100% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addPrimaryKey.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addPrimaryKey.json diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addUniqueConstraint.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json similarity index 73% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addUniqueConstraint.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json index 1a824fd..41e8d3c 100644 --- a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/addUniqueConstraint.json +++ b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/addUniqueConstraint.json @@ -8,14 +8,6 @@ } } ], - "liquibase.structure.core.Index": [ - { - "index": { - "name": "test_unique_constraint", - "unique": true - } - } - ], "liquibase.structure.core.UniqueConstraint": [ { "uniqueConstraint": { diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createIndex.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json similarity index 100% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createIndex.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createIndex.json diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createTable.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json similarity index 100% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createTable.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createTable.json diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createView.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json similarity index 100% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/createView.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/createView.json diff --git a/src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json b/src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json similarity index 100% rename from src/main/resources/liquibase/harness/snapsot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json rename to src/test/resources/liquibase/harness/snapshot/expectedSnapshot/redshift/snapshotCaalogAndSchema.json From f768aa442add3a2f577e126fdc4765664fe6d61e Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 25 Jan 2023 14:24:58 +0100 Subject: [PATCH 25/33] Advanced test fix --- .../expectedChangeLog/createTable.xml | 8 -------- .../expectedChangeLog/redshift/column.xml | 11 ---------- .../redshift/createTable.redshift.sql | 5 ----- .../redshift/createView.redshift.sql | 8 -------- .../expectedChangeLog/redshift/createView.xml | 11 ---------- .../expectedChangeLog/redshift/createView.yml | 20 ------------------- .../expectedChangeLog/redshift/unique.xml | 11 ---------- 7 files changed, 74 deletions(-) delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml delete mode 100644 src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml deleted file mode 100644 index 060e1f6..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/createTable.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml deleted file mode 100644 index 9423d35..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/column.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql deleted file mode 100644 index d792761..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createTable.redshift.sql +++ /dev/null @@ -1,5 +0,0 @@ --- liquibase formatted sql - --- changeset yodzh:1674493560417-1 -CREATE TABLE "test_table_xml" ("test_column" INTEGER); - diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql deleted file mode 100644 index a028f48..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.redshift.sql +++ /dev/null @@ -1,8 +0,0 @@ --- liquibase formatted sql - --- changeset yodzh:1674562081600-1 -CREATE TABLE "view_test_table" ("test_column" INTEGER); - --- changeset yodzh:1674562081600-2 -CREATE VIEW "test_view" AS SELECT view_test_table.test_column FROM view_test_table;; - diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml deleted file mode 100644 index 52da3f7..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - SELECT view_test_table.test_column FROM view_test_table; - - diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml deleted file mode 100644 index 1f58cab..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/createView.yml +++ /dev/null @@ -1,20 +0,0 @@ -databaseChangeLog: -- changeSet: - id: 1674649765576-1 - author: yodzh (generated) - changes: - - createTable: - columns: - - column: - name: test_column - type: INTEGER - tableName: view_test_table -- changeSet: - id: 1674649765576-2 - author: yodzh (generated) - changes: - - createView: - fullDefinition: false - selectQuery: SELECT view_test_table.test_column FROM view_test_table; - viewName: test_view - diff --git a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml b/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml deleted file mode 100644 index 5f46c97..0000000 --- a/src/test/resources/liquibase/harness/generateChangelog/expectedChangeLog/redshift/unique.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - From 78a944dae7902b2bd40a09738e10187ecb0a16f7 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Wed, 25 Jan 2023 14:55:07 +0100 Subject: [PATCH 26/33] Workflow test --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53caa3c..1c4a37c 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ UTF-8 UTF-8 - 0-SNAPSHOT + 4.18.0 ${env.GITHUB_TOKEN} liquibase From 60da4d68a42e4a8be771820232261d94196854ca Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 26 Jan 2023 10:39:03 +0200 Subject: [PATCH 27/33] Workflow test --- .github/workflows/ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70e8259..b232c26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,15 @@ on: branches: - main + workflow_dispatch: + inputs: + liquibaseVersion: + description: 'Liquibase Version' + required: false + extensionVersion: + description: 'Extension Version (Defaults to Liquibase Version)' + required: false + jobs: build: name: Build & Package @@ -141,3 +150,9 @@ jobs: **/target/surefire-reports **/target/jacoco.exec + - name: Archive Mongo Database Test Results + uses: actions/upload-artifact@v3 + with: + name: mongodb-test-results + path: build/spock-reports + From 86581d7e1244a008efdc61557d7dbbb944c59e00 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 26 Jan 2023 11:03:27 +0200 Subject: [PATCH 28/33] Workflow test --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b232c26..1978a2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,9 +121,9 @@ jobs: - uses: actions/checkout@v2 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'temurin' cache: 'maven' @@ -150,9 +150,10 @@ jobs: **/target/surefire-reports **/target/jacoco.exec - - name: Archive Mongo Database Test Results + - name: Archive Redshift Test Results + if: ${{ always() }} uses: actions/upload-artifact@v3 with: - name: mongodb-test-results + name: redshift-test-results path: build/spock-reports From 7e8d3acfea0e67882381f0a9c50c61752865abf9 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 26 Jan 2023 13:06:21 +0100 Subject: [PATCH 29/33] Reporting test --- .github/workflows/ci.yml | 16 ++++++++-------- .gitignore | 1 + pom.xml | 9 ++++++++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1978a2c..dfb327f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,14 +141,14 @@ jobs: - name: Advanced Harness Test Run run: mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test - - name: Archive Test Results - if: ${{ always() }} - uses: actions/upload-artifact@v2 - with: - name: test-reports-redshift-${{ matrix.redshift }} - path: | - **/target/surefire-reports - **/target/jacoco.exec +# - name: Archive Test Results +# if: ${{ always() }} +# uses: actions/upload-artifact@v2 +# with: +# name: test-reports-redshift-${{ matrix.redshift }} +# path: | +# **/target/surefire-reports +# **/target/jacoco.exec - name: Archive Redshift Test Results if: ${{ always() }} diff --git a/.gitignore b/.gitignore index 33044bd..3ed21aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /target +/build .classpath .project /.settings diff --git a/pom.xml b/pom.xml index 1c4a37c..c6eaf19 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,13 @@ + + + com.athaydes + spock-reports + 2.0-groovy-2.5 + test + @@ -169,7 +176,7 @@ maven-surefire-plugin 2.22.2 - true + plain From a5f9a9128c5d299280bdf4bee2cce6756db52291 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 26 Jan 2023 14:41:55 +0100 Subject: [PATCH 30/33] Workflow logs --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index c6eaf19..efe32a5 100644 --- a/pom.xml +++ b/pom.xml @@ -144,13 +144,6 @@ - - - com.athaydes - spock-reports - 2.0-groovy-2.5 - test - From b1b9ca595dbbf7d9a8e37c2eabb5c68060284867 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Thu, 26 Jan 2023 15:05:01 +0100 Subject: [PATCH 31/33] Reporting fix --- pom.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pom.xml b/pom.xml index efe32a5..7cd0e07 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,33 @@ + + com.athaydes + spock-reports + 1.7.1 + test + + + + * + * + + + + + + + org.slf4j + slf4j-api + 2.0.6 + test + + + org.slf4j + slf4j-simple + 2.0.6 + test + From 5664cd119cf7c388d0a6450e1621f8c8823d1d71 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Fri, 27 Jan 2023 09:07:10 +0200 Subject: [PATCH 32/33] Updated liquibase version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7cd0e07..0bb722f 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ UTF-8 UTF-8 - 4.18.0 + 4.19.0 ${env.GITHUB_TOKEN} liquibase From 364cf8fe627bc650c6b3e4262ea86749ec3c5ac4 Mon Sep 17 00:00:00 2001 From: yodzhubeiskyi Date: Mon, 30 Jan 2023 10:41:24 +0200 Subject: [PATCH 33/33] Workflow fix --- .github/workflows/ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfb327f..0a7e52d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,15 +14,6 @@ on: branches: - main - workflow_dispatch: - inputs: - liquibaseVersion: - description: 'Liquibase Version' - required: false - extensionVersion: - description: 'Extension Version (Defaults to Liquibase Version)' - required: false - jobs: build: name: Build & Package @@ -141,15 +132,6 @@ jobs: - name: Advanced Harness Test Run run: mvn -Dtest="LiquibaseHarnessAdvancedSuiteTest" -DdbName=redshift -DdbUsername=${{secrets.TH_DB_ADMIN}} -DdbPassword=${{secrets.TH_DB_PASSWD}} -DdbUrl=${{secrets.TH_REDSHIFTURL}} test -# - name: Archive Test Results -# if: ${{ always() }} -# uses: actions/upload-artifact@v2 -# with: -# name: test-reports-redshift-${{ matrix.redshift }} -# path: | -# **/target/surefire-reports -# **/target/jacoco.exec - - name: Archive Redshift Test Results if: ${{ always() }} uses: actions/upload-artifact@v3