diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016Platform.java deleted file mode 100644 index f490b0175..000000000 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016Platform.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.ebean.config.dbplatform.sqlserver; - -import io.ebean.dbmigration.ddlgeneration.platform.MsSqlServer2016Ddl; - -/** - * @author Vilmos Nagy - */ -public class SqlServer2016Platform extends SqlServerPlatform { - - public SqlServer2016Platform() { - super(); - this.historySupport = new SqlServer2016HistorySupport(); - this.platformDdl = new MsSqlServer2016Ddl(this); - } -} diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016HistorySupport.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java similarity index 88% rename from src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016HistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java index 8474481cc..36f0c2b60 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016HistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java @@ -3,9 +3,11 @@ package io.ebean.config.dbplatform.sqlserver; import io.ebean.config.dbplatform.DbStandardHistorySupport; /** + * History support only valid on SqlServer 2016 or later. + * * @author Vilmos Nagy */ -public class SqlServer2016HistorySupport extends DbStandardHistorySupport { +public class SqlServerHistorySupport extends DbStandardHistorySupport { /** * Return the ' as of timestamp ?' clause appended after the table name. diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java index e71f76770..20b59882d 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java @@ -6,7 +6,7 @@ import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.DbType; import io.ebean.config.dbplatform.IdType; -import io.ebean.dbmigration.ddlgeneration.platform.MsSqlServerDdl; +import io.ebean.dbmigration.ddlgeneration.platform.SqlServerDdl; /** * Microsoft SQL Server platform. @@ -21,9 +21,10 @@ public class SqlServerPlatform extends DatabasePlatform { this.persistBatchOnCascade = PersistBatch.NONE; this.idInExpandedForm = true; this.selectCountWithAlias = true; - this.sqlLimiter = new SqlServer2012SqlLimiter(); + this.sqlLimiter = new SqlServerSqlLimiter(); this.basicSqlLimiter = new SqlServerBasicSqlLimiter(); - this.platformDdl = new MsSqlServerDdl(this); + this.platformDdl = new SqlServerDdl(this); + this.historySupport = new SqlServerHistorySupport(); this.dbIdentity.setIdType(IdType.IDENTITY); this.dbIdentity.setSupportsGetGeneratedKeys(true); this.dbIdentity.setSupportsIdentity(true); diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java similarity index 88% rename from src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java index a79cbbef2..f8b7a70a3 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java @@ -5,11 +5,11 @@ import io.ebean.config.dbplatform.SqlLimitResponse; import io.ebean.config.dbplatform.SqlLimiter; /** - * Use ANSI offset rows syntax or top n. + * Use ANSI offset rows syntax or top n - SQL Server 2012 onwards. */ -public class SqlServer2012SqlLimiter implements SqlLimiter { +public class SqlServerSqlLimiter implements SqlLimiter { - public SqlServer2012SqlLimiter() { + public SqlServerSqlLimiter() { } public SqlLimitResponse limit(SqlLimitRequest request) { diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServer2016Ddl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServer2016Ddl.java deleted file mode 100644 index ff50f8fee..000000000 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServer2016Ddl.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.ebean.dbmigration.ddlgeneration.platform; - -import io.ebean.config.ServerConfig; -import io.ebean.config.dbplatform.DatabasePlatform; -import io.ebean.dbmigration.ddlgeneration.DdlBuffer; -import io.ebean.dbmigration.ddlgeneration.DdlWrite; -import io.ebean.dbmigration.migration.AddHistoryTable; -import io.ebean.dbmigration.migration.AlterColumn; -import io.ebean.dbmigration.migration.DropHistoryTable; -import io.ebean.dbmigration.model.MTable; - -import java.io.IOException; - -/** - * MS SQL Server 2016 platform specific DDL. - */ -public class MsSqlServer2016Ddl extends MsSqlServerDdl { - - public MsSqlServer2016Ddl(DatabasePlatform platform) { - super(platform); - this.historyDdl = new MsSqlServer2016HistoryDdl(); - } - -} diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java similarity index 95% rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java index f46fb6ae2..1ed1c1b60 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java @@ -9,15 +9,16 @@ import java.io.IOException; /** * MS SQL Server platform specific DDL. */ -public class MsSqlServerDdl extends PlatformDdl { +public class SqlServerDdl extends PlatformDdl { - public MsSqlServerDdl(DatabasePlatform platform) { + public SqlServerDdl(DatabasePlatform platform) { super(platform); this.identitySuffix = " identity(1,1)"; this.foreignKeyRestrict = ""; this.inlineUniqueOneToOne = false; this.columnSetDefault = "add default"; this.dropConstraintIfExists = "drop constraint"; + this.historyDdl = new SqlServerHistoryDdl(); } @Override diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServer2016HistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java similarity index 97% rename from src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServer2016HistoryDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java index 41604c8ac..7490deb5a 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServer2016HistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java @@ -12,7 +12,7 @@ import java.io.IOException; /** * @author Vilmos Nagy */ -public class MsSqlServer2016HistoryDdl implements PlatformHistoryDdl { +public class SqlServerHistoryDdl implements PlatformHistoryDdl { private String systemPeriodStart; private String systemPeriodEnd; diff --git a/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java index 8c44552fc..c6efddc6a 100644 --- a/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java +++ b/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java @@ -1,7 +1,6 @@ package io.ebean.config.dbplatform.sqlserver; import org.junit.Test; -import org.junit.runner.RunWith; import static org.junit.Assert.*; @@ -12,7 +11,7 @@ public class SqlServer2016PlatformTest { @Test public void testHistorySupport() { - SqlServer2016Platform platform = new SqlServer2016Platform(); - assertTrue(platform.getHistorySupport() instanceof SqlServer2016HistorySupport); + SqlServerPlatform platform = new SqlServerPlatform(); + assertTrue(platform.getHistorySupport() instanceof SqlServerHistorySupport); } }