From d69d96a400251d5e4f6f4058848eb4b0aa741273 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Thu, 5 Mar 2020 00:56:22 +1300 Subject: [PATCH] #1967 - Refactor internals reverse default columnAliasPrefix to null from "c" --- src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java | 2 +- .../ebean/config/dbplatform/clickhouse/ClickHousePlatform.java | 2 -- src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java | 1 - src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java | 1 - .../java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java | 1 - .../java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java | 1 - .../java/io/ebean/config/dbplatform/oracle/OraclePlatform.java | 1 - .../io/ebean/config/dbplatform/postgres/PostgresPlatform.java | 1 - .../ebean/config/dbplatform/sqlserver/SqlServer17Platform.java | 1 - .../config/dbplatform/sqlserver/SqlServerBasePlatform.java | 1 - 10 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index b97adadc7..2a2c5f47f 100644 --- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -146,7 +146,7 @@ public class DatabasePlatform { protected String truncateTable = "truncate table %s"; - protected String columnAliasPrefix = "c"; + protected String columnAliasPrefix; /** * Use a BackTick ` at the beginning and end of table or column names that you diff --git a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java index 742f97321..b6cd2a131 100644 --- a/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java @@ -16,10 +16,8 @@ public class ClickHousePlatform extends DatabasePlatform { //this.dbEncrypt = //this.historySupport = //this.exceptionTranslator = - this.nativeUuidType = true; this.dbDefaultValue.setNow("now()"); - this.columnAliasPrefix = null; this.dbIdentity.setIdType(IdType.IDENTITY); this.dbIdentity.setSupportsGetGeneratedKeys(false); diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java index dd0cfde1a..08ffc2fd5 100644 --- a/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java @@ -26,7 +26,6 @@ public class H2Platform extends DatabasePlatform { this.supportsDeleteTableAlias = true; this.inlineSqlUpdateLimit = true; this.dbDefaultValue.setNow("now()"); - this.columnAliasPrefix = null; this.exceptionTranslator = new SqlErrorCodes() .addAcquireLock("50200","HYT00") diff --git a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java index 6422f7c81..b94b1e9dd 100644 --- a/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java @@ -17,7 +17,6 @@ public class HanaPlatform extends DatabasePlatform { this.sqlLimiter = new HanaSqlLimiter(); this.persistBatchOnCascade = PersistBatch.NONE; this.supportsResultSetConcurrencyModeUpdatable = false; - this.columnAliasPrefix = null; this.historySupport = new HanaHistorySupport(); this.basicSqlLimiter = new HanaBasicSqlLimiter(); diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java index 57d94cfc5..944da83ab 100644 --- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java @@ -31,7 +31,6 @@ public class MySqlPlatform extends DatabasePlatform { this.inlineSqlUpdateLimit = true; this.dbEncrypt = new MySqlDbEncrypt(); this.historySupport = new MySqlHistorySupport(); - this.columnAliasPrefix = null; this.dbIdentity.setIdType(IdType.IDENTITY); this.dbIdentity.setSupportsGetGeneratedKeys(true); this.dbIdentity.setSupportsIdentity(true); diff --git a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java index fb4a264a8..7d830b802 100644 --- a/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java @@ -23,7 +23,6 @@ public class NuoDbPlatform extends DatabasePlatform { this.idInExpandedForm = true; this.supportsResultSetConcurrencyModeUpdatable = false; this.supportsDeleteTableAlias = true; - this.columnAliasPrefix = null; this.likeClauseRaw = "like ?"; this.historySupport = new NuoDbHistorySupport(); //this.dbEncrypt = ... diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java index ab39dbf0d..369f2e0f5 100644 --- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java @@ -22,7 +22,6 @@ public class OraclePlatform extends DatabasePlatform { public OraclePlatform() { super(); this.platform = Platform.ORACLE; - this.columnAliasPrefix = null; this.supportsDeleteTableAlias = true; this.maxTableNameLength = 30; this.maxConstraintNameLength = 30; 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 5b4a5d044..09235daef 100644 --- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java @@ -34,7 +34,6 @@ public class PostgresPlatform extends DatabasePlatform { this.blobDbType = Types.LONGVARBINARY; this.clobDbType = Types.VARCHAR; this.nativeUuidType = true; - this.columnAliasPrefix = null; this.truncateTable = "truncate table %s cascade"; this.dbEncrypt = new PostgresDbEncrypt(); this.historySupport = new PostgresHistorySupport(); diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java index e08de85ab..56a9d1cc0 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java @@ -12,7 +12,6 @@ public class SqlServer17Platform extends SqlServerBasePlatform { public SqlServer17Platform() { super(); this.platform = Platform.SQLSERVER17; - this.columnAliasPrefix = null; this.nativeUuidType = true; this.dbTypeMap.put(DbType.UUID, new DbPlatformType("uniqueidentifier", false)); } diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java index b79c69413..ba6bcf07a 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java @@ -64,7 +64,6 @@ abstract class SqlServerBasePlatform extends DatabasePlatform { dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint")); dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28)); - dbTypeMap.put(DbType.DATE, new DbPlatformType("date")); dbTypeMap.put(DbType.TIME, new DbPlatformType("time")); dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));