diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java index d1cff739a7..e9d36a78ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java @@ -767,9 +767,7 @@ public abstract class AbstractHANADialect extends Dialect { registerColumnType( Types.VARCHAR, "clob" ); registerColumnType( Types.NVARCHAR, "nclob" ); - registerColumnType( Types.BIT, 1, "boolean" ); - // map bit/tinyint to smallint since tinyint is unsigned on HANA - registerColumnType( Types.BIT, "smallint" ); + // map tinyint to smallint since tinyint is unsigned on HANA registerColumnType( Types.TINYINT, "smallint" ); registerHibernateType( Types.NCLOB, StandardBasicTypes.MATERIALIZED_NCLOB.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java index 33db901749..2e8eefd5a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java @@ -43,9 +43,6 @@ abstract class AbstractTransactSQLDialect extends Dialect { registerColumnType( Types.BOOLEAN, "bit" ); - //SQL Server/Sybase 'bit' type is always exactly one bit - registerColumnType( Types.BIT, "smallint" ); - //'tinyint' is an unsigned type in Sybase and //SQL Server, holding values in the range 0-255 //see HHH-6779 diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java index 247788c6db..7f07412d0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java @@ -102,7 +102,6 @@ public class DB2Dialect extends Dialect { //prior to DB2 11, the 'boolean' type existed, //but was not allowed as a column type registerColumnType( Types.BOOLEAN, "smallint" ); - registerColumnType( Types.BIT, 1, "smallint" ); } registerColumnType( Types.BLOB, "blob($l)" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java index 17ea62643d..ef7f927a33 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java @@ -98,10 +98,6 @@ public class DerbyDialect extends Dialect { if ( getVersion() < 1070) { registerColumnType( Types.BOOLEAN, "smallint" ); //no boolean before 10.7 - registerColumnType( Types.BIT, 1, "smallint" ); //no bit - } - else { - registerColumnType( Types.BIT, 1, "boolean" ); //no bit } registerColumnType( Types.TINYINT, "smallint" ); //no tinyint registerColumnType( Types.CHAR, 254, "char($l)" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 0da20b7d21..559012bcc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -157,8 +157,6 @@ public abstract class Dialect implements ConversionContext { protected Dialect() { - registerColumnType( Types.BIT, 1, "bit" ); - registerColumnType( Types.BIT, "bit($l)" ); registerColumnType( Types.BOOLEAN, "boolean" ); registerColumnType( Types.TINYINT, "tinyint" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java index 9f56e2b6dc..9d806e8355 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java @@ -94,9 +94,6 @@ public class FirebirdDialect extends Dialect { super(); this.version = version; - registerColumnType( Types.BIT, 1, "smallint" ); - registerColumnType( Types.BIT, "smallint" ); - if ( getVersion() < 300 ) { //'boolean' type introduced in 3.0 registerColumnType( Types.BOOLEAN, "smallint" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index ff5939a805..b85e6f8281 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -91,8 +91,6 @@ public class H2Dialect extends Dialect { ? OffsetFetchLimitHandler.INSTANCE : LimitOffsetLimitHandler.INSTANCE; - //Note: H2 'bit' is a synonym for 'boolean', not a proper bit type -// registerColumnType( Types.BIT, "bit" ); if ( version < 102139 ) { final int majorVersion = version / 100000; final int minorVersion = version % 100000 / 1000; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java index 5efe95eeae..4affa60df3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java @@ -74,10 +74,6 @@ public class InformixDialect extends Dialect { super(); this.version = version; - // Informix doesn't have a bit type - registerColumnType( Types.BIT, 1, "boolean" ); - registerColumnType( Types.BIT, "smallint" ); - registerColumnType( Types.TINYINT, "smallint" ); registerColumnType( Types.BIGINT, "int8" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java index 8d6d83923e..2a342fd5b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java @@ -87,14 +87,11 @@ public class IngresDialect extends Dialect { this.version = version; if ( getVersion() < 1000 ) { - registerColumnType( Types.BIT, 1, "tinyint" ); registerColumnType( Types.BOOLEAN, "tinyint" ); } else { - registerColumnType( Types.BIT, 1, "boolean" ); registerColumnType( Types.BOOLEAN, "boolean" ); } - registerColumnType( Types.BIT, "tinyint" ); registerColumnType( Types.NUMERIC, "decimal($p, $s)" ); //Ingres has no 'numeric' type diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MaxDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MaxDBDialect.java index 5f0ece7f1b..b4510a8f46 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MaxDBDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MaxDBDialect.java @@ -42,7 +42,6 @@ public class MaxDBDialect extends Dialect { public MaxDBDialect() { super(); - registerColumnType( Types.BIT, 1, "boolean" ); //no BIT type registerColumnType( Types.TINYINT, "smallint" ); registerColumnType( Types.BIGINT, "fixed(19,0)" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java index 59c37ff6ed..17004e7b1f 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java @@ -50,10 +50,7 @@ public class MimerSQLDialect extends Dialect { public MimerSQLDialect() { super(); - //no 'bit' type - registerColumnType( Types.BIT, 1, "boolean" ); //no 'tinyint', so use integer with 3 decimal digits - registerColumnType( Types.BIT, "integer(3)" ); registerColumnType( Types.TINYINT, "integer(3)" ); //Mimer CHARs are ASCII!! diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java index 84645927b6..55136e6ead 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java @@ -521,8 +521,6 @@ public class OracleDialect extends Dialect { } protected void registerNumericTypeMappings() { - registerColumnType( Types.BIT, 1, "number(1,0)" ); - registerColumnType( Types.BIT, "number(3,0)" ); registerColumnType( Types.BOOLEAN, "number(1,0)" ); registerColumnType( Types.BIGINT, "number(19,0)" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java index c5fd631d7e..7ea51647b1 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java @@ -83,8 +83,6 @@ public class RDMSOS2200Dialect extends Dialect { * Note that $l (dollar-L) will use the length value if provided. * Also new for Hibernate3 is the $p percision and $s (scale) parameters */ - registerColumnType( Types.BIT, 1, "smallint" ); - registerColumnType( Types.BIT, "smallint" ); registerColumnType( Types.BOOLEAN, "smallint" ); registerColumnType( Types.TINYINT, "smallint" ); registerColumnType( Types.BIGINT, "numeric(19,0)" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java index 4ba3eb871a..2d348b3534 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java @@ -64,8 +64,6 @@ public class SpannerDialect extends Dialect { public SpannerDialect() { registerColumnType( Types.BOOLEAN, "bool" ); - registerColumnType( Types.BIT, 1, "bool" ); - registerColumnType( Types.BIT, "int64" ); registerColumnType( Types.TINYINT, "int64" ); registerColumnType( Types.SMALLINT, "int64" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java index 759ecefe09..4b7d57c58c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java @@ -54,7 +54,6 @@ public class SybaseASEDialect extends SybaseDialect { //tinyint to store signed bytes, we can use it //to store boolean values) registerColumnType( Types.BOOLEAN, "tinyint" ); - registerColumnType( Types.BIT, 1, "tinyint" ); if ( getVersion() >= 1500 ) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java index ce06c4964f..5d3bfc98ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java @@ -80,8 +80,6 @@ public class TeradataDialect extends Dialect { this.version = version; registerColumnType( Types.BOOLEAN, "byteint" ); - registerColumnType( Types.BIT, 1, "byteint" ); - registerColumnType( Types.BIT, "byteint" ); registerColumnType( Types.TINYINT, "byteint" ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java index fd4ce122aa..2d39c254e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java @@ -61,8 +61,6 @@ public class TimesTenDialect extends Dialect { //Note: these are the correct type mappings // for the default Oracle type mode // TypeMode=0 - registerColumnType( Types.BIT, 1, "tt_tinyint" ); - registerColumnType( Types.BIT, "tt_tinyint" ); registerColumnType( Types.BOOLEAN, "tt_tinyint" ); registerColumnType(Types.TINYINT, "tt_tinyint");