diff --git a/etc/hibernate.properties b/etc/hibernate.properties index 7a480b4f7c..825e0be19d 100644 --- a/etc/hibernate.properties +++ b/etc/hibernate.properties @@ -176,33 +176,6 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate #hibernate.connection.driver_class net.sourceforge.jtds.jdbc.Driver #hibernate.connection.url jdbc:jtds:sqlserver://1E1/test -## Interbase - -#hibernate.dialect org.hibernate.dialect.InterbaseDialect -#hibernate.connection.username sysdba -#hibernate.connection.password masterkey - -## DO NOT specify hibernate.connection.sqlDialect - -## InterClient - -#hibernate.connection.driver_class interbase.interclient.Driver -#hibernate.connection.url jdbc:interbase://localhost:3060/C:/firebird/test.gdb - -## Pure Java - -#hibernate.connection.driver_class org.firebirdsql.jdbc.FBDriver -#hibernate.connection.url jdbc:firebirdsql:localhost/3050:/firebird/test.gdb - - -## Pointbase - -#hibernate.dialect org.hibernate.dialect.PointbaseDialect -#hibernate.connection.driver_class com.pointbase.jdbc.jdbcUniversalDriver -#hibernate.connection.url jdbc:pointbase:embedded:sample -#hibernate.connection.username PBPUBLIC -#hibernate.connection.password PBPUBLIC - ## Ingres diff --git a/etc/hibernate.properties.template b/etc/hibernate.properties.template index 66301a702b..6a32b24494 100644 --- a/etc/hibernate.properties.template +++ b/etc/hibernate.properties.template @@ -155,33 +155,6 @@ hibernate.connection.url @DB_URL@ #hibernate.connection.driver_class net.sourceforge.jtds.jdbc.Driver #hibernate.connection.url jdbc:jtds:sqlserver://1E1/test -## Interbase - -#hibernate.dialect org.hibernate.dialect.InterbaseDialect -#hibernate.connection.username sysdba -#hibernate.connection.password masterkey - -## DO NOT specify hibernate.connection.sqlDialect - -## InterClient - -#hibernate.connection.driver_class interbase.interclient.Driver -#hibernate.connection.url jdbc:interbase://localhost:3060/C:/firebird/test.gdb - -## Pure Java - -#hibernate.connection.driver_class org.firebirdsql.jdbc.FBDriver -#hibernate.connection.url jdbc:firebirdsql:localhost/3050:/firebird/test.gdb - - -## Pointbase - -#hibernate.dialect org.hibernate.dialect.PointbaseDialect -#hibernate.connection.driver_class com.pointbase.jdbc.jdbcUniversalDriver -#hibernate.connection.url jdbc:pointbase:embedded:sample -#hibernate.connection.username PBPUBLIC -#hibernate.connection.password PBPUBLIC - ## Ingres diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java index e2d508f0ca..be47b393fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java @@ -43,7 +43,6 @@ import org.hibernate.dialect.InformixDialect; import org.hibernate.dialect.Ingres10Dialect; import org.hibernate.dialect.Ingres9Dialect; import org.hibernate.dialect.IngresDialect; -import org.hibernate.dialect.InterbaseDialect; import org.hibernate.dialect.MimerSQLDialect; import org.hibernate.dialect.MySQL57Dialect; import org.hibernate.dialect.MySQL5Dialect; @@ -51,12 +50,10 @@ import org.hibernate.dialect.MySQL8Dialect; import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.dialect.PointbaseDialect; import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.dialect.PostgreSQL9Dialect; import org.hibernate.dialect.PostgresPlusDialect; -import org.hibernate.dialect.ProgressDialect; import org.hibernate.dialect.SAPDBDialect; import org.hibernate.dialect.SQLServer2005Dialect; import org.hibernate.dialect.SQLServer2008Dialect; @@ -208,7 +205,6 @@ public class StrategySelectorBuilder { addDialect( strategySelector, IngresDialect.class ); addDialect( strategySelector, Ingres9Dialect.class ); addDialect( strategySelector, Ingres10Dialect.class ); - addDialect( strategySelector, InterbaseDialect.class ); addDialect( strategySelector, MimerSQLDialect.class ); addDialect( strategySelector, MySQL5Dialect.class ); addDialect( strategySelector, MySQL57Dialect.class ); @@ -216,12 +212,10 @@ public class StrategySelectorBuilder { addDialect( strategySelector, Oracle8iDialect.class ); addDialect( strategySelector, Oracle9iDialect.class ); addDialect( strategySelector, Oracle10gDialect.class ); - addDialect( strategySelector, PointbaseDialect.class ); addDialect( strategySelector, PostgresPlusDialect.class ); addDialect( strategySelector, PostgreSQL81Dialect.class ); addDialect( strategySelector, PostgreSQL82Dialect.class ); addDialect( strategySelector, PostgreSQL9Dialect.class ); - addDialect( strategySelector, ProgressDialect.class ); addDialect( strategySelector, SAPDBDialect.class ); addDialect( strategySelector, SQLServerDialect.class ); addDialect( strategySelector, SQLServer2005Dialect.class ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Database.java b/hibernate-core/src/main/java/org/hibernate/dialect/Database.java index 91bdae3870..8846424d3d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Database.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Database.java @@ -235,21 +235,6 @@ public enum Database { } }, - INTERBASE { - @Override - public Dialect createDialect(DialectResolutionInfo info) { - return new InterbaseDialect(); - } - @Override - public boolean productNameMatches(String databaseName) { - return databaseName.toLowerCase().startsWith("interbase"); - } - @Override - public String getDriverClassName(String jdbcUrl) { - return "interbase.interclient.Driver"; - } - }, - MARIADB { @Override public boolean matchesResolutionInfo(DialectResolutionInfo info) { @@ -341,21 +326,6 @@ public enum Database { }*/ }, - POINTBASE { - @Override - public Dialect createDialect(DialectResolutionInfo info) { - return new PointbaseDialect(); - } - @Override - public boolean productNameMatches(String databaseName) { - return databaseName.toLowerCase().startsWith("pointbase"); - } - @Override - public String getDriverClassName(String jdbcUrl) { - return "com.pointbase.jdbc.jdbcUniversalDriver"; - } - }, - POSTGRESQL { @Override public Dialect createDialect(DialectResolutionInfo info) { @@ -371,26 +341,6 @@ public enum Database { } }, - PROGRESS { - @Override - public Dialect createDialect(DialectResolutionInfo info) { - return new ProgressDialect(); - } - @Override - public boolean productNameMatches(String databaseName) { - return databaseName.toLowerCase().startsWith("progress") - || databaseName.toLowerCase().startsWith("openedge"); - } - @Override - public String getDriverClassName(String jdbcUrl) { - return "com.ddtek.jdbc.openedge.OpenEdgeDriver"; - } - @Override - public String getUrlPrefix() { - return "jdbc:datadirect:openedge:"; - } - }, - SQLSERVER { @Override public Dialect createDialect(DialectResolutionInfo info) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java deleted file mode 100644 index 4a9c6cf1df..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.dialect; - -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.pagination.LimitHandler; -import org.hibernate.dialect.pagination.RowsLimitHandler; -import org.hibernate.dialect.sequence.InterbaseSequenceSupport; -import org.hibernate.dialect.sequence.SequenceSupport; -import org.hibernate.tool.schema.extract.internal.SequenceNameExtractorImpl; -import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; - -import java.sql.Types; - -/** - * An SQL dialect for Interbase. - * - * @author Gavin King - */ -public class InterbaseDialect extends Dialect { - - public InterbaseDialect() { - super(); - - registerColumnType( Types.BIT, 1, "boolean" ); - registerColumnType( Types.BIT, "smallint" ); - - registerColumnType( Types.TINYINT, "smallint" ); - registerColumnType( Types.BIGINT, "numeric(19,0)" ); - - registerColumnType( Types.REAL, "float"); - registerColumnType( Types.FLOAT, "double precision"); - - registerColumnType( Types.VARBINARY, "blob" ); - registerColumnType( Types.BLOB, "blob" ); - registerColumnType( Types.CLOB, "blob sub_type 1" ); - - //no precision - registerColumnType( Types.TIMESTAMP, "timestamp" ); - registerColumnType( Types.TIMESTAMP_WITH_TIMEZONE, "timestamp" ); - - getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, NO_BATCH ); - } - - @Override - public int getDefaultDecimalPrecision() { - //the extremely low maximum - return 18; - } - - @Override - public String getAddColumnString() { - return "add"; - } - - @Override - public SequenceSupport getSequenceSupport() { - return InterbaseSequenceSupport.INSTANCE; - } - - @Override - public String getQuerySequencesString() { - return "select rdb$generator_name from rdb$generators"; - } - - @Override - public SequenceInformationExtractor getSequenceInformationExtractor() { - return SequenceNameExtractorImpl.INSTANCE; - } - - @Override - public String getForUpdateString() { - return " with lock"; - } - - @Override - public LimitHandler getLimitHandler() { - return RowsLimitHandler.INSTANCE; - } - - @Override - public String getCurrentTimestampSelectString() { - return "select current_timestamp " + getFromDual(); - } - - @Override - public boolean isCurrentTimestampSelectStringCallable() { - return false; - } - - @Override - public String getFromDual() { - return "from rdb$database"; - } - -} diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java deleted file mode 100644 index 9f52400525..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.dialect; - -import org.hibernate.LockMode; -import org.hibernate.dialect.lock.*; -import org.hibernate.persister.entity.Lockable; - -import java.sql.Types; - -/** - * A Dialect for Pointbase. - * - * @author Ed Mackenzie - */ -public class PointbaseDialect extends org.hibernate.dialect.Dialect { - /** - * Creates new PointbaseDialect - */ - public PointbaseDialect() { - super(); - //no pointbase BIT - registerColumnType( Types.BIT, 1, "smallint" ); - registerColumnType( Types.BIT, "smallint" ); - //no pointbase TINYINT - registerColumnType( Types.TINYINT, "smallint" ); - - //no precision - registerColumnType( Types.TIMESTAMP, "timestamp" ); - registerColumnType( Types.TIMESTAMP_WITH_TIMEZONE, "timestamp" ); - - registerColumnType( Types.VARBINARY, "blob($l)" ); - } - - @Override - public String getAddColumnString() { - return "add"; - } - - @Override - public boolean dropConstraints() { - return false; - } - - @Override - public String getCascadeConstraintsString() { - return " cascade"; - } - - @Override - public String getForUpdateString() { - return ""; - } - - @Override - public LockingStrategy getLockingStrategy(Lockable lockable, LockMode lockMode) { - // Pointbase has no known variation of a "SELECT ... FOR UPDATE" syntax... - switch (lockMode) { - case PESSIMISTIC_FORCE_INCREMENT: - return new PessimisticForceIncrementLockingStrategy(lockable, lockMode); - case PESSIMISTIC_WRITE: - return new PessimisticWriteUpdateLockingStrategy(lockable, lockMode); - case PESSIMISTIC_READ: - return new PessimisticReadUpdateLockingStrategy(lockable, lockMode); - case OPTIMISTIC: - return new OptimisticLockingStrategy(lockable, lockMode); - case OPTIMISTIC_FORCE_INCREMENT: - return new OptimisticForceIncrementLockingStrategy(lockable, lockMode); - } - if ( lockMode.greaterThan( LockMode.READ ) ) { - return new UpdateLockingStrategy( lockable, lockMode ); - } - else { - return new SelectLockingStrategy( lockable, lockMode ); - } - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java deleted file mode 100644 index 58bedfda1b..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.dialect; - -import java.sql.Types; - -/** - * An SQL dialect compatible with Progress 9.1C
- *
- * Connection Parameters required: - *
    - *
  • hibernate.dialect org.hibernate.sql.ProgressDialect - *
  • hibernate.driver com.progress.sql.jdbc.JdbcProgressDriver - *
  • hibernate.url jdbc:JdbcProgress:T:host:port:dbname;WorkArounds=536870912 - *
  • hibernate.username username - *
  • hibernate.password password - *
