From 0f9c98964e6721b1e49f5732f1febe062260d5fa Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 1 Nov 2018 21:21:31 +0100 Subject: [PATCH] FIX Typos (DLL -> DDL) (#1526) --- .../config/dbplatform/postgres/PostgresPlatform.java | 3 ++- .../java/io/ebeaninternal/dbmigration/DdlGenerator.java | 8 ++++---- .../io/ebeaninternal/dbmigration/DefaultDbMigration.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java index fde6f7af3..80a9c40e9 100644 --- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java @@ -136,8 +136,9 @@ public class PostgresPlatform extends DatabasePlatform { /** * Return SQL using built in partition helper functions to create some initial partitions. * - * Only use this if extra-dll doesn't have some initial partitions defined (which it should). + * Only use this if extra-ddl doesn't have some initial partitions defined (which it should). */ + @Override public String tablePartitionInit(String tableName, PartitionMode mode, String property, String pkey) { if (property == null) { property = ""; diff --git a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index b8271273b..826621a4a 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -164,7 +164,7 @@ public class DdlGenerator { if (!"true".equalsIgnoreCase(ignoreExtraDdl) && jaxbPresent) { String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), true); if (extraApply != null) { - runScript(connection, false, extraApply, "extra-dll"); + runScript(connection, false, extraApply, "extra-ddl"); } } @@ -186,13 +186,13 @@ public class DdlGenerator { if (currentModel.isTablePartitioning()) { String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(server.getDatabasePlatform().getName()); if (extraPartitioning != null && !extraPartitioning.isEmpty()) { - runScript(connection, false, extraPartitioning, "builtin-partitioning-dll"); + runScript(connection, false, extraPartitioning, "builtin-partitioning-ddl"); } } String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), false); if (extraApply != null) { - runScript(connection, false, extraApply, "extra-dll"); + runScript(connection, false, extraApply, "extra-ddl"); } if (currentModel.isTablePartitioning()) { @@ -203,7 +203,7 @@ public class DdlGenerator { /** * Check if table partitions exist and if not create some. The expectation is that - * extra-dll.xml should have some partition initialisation but this helps people get going. + * extra-ddl.xml should have some partition initialisation but this helps people get going. */ private void checkInitialTablePartitions(Connection connection) { diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index 2eced70a2..794d0230f 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -308,6 +308,7 @@ public class DefaultDbMigration implements DbMigration { /** * Return the versions containing pending drops. */ + @Override public List getPendingDrops() { if (!online) { DbOffline.setGenerateMigration(); @@ -335,7 +336,7 @@ public class DefaultDbMigration implements DbMigration { /** * Generate "repeatable" migration scripts. *

- * These take scrips from extra-dll.xml (typically views) and outputs "repeatable" + * These take scrips from extra-ddl.xml (typically views) and outputs "repeatable" * migration scripts (starting with "R__") to be run by FlywayDb or Ebean's own * migration runner. *