diff --git a/src/main/java/database/DatabaseMigrations.java b/src/main/java/database/DatabaseMigrations.java index 9033b3d689..d06b84b37e 100644 --- a/src/main/java/database/DatabaseMigrations.java +++ b/src/main/java/database/DatabaseMigrations.java @@ -25,7 +25,8 @@ public class DatabaseMigrations { private static void runLiquibaseUpdate() { try (Connection connection = DatabaseConnection.getConnection()) { liquibase.database.DatabaseConnection databaseConnection = new JdbcConnection(connection); - Liquibase liquibase = new Liquibase("db/changelog.xml", new ClassLoaderResourceAccessor(), databaseConnection); + Liquibase liquibase = new Liquibase("db/changelog-root.xml", new ClassLoaderResourceAccessor(), + databaseConnection); liquibase.setShowSummaryOutput(UpdateSummaryOutputEnum.LOG); liquibase.update(); } catch (SQLException | LiquibaseException e) { diff --git a/src/main/resources/db/changelog-data.xml b/src/main/resources/db/changelog-data.xml new file mode 100644 index 0000000000..ffcee034c3 --- /dev/null +++ b/src/main/resources/db/changelog-data.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog-root.xml b/src/main/resources/db/changelog-root.xml new file mode 100644 index 0000000000..d8eba28317 --- /dev/null +++ b/src/main/resources/db/changelog-root.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog-tables.xml b/src/main/resources/db/changelog-tables.xml new file mode 100644 index 0000000000..acfc60e6e6 --- /dev/null +++ b/src/main/resources/db/changelog-tables.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog.xml b/src/main/resources/db/changelog.xml deleted file mode 100644 index 957bfb8b5f..0000000000 --- a/src/main/resources/db/changelog.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/db/101-shops-data.sql b/src/main/resources/db/data/101-shops-data.sql similarity index 100% rename from src/main/resources/db/101-shops-data.sql rename to src/main/resources/db/data/101-shops-data.sql diff --git a/src/main/resources/db/102-shopitems-data.sql b/src/main/resources/db/data/102-shopitems-data.sql similarity index 100% rename from src/main/resources/db/102-shopitems-data.sql rename to src/main/resources/db/data/102-shopitems-data.sql diff --git a/src/main/resources/db/111-makercreate-data.sql b/src/main/resources/db/data/111-makercreate-data.sql similarity index 100% rename from src/main/resources/db/111-makercreate-data.sql rename to src/main/resources/db/data/111-makercreate-data.sql diff --git a/src/main/resources/db/112-makerrecipe-data.sql b/src/main/resources/db/data/112-makerrecipe-data.sql similarity index 100% rename from src/main/resources/db/112-makerrecipe-data.sql rename to src/main/resources/db/data/112-makerrecipe-data.sql diff --git a/src/main/resources/db/113-makerreward-data.sql b/src/main/resources/db/data/113-makerreward-data.sql similarity index 100% rename from src/main/resources/db/113-makerreward-data.sql rename to src/main/resources/db/data/113-makerreward-data.sql diff --git a/src/main/resources/db/114-makerreagent-data.sql b/src/main/resources/db/data/114-makerreagent-data.sql similarity index 100% rename from src/main/resources/db/114-makerreagent-data.sql rename to src/main/resources/db/data/114-makerreagent-data.sql diff --git a/src/main/resources/db/121-monstercard-data.sql b/src/main/resources/db/data/121-monstercard-data.sql similarity index 100% rename from src/main/resources/db/121-monstercard-data.sql rename to src/main/resources/db/data/121-monstercard-data.sql diff --git a/src/main/resources/db/131-reactordrops-data.sql b/src/main/resources/db/data/131-reactordrops-data.sql similarity index 100% rename from src/main/resources/db/131-reactordrops-data.sql rename to src/main/resources/db/data/131-reactordrops-data.sql diff --git a/src/main/resources/db/141-specialcashitems-data.sql b/src/main/resources/db/data/141-specialcashitems-data.sql similarity index 100% rename from src/main/resources/db/141-specialcashitems-data.sql rename to src/main/resources/db/data/141-specialcashitems-data.sql diff --git a/src/main/resources/db/142-nxcoupons-data.sql b/src/main/resources/db/data/142-nxcoupons-data.sql similarity index 100% rename from src/main/resources/db/142-nxcoupons-data.sql rename to src/main/resources/db/data/142-nxcoupons-data.sql diff --git a/src/main/resources/db/151-global-drop-data.sql b/src/main/resources/db/data/151-global-drop-data.sql similarity index 100% rename from src/main/resources/db/151-global-drop-data.sql rename to src/main/resources/db/data/151-global-drop-data.sql diff --git a/src/main/resources/db/152-drop-data.sql b/src/main/resources/db/data/152-drop-data.sql similarity index 100% rename from src/main/resources/db/152-drop-data.sql rename to src/main/resources/db/data/152-drop-data.sql diff --git a/src/main/resources/db/901-admin-data.sql b/src/main/resources/db/data/161-admin-data.sql similarity index 100% rename from src/main/resources/db/901-admin-data.sql rename to src/main/resources/db/data/161-admin-data.sql diff --git a/src/main/resources/db/001-account.sql b/src/main/resources/db/tables/001-account.sql similarity index 100% rename from src/main/resources/db/001-account.sql rename to src/main/resources/db/tables/001-account.sql diff --git a/src/main/resources/db/002-character.sql b/src/main/resources/db/tables/002-character.sql similarity index 100% rename from src/main/resources/db/002-character.sql rename to src/main/resources/db/tables/002-character.sql diff --git a/src/main/resources/db/003-inventory.sql b/src/main/resources/db/tables/003-inventory.sql similarity index 100% rename from src/main/resources/db/003-inventory.sql rename to src/main/resources/db/tables/003-inventory.sql diff --git a/src/main/resources/db/004-skill.sql b/src/main/resources/db/tables/004-skill.sql similarity index 100% rename from src/main/resources/db/004-skill.sql rename to src/main/resources/db/tables/004-skill.sql diff --git a/src/main/resources/db/005-pet.sql b/src/main/resources/db/tables/005-pet.sql similarity index 100% rename from src/main/resources/db/005-pet.sql rename to src/main/resources/db/tables/005-pet.sql diff --git a/src/main/resources/db/006-quest.sql b/src/main/resources/db/tables/006-quest.sql similarity index 100% rename from src/main/resources/db/006-quest.sql rename to src/main/resources/db/tables/006-quest.sql diff --git a/src/main/resources/db/007-guild.sql b/src/main/resources/db/tables/007-guild.sql similarity index 100% rename from src/main/resources/db/007-guild.sql rename to src/main/resources/db/tables/007-guild.sql diff --git a/src/main/resources/db/008-keymap.sql b/src/main/resources/db/tables/008-keymap.sql similarity index 100% rename from src/main/resources/db/008-keymap.sql rename to src/main/resources/db/tables/008-keymap.sql diff --git a/src/main/resources/db/009-drop.sql b/src/main/resources/db/tables/009-drop.sql similarity index 100% rename from src/main/resources/db/009-drop.sql rename to src/main/resources/db/tables/009-drop.sql diff --git a/src/main/resources/db/010-storage.sql b/src/main/resources/db/tables/010-storage.sql similarity index 100% rename from src/main/resources/db/010-storage.sql rename to src/main/resources/db/tables/010-storage.sql diff --git a/src/main/resources/db/011-shop.sql b/src/main/resources/db/tables/011-shop.sql similarity index 100% rename from src/main/resources/db/011-shop.sql rename to src/main/resources/db/tables/011-shop.sql diff --git a/src/main/resources/db/012-character-state.sql b/src/main/resources/db/tables/012-character-state.sql similarity index 100% rename from src/main/resources/db/012-character-state.sql rename to src/main/resources/db/tables/012-character-state.sql diff --git a/src/main/resources/db/013-cashshop.sql b/src/main/resources/db/tables/013-cashshop.sql similarity index 100% rename from src/main/resources/db/013-cashshop.sql rename to src/main/resources/db/tables/013-cashshop.sql diff --git a/src/main/resources/db/014-gift.sql b/src/main/resources/db/tables/014-gift.sql similarity index 100% rename from src/main/resources/db/014-gift.sql rename to src/main/resources/db/tables/014-gift.sql diff --git a/src/main/resources/db/015-marriage.sql b/src/main/resources/db/tables/015-marriage.sql similarity index 100% rename from src/main/resources/db/015-marriage.sql rename to src/main/resources/db/tables/015-marriage.sql diff --git a/src/main/resources/db/016-monsterbook.sql b/src/main/resources/db/tables/016-monsterbook.sql similarity index 100% rename from src/main/resources/db/016-monsterbook.sql rename to src/main/resources/db/tables/016-monsterbook.sql diff --git a/src/main/resources/db/017-family.sql b/src/main/resources/db/tables/017-family.sql similarity index 100% rename from src/main/resources/db/017-family.sql rename to src/main/resources/db/tables/017-family.sql diff --git a/src/main/resources/db/018-transfer.sql b/src/main/resources/db/tables/018-transfer.sql similarity index 100% rename from src/main/resources/db/018-transfer.sql rename to src/main/resources/db/tables/018-transfer.sql diff --git a/src/main/resources/db/019-mts.sql b/src/main/resources/db/tables/019-mts.sql similarity index 100% rename from src/main/resources/db/019-mts.sql rename to src/main/resources/db/tables/019-mts.sql diff --git a/src/main/resources/db/020-maker.sql b/src/main/resources/db/tables/020-maker.sql similarity index 100% rename from src/main/resources/db/020-maker.sql rename to src/main/resources/db/tables/020-maker.sql diff --git a/src/main/resources/db/021-field-object.sql b/src/main/resources/db/tables/021-field-object.sql similarity index 100% rename from src/main/resources/db/021-field-object.sql rename to src/main/resources/db/tables/021-field-object.sql diff --git a/src/main/resources/db/022-ban.sql b/src/main/resources/db/tables/022-ban.sql similarity index 100% rename from src/main/resources/db/022-ban.sql rename to src/main/resources/db/tables/022-ban.sql diff --git a/src/main/resources/db/023-bosslog.sql b/src/main/resources/db/tables/023-bosslog.sql similarity index 100% rename from src/main/resources/db/023-bosslog.sql rename to src/main/resources/db/tables/023-bosslog.sql diff --git a/src/main/resources/db/024-duey.sql b/src/main/resources/db/tables/024-duey.sql similarity index 100% rename from src/main/resources/db/024-duey.sql rename to src/main/resources/db/tables/024-duey.sql diff --git a/src/main/resources/db/tables/025-test.sql b/src/main/resources/db/tables/025-test.sql new file mode 100644 index 0000000000..adb7b717ad --- /dev/null +++ b/src/main/resources/db/tables/025-test.sql @@ -0,0 +1,4 @@ +CREATE TABLE test +( + id INT PRIMARY KEY +); \ No newline at end of file