- * The WorkArounds parameter in the URL is required to avoid an error - * in the Progress 9.1C JDBC driver related to PreparedStatements. - * @author Phillip Baird - * - */ -public class ProgressDialect extends Dialect { - /** - * Constructs a ProgressDialect - */ - public ProgressDialect() { - super(); - - registerColumnType( Types.BOOLEAN, "bit" ); - - //'float' is a synonym for 'double precision' - //TODO: return single-precision 'real' when - // precision <= 24 - //note: unnecessary in Progress 10 - registerColumnType( Types.FLOAT, "float" ); - registerColumnType( Types.DOUBLE, "float" ); - - //note: unnecessary in Progress 10 - registerColumnType( Types.BIGINT, "numeric(19,0)" ); - - //no precision - registerColumnType( Types.TIMESTAMP, "timestamp" ); - registerColumnType( Types.TIMESTAMP_WITH_TIMEZONE, "timestamp with time zone" ); - } - - @Override - public int getPreferredSqlTypeCodeForBoolean() { - return Types.BIT; - } - - @Override - public boolean hasAlterTable(){ - return false; - } - - @Override - public boolean qualifyIndexName() { - return false; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/FirebirdSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/FirebirdSequenceSupport.java index 130e2f6b0d..fbf9acbd0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/FirebirdSequenceSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/FirebirdSequenceSupport.java @@ -7,7 +7,8 @@ package org.hibernate.dialect.sequence; /** - * Sequence support for {@link org.hibernate.dialect.FirebirdDialect}. + * Sequence support for {@link org.hibernate.dialect.FirebirdDialect} + * on Firebird 3. * * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/InterbaseSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/InterbaseSequenceSupport.java index a9e88ccd0a..80abb2d7fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/InterbaseSequenceSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/InterbaseSequenceSupport.java @@ -7,7 +7,8 @@ package org.hibernate.dialect.sequence; /** - * Sequence support for {@link org.hibernate.dialect.InterbaseDialect}. + * Sequence support for {@link org.hibernate.dialect.FirebirdDialect} + * on Firebird 2. * * @author Gavin King */