Skip to content

Commit 9301d2d

Browse files
committed
HHH-19370 move a large number of JdbcTypes out of org.hibernate.dialect root
- move them to a subpackage - also move some stuff with usages from org.hibernate.type into that namespace - rename StructJdbcType interface to StructuredJdbcType for clarity and to make space for the real StructJdbcType
1 parent f5e0b78 commit 9301d2d

File tree

115 files changed

+821
-761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+821
-761
lines changed

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@
3636
import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
3737
import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
3838
import org.hibernate.dialect.sequence.SequenceSupport;
39+
import org.hibernate.dialect.type.PgJdbcHelper;
40+
import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
41+
import org.hibernate.dialect.type.PostgreSQLCastingInetJdbcType;
42+
import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
43+
import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
44+
import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
45+
import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
46+
import org.hibernate.dialect.type.PostgreSQLOrdinalEnumJdbcType;
47+
import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
3948
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
4049
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
4150
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.hibernate.community.dialect.sequence.LegacyDB2SequenceSupport;
2929
import org.hibernate.dialect.DB2Dialect;
3030
import org.hibernate.dialect.DB2GetObjectExtractor;
31-
import org.hibernate.dialect.DB2StructJdbcType;
31+
import org.hibernate.dialect.type.DB2StructJdbcType;
3232
import org.hibernate.dialect.DatabaseVersion;
3333
import org.hibernate.dialect.Dialect;
3434
import org.hibernate.dialect.DmlTargetColumnQualifierSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
import org.hibernate.dialect.sequence.SequenceSupport;
3535
import org.hibernate.dialect.temptable.TemporaryTable;
3636
import org.hibernate.dialect.temptable.TemporaryTableKind;
37+
import org.hibernate.dialect.type.H2DurationIntervalSecondJdbcType;
38+
import org.hibernate.dialect.type.H2JsonArrayJdbcTypeConstructor;
39+
import org.hibernate.dialect.type.H2JsonJdbcType;
3740
import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
3841
import org.hibernate.dialect.unique.UniqueDelegate;
3942
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.hibernate.dialect.NullOrdering;
2525
import org.hibernate.dialect.Replacer;
2626
import org.hibernate.dialect.SelectItemReferenceStrategy;
27-
import org.hibernate.dialect.VarcharUUIDJdbcType;
27+
import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
2828
import org.hibernate.dialect.function.CaseLeastGreatestEmulation;
2929
import org.hibernate.dialect.function.CommonFunctionFactory;
3030
import org.hibernate.dialect.identity.IdentityColumnSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import org.hibernate.dialect.function.CommonFunctionFactory;
1717
import org.hibernate.dialect.sequence.MariaDBSequenceSupport;
1818
import org.hibernate.dialect.sequence.SequenceSupport;
19+
import org.hibernate.dialect.type.MariaDBCastingJsonArrayJdbcTypeConstructor;
20+
import org.hibernate.dialect.type.MariaDBCastingJsonJdbcType;
1921
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
2022
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
2123
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
@@ -33,6 +35,7 @@
3335
import org.hibernate.type.SqlTypes;
3436
import org.hibernate.type.StandardBasicTypes;
3537
import org.hibernate.type.descriptor.jdbc.JdbcType;
38+
import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
3639
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
3740
import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
3841
import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.hibernate.dialect.sequence.SequenceSupport;
2828
import org.hibernate.dialect.temptable.TemporaryTable;
2929
import org.hibernate.dialect.temptable.TemporaryTableKind;
30+
import org.hibernate.dialect.type.MySQLCastingJsonArrayJdbcTypeConstructor;
31+
import org.hibernate.dialect.type.MySQLCastingJsonJdbcType;
3032
import org.hibernate.engine.jdbc.Size;
3133
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
3234
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import org.hibernate.dialect.DatabaseVersion;
2525
import org.hibernate.dialect.Dialect;
2626
import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
27-
import org.hibernate.dialect.OracleBooleanJdbcType;
28-
import org.hibernate.dialect.OracleJdbcHelper;
29-
import org.hibernate.dialect.OracleJsonArrayJdbcTypeConstructor;
30-
import org.hibernate.dialect.OracleJsonJdbcType;
31-
import org.hibernate.dialect.OracleReflectionStructJdbcType;
27+
import org.hibernate.dialect.type.OracleBooleanJdbcType;
28+
import org.hibernate.dialect.type.OracleJdbcHelper;
29+
import org.hibernate.dialect.type.OracleJsonArrayJdbcTypeConstructor;
30+
import org.hibernate.dialect.type.OracleJsonJdbcType;
31+
import org.hibernate.dialect.type.OracleReflectionStructJdbcType;
3232
import org.hibernate.dialect.OracleTypes;
33-
import org.hibernate.dialect.OracleUserDefinedTypeExporter;
34-
import org.hibernate.dialect.OracleXmlJdbcType;
33+
import org.hibernate.dialect.type.OracleUserDefinedTypeExporter;
34+
import org.hibernate.dialect.type.OracleXmlJdbcType;
3535
import org.hibernate.dialect.Replacer;
3636
import org.hibernate.dialect.RowLockStrategy;
3737
import org.hibernate.dialect.TimeZoneSupport;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.ArrayList;
88
import java.util.List;
99

10-
import org.hibernate.dialect.OracleArrayJdbcType;
10+
import org.hibernate.dialect.type.OracleArrayJdbcType;
1111
import org.hibernate.engine.spi.SessionFactoryImplementor;
1212
import org.hibernate.internal.util.collections.Stack;
1313
import org.hibernate.metamodel.mapping.CollectionPart;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@
4040
import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
4141
import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
4242
import org.hibernate.dialect.sequence.SequenceSupport;
43+
import org.hibernate.dialect.type.PgJdbcHelper;
44+
import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
45+
import org.hibernate.dialect.type.PostgreSQLCastingInetJdbcType;
46+
import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
47+
import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
48+
import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
49+
import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
50+
import org.hibernate.dialect.type.PostgreSQLOrdinalEnumJdbcType;
51+
import org.hibernate.dialect.type.PostgreSQLStructCastingJdbcType;
52+
import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
4353
import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
4454
import org.hibernate.dialect.unique.UniqueDelegate;
4555
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacyDialect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.hibernate.dialect.Dialect;
1717
import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
1818
import org.hibernate.dialect.Replacer;
19-
import org.hibernate.dialect.SQLServerCastingXmlArrayJdbcTypeConstructor;
20-
import org.hibernate.dialect.SQLServerCastingXmlJdbcType;
19+
import org.hibernate.dialect.type.SQLServerCastingXmlArrayJdbcTypeConstructor;
20+
import org.hibernate.dialect.type.SQLServerCastingXmlJdbcType;
2121
import org.hibernate.dialect.TimeZoneSupport;
2222
import org.hibernate.dialect.aggregate.AggregateSupport;
2323
import org.hibernate.dialect.aggregate.SQLServerAggregateSupport;

0 commit comments

Comments
 (0)