From 0390e877942a2a438f8b1bb099e3afd01035889f Mon Sep 17 00:00:00 2001 From: chenson42 Date: Thu, 1 May 2014 19:19:15 +0000 Subject: [PATCH] 0001706: Expanded out MSQLSever builders, ddlDataTypes, and platforms for versions 2000, 2005, 2008, and 2012. --- .../db/platform/mssql/MsSql2000DatabasePlatform.java | 9 +-------- .../db/platform/mssql/MsSql2005DatabasePlatform.java | 6 ++++++ .../db/platform/mssql/MsSql2008DatabasePlatform.java | 6 ++++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DatabasePlatform.java index 4d088f586f..8158c8e2b8 100644 --- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DatabasePlatform.java +++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2000DatabasePlatform.java @@ -44,18 +44,11 @@ public class MsSql2000DatabasePlatform extends AbstractJdbcDatabasePlatform { */ public MsSql2000DatabasePlatform(DataSource dataSource, SqlTemplateSettings settings) { super(dataSource, settings); - // override the ddl builder based on the version - if (this.sqlTemplate.getDatabaseMajorVersion() >= 10) { - this.ddlBuilder = new MsSql2008DdlBuilder(); - } else { - this.ddlBuilder = new MsSql2000DdlBuilder(); - } - } @Override protected MsSql2000DdlBuilder createDdlBuilder() { - return new MsSql2000DdlBuilder(); + return new MsSql2000DdlBuilder(getName()); } @Override diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2005DatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2005DatabasePlatform.java index c9f07ed545..e205b874b8 100644 --- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2005DatabasePlatform.java +++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2005DatabasePlatform.java @@ -4,6 +4,7 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.platform.DatabaseNamesConstants; +import org.jumpmind.db.platform.IDdlBuilder; import org.jumpmind.db.sql.SqlTemplateSettings; /* @@ -18,6 +19,11 @@ public MsSql2005DatabasePlatform(DataSource dataSource, SqlTemplateSettings sett super(dataSource, settings); } + @Override + public IDdlBuilder getDdlBuilder() { + return new MsSql2005DdlBuilder(getName()); + } + @Override public String getName() { return DatabaseNamesConstants.MSSQL2005; diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2008DatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2008DatabasePlatform.java index c6aad9a117..cb9df42057 100644 --- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2008DatabasePlatform.java +++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSql2008DatabasePlatform.java @@ -3,6 +3,7 @@ import javax.sql.DataSource; import org.jumpmind.db.platform.DatabaseNamesConstants; +import org.jumpmind.db.platform.IDdlBuilder; import org.jumpmind.db.sql.SqlTemplateSettings; /* @@ -17,6 +18,11 @@ public MsSql2008DatabasePlatform(DataSource dataSource, SqlTemplateSettings sett super(dataSource, settings); } + @Override + public IDdlBuilder getDdlBuilder() { + return new MsSql2008DdlBuilder(getName()); + } + @Override public String getName() { return DatabaseNamesConstants.MSSQL2008;