From f080f16e6352b71bf5a7f4c1eec536a04803461f Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Sun, 1 Mar 2020 12:53:34 +1300 Subject: [PATCH] #1962 - Refactor simplify Postgres platforms to POSTGRES and POSTGRES9 --- pom.xml | 2 +- .../postgres/Postgres8Platform.java | 20 ------------------- .../dbplatform/postgres/PostgresPlatform.java | 4 ++-- .../dbmigration/DefaultDbMigration.java | 1 - .../server/core/DatabasePlatformFactory.java | 4 ---- .../server/core/PlatformDdlBuilder.java | 1 - .../platform/DbExpressionHandlerFactory.java | 1 - .../ebeaninternal/api/PlatformMatchTest.java | 1 - 8 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java diff --git a/pom.xml b/pom.xml index 270bea1a3..63dabe9dc 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ io.ebean ebean-annotation - 6.7 + 6.8 diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java b/src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java deleted file mode 100644 index 7dcf722dd..000000000 --- a/src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.ebean.config.dbplatform.postgres; - -import io.ebean.config.dbplatform.IdType; - -/** - * Postgres v8.3 specific platform. - *

- * No support for getGeneratedKeys. - *

- */ -public class Postgres8Platform extends PostgresPlatform { - - public Postgres8Platform() { - super(); - this.dbIdentity.setSupportsGetGeneratedKeys(false); - this.dbIdentity.setIdType(IdType.SEQUENCE); - this.columnAliasPrefix = "as c"; - } - -} 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 66e64dc91..5b4a5d044 100644 --- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java @@ -19,7 +19,7 @@ import java.sql.SQLException; import java.sql.Types; /** - * Postgres 10+ specific platform. + * Postgres 10+ platform. *

* Defaults to use "generated by default as identity". */ @@ -27,7 +27,7 @@ public class PostgresPlatform extends DatabasePlatform { public PostgresPlatform() { super(); - this.platform = Platform.POSTGRES10; + this.platform = Platform.POSTGRES; this.supportsNativeIlike = true; this.supportsDeleteTableAlias = true; this.selectCountWithAlias = true; diff --git a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index 43def5067..7b36be18b 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -819,7 +819,6 @@ public class DefaultDbMigration implements DbMigration { case POSTGRES9: return new Postgres9Platform(); case POSTGRES: - case POSTGRES10: return new PostgresPlatform(); case MYSQL55: return new MySql55Platform(); diff --git a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index 5c6e2f3b0..15858e8d9 100644 --- a/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -13,7 +13,6 @@ import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.nuodb.NuoDbPlatform; import io.ebean.config.dbplatform.oracle.Oracle11Platform; import io.ebean.config.dbplatform.oracle.OraclePlatform; -import io.ebean.config.dbplatform.postgres.Postgres8Platform; import io.ebean.config.dbplatform.postgres.Postgres9Platform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform; @@ -91,9 +90,6 @@ public class DatabasePlatformFactory { if (dbName.equals("postgres") || dbName.equals("postgres9")) { return new PostgresPlatform(); } - if (dbName.equals("postgres8") || dbName.equals("postgres83")) { - return new Postgres8Platform(); - } if (dbName.equals("oracle11") || dbName.equals("oracle10") || dbName.equals("oracle9")) { return new Oracle11Platform(); } diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java index 802e63662..5da023a25 100644 --- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java +++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java @@ -46,7 +46,6 @@ public class PlatformDdlBuilder { case POSTGRES9: return new Postgres9Ddl(platform); case POSTGRES: - case POSTGRES10: return new PostgresDdl(platform); case COCKROACH: return new CockroachDdl(platform); diff --git a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java index 5f1de2883..2a99dcab4 100644 --- a/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java +++ b/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java @@ -17,7 +17,6 @@ public class DbExpressionHandlerFactory { return new H2DbExpression(); case POSTGRES: case POSTGRES9: - case POSTGRES10: return new PostgresDbExpression(); case MYSQL55: case MYSQL: diff --git a/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java index c3c036af4..b33125b49 100644 --- a/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java @@ -24,7 +24,6 @@ public class PlatformMatchTest { assertTrue(PlatformMatch.matchPlatform(Platform.POSTGRES, "postgres")); assertTrue(PlatformMatch.matchPlatform(Platform.POSTGRES9, "postgres")); - assertTrue(PlatformMatch.matchPlatform(Platform.POSTGRES10, "postgres")); } @Test