From 7d83e3f49e8e5b61b0314656008c26c623f11df8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 13 Jun 2014 23:48:45 +1200 Subject: [PATCH] Fix for #97 - ENH: (406) Add support for Postgres Serial type --- .../ebean/config/dbplatform/DbDdlSyntax.java | 11 +++ .../config/dbplatform/Postgres8Platform.java | 73 +++++++++++++++++++ .../config/dbplatform/PostgresDdlSyntax.java | 25 +++++++ .../config/dbplatform/PostgresPlatform.java | 14 ++-- .../server/core/DatabasePlatformFactory.java | 10 +-- .../server/ddl/CreateTableColumnVisitor.java | 14 +--- .../server/persist/dml/DmlHandler.java | 3 +- .../server/persist/dml/InsertHandler.java | 3 +- 8 files changed, 128 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/avaje/ebean/config/dbplatform/Postgres8Platform.java create mode 100644 src/main/java/com/avaje/ebean/config/dbplatform/PostgresDdlSyntax.java diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbDdlSyntax.java b/src/main/java/com/avaje/ebean/config/dbplatform/DbDdlSyntax.java index 92edc9cc6..262ebaf8d 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbDdlSyntax.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/DbDdlSyntax.java @@ -45,6 +45,17 @@ public class DbDdlSyntax { return pk; } + /** + * Return the column definition for an identity column. + */ + public String getIdentityColumnDefn(String columnDefn) { + String identity = getIdentity(); + if (identity != null && identity.length() > 0) { + return columnDefn+" "+identity; + } + return columnDefn; + } + /** * Return the identity clause for DB's that have identities. */ diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/Postgres8Platform.java b/src/main/java/com/avaje/ebean/config/dbplatform/Postgres8Platform.java new file mode 100644 index 000000000..ec75255be --- /dev/null +++ b/src/main/java/com/avaje/ebean/config/dbplatform/Postgres8Platform.java @@ -0,0 +1,73 @@ +package com.avaje.ebean.config.dbplatform; + +import com.avaje.ebean.BackgroundExecutor; +import com.avaje.ebean.config.GlobalProperties; + +import javax.sql.DataSource; +import java.sql.Types; + +/** + * Postgres v8.3 specific platform. + *

+ * No support for getGeneratedKeys. + *

