From ae754ab6c707c805f2820d55bc7096f6f793e641 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Jadda <jaddap2@nih.gov>
Date: Mon, 22 Jun 2020 02:11:36 -0400
Subject: [PATCH] Use only one changelog directory for database  migrations

---
 pom.xml                                       |  2 +-
 .../2020-06-22T06:00:16Z_changelog.xml        | 28 -------------------
 .../2020-06-22T05:50:03Z_changelog.xml        | 28 -------------------
 .../2020-06-22T05:49:14Z_changelog.xml        | 28 -------------------
 .../2020-06-22T05:48:08Z_changelog.xml        |  0
 5 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 src/main/resources/db/changelog-dev/2020-06-22T06:00:16Z_changelog.xml
 delete mode 100644 src/main/resources/db/changelog-prod/2020-06-22T05:50:03Z_changelog.xml
 delete mode 100644 src/main/resources/db/changelog-test/2020-06-22T05:49:14Z_changelog.xml
 rename src/main/resources/db/{changelog-dev => changelog}/2020-06-22T05:48:08Z_changelog.xml (100%)

diff --git a/pom.xml b/pom.xml
index 55b5ed6..a9e6ead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
                 <configuration>
                     <propertyFile>src/main/resources/liquibase.properties</propertyFile>
                     <changeLogFile>src/main/resources/db/db.changelog-master.xml</changeLogFile>
-                    <diffChangeLogFile>src/main/resources/db/changelog-${activatedProfile}/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
+                    <diffChangeLogFile>src/main/resources/db/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
                     <logging>info</logging>
                 </configuration>
 
diff --git a/src/main/resources/db/changelog-dev/2020-06-22T06:00:16Z_changelog.xml b/src/main/resources/db/changelog-dev/2020-06-22T06:00:16Z_changelog.xml
deleted file mode 100644
index 90a3bec..0000000
--- a/src/main/resources/db/changelog-dev/2020-06-22T06:00:16Z_changelog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   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-3.9.xsd">
-    <changeSet author="jaddap2 (generated)" id="1592805619445-1">
-        <createTable tableName="country">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="countryPK"/>
-            </column>
-            <column name="code" type="VARCHAR(255)"/>
-            <column name="iso_code" type="VARCHAR(255)"/>
-            <column name="iso_code_test" type="VARCHAR(255)"/>
-            <column name="name" type="VARCHAR(255)"/>
-            <column name="region_id" type="BIGINT"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592805619445-2">
-        <createTable tableName="region">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="regionPK"/>
-            </column>
-            <column name="name" type="VARCHAR(255)"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592805619445-3">
-        <addForeignKeyConstraint baseColumnNames="region_id" baseTableName="country" constraintName="FKs3bda8801uhqtttuaur9r6eic" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="region" validate="true"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-prod/2020-06-22T05:50:03Z_changelog.xml b/src/main/resources/db/changelog-prod/2020-06-22T05:50:03Z_changelog.xml
deleted file mode 100644
index 362dfb8..0000000
--- a/src/main/resources/db/changelog-prod/2020-06-22T05:50:03Z_changelog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   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-3.9.xsd">
-    <changeSet author="jaddap2 (generated)" id="1592805006064-1">
-        <createTable tableName="country">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="countryPK"/>
-            </column>
-            <column name="code" type="VARCHAR(255)"/>
-            <column name="iso_code" type="VARCHAR(255)"/>
-            <column name="iso_code_test" type="VARCHAR(255)"/>
-            <column name="name" type="VARCHAR(255)"/>
-            <column name="region_id" type="BIGINT"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592805006064-2">
-        <createTable tableName="region">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="regionPK"/>
-            </column>
-            <column name="name" type="VARCHAR(255)"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592805006064-3">
-        <addForeignKeyConstraint baseColumnNames="region_id" baseTableName="country" constraintName="FKs3bda8801uhqtttuaur9r6eic" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="region" validate="true"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-test/2020-06-22T05:49:14Z_changelog.xml b/src/main/resources/db/changelog-test/2020-06-22T05:49:14Z_changelog.xml
deleted file mode 100644
index 65f0424..0000000
--- a/src/main/resources/db/changelog-test/2020-06-22T05:49:14Z_changelog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   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-3.9.xsd">
-    <changeSet author="jaddap2 (generated)" id="1592804958248-1">
-        <createTable tableName="country">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="countryPK"/>
-            </column>
-            <column name="code" type="VARCHAR(255)"/>
-            <column name="iso_code" type="VARCHAR(255)"/>
-            <column name="iso_code_test" type="VARCHAR(255)"/>
-            <column name="name" type="VARCHAR(255)"/>
-            <column name="region_id" type="BIGINT"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592804958248-2">
-        <createTable tableName="region">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="regionPK"/>
-            </column>
-            <column name="name" type="VARCHAR(255)"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592804958248-3">
-        <addForeignKeyConstraint baseColumnNames="region_id" baseTableName="country" constraintName="FKs3bda8801uhqtttuaur9r6eic" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="region" validate="true"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-dev/2020-06-22T05:48:08Z_changelog.xml b/src/main/resources/db/changelog/2020-06-22T05:48:08Z_changelog.xml
similarity index 100%
rename from src/main/resources/db/changelog-dev/2020-06-22T05:48:08Z_changelog.xml
rename to src/main/resources/db/changelog/2020-06-22T05:48:08Z_changelog.xml