+ */ +public class Postgres8Platform extends DatabasePlatform { + + public Postgres8Platform() { + super(); + this.name = "postgres"; + this.selectCountWithAlias = true; + this.blobDbType = Types.LONGVARBINARY; + this.clobDbType = Types.VARCHAR; + + this.dbEncrypt = new PostgresDbEncrypt(); + + this.dbIdentity.setSupportsGetGeneratedKeys(false); + this.dbIdentity.setIdType(IdType.SEQUENCE); + this.dbIdentity.setSupportsSequence(true); + + String colAlias = GlobalProperties.get("ebean.columnAliasPrefix", null); + if (colAlias == null) { + // Postgres requires the "as" keyword for column alias + GlobalProperties.put("ebean.columnAliasPrefix", "as c"); + } + + this.openQuote = "\""; + this.closeQuote = "\""; + + // dbTypeMap.put(Types.BOOLEAN, new DbType("bit default 0")); + + dbTypeMap.put(Types.INTEGER, new DbType("integer", false)); + dbTypeMap.put(Types.DOUBLE, new DbType("float")); + dbTypeMap.put(Types.TINYINT, new DbType("smallint")); + dbTypeMap.put(Types.DECIMAL, new DbType("decimal", 38)); + + dbTypeMap.put(Types.BINARY, new DbType("bytea", false)); + dbTypeMap.put(Types.VARBINARY, new DbType("bytea", false)); + + dbTypeMap.put(Types.BLOB, new DbType("bytea", false)); + dbTypeMap.put(Types.CLOB, new DbType("text")); + dbTypeMap.put(Types.LONGVARBINARY, new DbType("bytea", false)); + dbTypeMap.put(Types.LONGVARCHAR, new DbType("text")); + + dbDdlSyntax.setDropTableCascade("cascade"); + dbDdlSyntax.setDropIfExists("if exists"); + + } + + /** + * Create a Postgres specific sequence IdGenerator. + */ + @Override + public IdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, + String seqName, int batchSize) { + + return new PostgresSequenceIdGenerator(be, ds, seqName, batchSize); + } + + @Override + protected String withForUpdate(String sql) { + return sql + " for update"; + } +} diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/PostgresDdlSyntax.java b/src/main/java/com/avaje/ebean/config/dbplatform/PostgresDdlSyntax.java new file mode 100644 index 000000000..09c6cfd92 --- /dev/null +++ b/src/main/java/com/avaje/ebean/config/dbplatform/PostgresDdlSyntax.java @@ -0,0 +1,25 @@ +package com.avaje.ebean.config.dbplatform; + +public class PostgresDdlSyntax extends DbDdlSyntax { + + /** + * Map bigint, integer and smallint into their equivilent serial types. + */ + @Override + public String getIdentityColumnDefn(String columnDefn) { + + //smallserial, serial and bigserial + if ("bigint".equalsIgnoreCase(columnDefn)) { + return "bigserial"; + } + if ("integer".equalsIgnoreCase(columnDefn)) { + return "serial"; + } + if ("smallint".equalsIgnoreCase(columnDefn)) { + return "smallserial"; + } + + return columnDefn; + } + +} diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/PostgresPlatform.java b/src/main/java/com/avaje/ebean/config/dbplatform/PostgresPlatform.java index e2158ce97..375fca5d5 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/PostgresPlatform.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/PostgresPlatform.java @@ -7,9 +7,9 @@ import javax.sql.DataSource; import java.sql.Types; /** - * Postgres v8.3 specific platform. + * Postgres v9 specific platform. *

- * No support for getGeneratedKeys. + * Uses serial types and getGeneratedKeys. *

*/ public class PostgresPlatform extends DatabasePlatform { @@ -17,14 +17,18 @@ public class PostgresPlatform extends DatabasePlatform { public PostgresPlatform() { super(); this.name = "postgres"; + + this.dbDdlSyntax = new PostgresDdlSyntax(); + this.selectCountWithAlias = true; this.blobDbType = Types.LONGVARBINARY; this.clobDbType = Types.VARCHAR; this.dbEncrypt = new PostgresDbEncrypt(); - this.dbIdentity.setSupportsGetGeneratedKeys(false); - this.dbIdentity.setIdType(IdType.SEQUENCE); + // Use Identity and getGeneratedKeys + this.dbIdentity.setIdType(IdType.IDENTITY); + this.dbIdentity.setSupportsGetGeneratedKeys(true); this.dbIdentity.setSupportsSequence(true); String colAlias = GlobalProperties.get("ebean.columnAliasPrefix", null); @@ -36,8 +40,6 @@ public class PostgresPlatform extends DatabasePlatform { this.openQuote = "\""; this.closeQuote = "\""; - // dbTypeMap.put(Types.BOOLEAN, new DbType("bit default 0")); - dbTypeMap.put(Types.INTEGER, new DbType("integer", false)); dbTypeMap.put(Types.DOUBLE, new DbType("float")); dbTypeMap.put(Types.TINYINT, new DbType("smallint")); diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java index 98f5d39c4..8ae2b34a3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -53,16 +53,16 @@ public class DatabasePlatformFactory { private DatabasePlatform byDatabaseName(String dbName) throws SQLException { dbName = dbName.toLowerCase(); - if (dbName.equals("postgres83")) { + if (dbName.equals("postgres") || dbName.equals("postgres9")) { return new PostgresPlatform(); } + if (dbName.equals("postgres8") || dbName.equals("postgres83")) { + return new Postgres8Platform(); + } if (dbName.equals("oracle9")) { return new Oracle9Platform(); } - if (dbName.equals("oracle10")) { - return new Oracle10Platform(); - } - if (dbName.equals("oracle")) { + if (dbName.equals("oracle") || dbName.equals("oracle10")) { return new Oracle10Platform(); } if (dbName.equals("sqlserver2005")) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateTableColumnVisitor.java b/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateTableColumnVisitor.java index 45062830e..ad9f76793 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateTableColumnVisitor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/ddl/CreateTableColumnVisitor.java @@ -155,11 +155,12 @@ public class CreateTableColumnVisitor extends BaseTablePropertyVisitor { parent.writeColumnName(p.getDbColumn(), p); String columnDefn = ctx.getColumnDefn(p); - ctx.write(columnDefn); - + boolean identity = isIdentity(p); if (identity) { - writeIdentity(); + ctx.write(ddl.getIdentityColumnDefn(columnDefn)); + } else { + ctx.write(columnDefn); } if (p.isId() && ddl.isInlinePrimaryKeyConstraint()){ @@ -188,13 +189,6 @@ public class CreateTableColumnVisitor extends BaseTablePropertyVisitor { expr.append(p.getDbColumn()).append(")"); return expr.toString(); } - - protected void writeIdentity() { - String identity = ddl.getIdentity(); - if (identity != null && identity.length() > 0) { - ctx.write(" ").write(identity); - } - } protected void writeIdentitySuffix() { String identity = ddl.getIdentitySuffix(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java index d48513fe6..bf12d7851 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java @@ -237,8 +237,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { /** * Check with useGeneratedKeys to get appropriate PreparedStatement. */ - protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) - throws SQLException { + protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws SQLException { Connection conn = t.getInternalConnection(); if (genKeys) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java index 369761caf..17694d525 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java @@ -4,7 +4,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; import java.util.List; import javax.persistence.OptimisticLockException; @@ -115,7 +114,7 @@ public class InsertHandler extends DmlHandler { protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean useGeneratedKeys) throws SQLException { Connection conn = t.getInternalConnection(); if (useGeneratedKeys) { - return conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); + return conn.prepareStatement(sql, meta.getIdentityDbColumns()); } else { return conn.prepareStatement(sql);