Skip to content

Commit 9301d2d

Browse files
gavinkinggavinking
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

+9
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

+1-1
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

+3
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

+1-1
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

+3
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

+2
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

+7-7
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

+1-1
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

+10
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

+2-2
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;

‎hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ public interface MappingSettings {
261261
* @since 6.5
262262
*
263263
* @see org.hibernate.type.SqlTypes#NAMED_ENUM
264-
* @see org.hibernate.dialect.PostgreSQLEnumJdbcType
265-
* @see org.hibernate.dialect.OracleEnumJdbcType
264+
* @see org.hibernate.dialect.type.PostgreSQLEnumJdbcType
265+
* @see org.hibernate.dialect.type.OracleEnumJdbcType
266266
*/
267267
@Incubating
268268
String PREFER_NATIVE_ENUM_TYPES = "hibernate.type.prefer_native_enum_types";

‎hibernate-core/src/main/java/org/hibernate/dialect/BooleanDecoder.java

+43-73
Original file line numberDiff line numberDiff line change
@@ -14,93 +14,63 @@
1414
public final class BooleanDecoder {
1515

1616
public static String toInteger(CastType from) {
17-
switch ( from ) {
18-
case BOOLEAN:
19-
return "decode(?1,false,0,true,1,null)";
20-
case YN_BOOLEAN:
21-
return "decode(?1,'Y',1,'N',0,null)";
22-
case TF_BOOLEAN:
23-
return "decode(?1,'T',1,'F',0,null)";
24-
}
25-
return null;
17+
return switch ( from ) {
18+
case BOOLEAN -> "decode(?1,false,0,true,1,null)";
19+
case YN_BOOLEAN -> "decode(?1,'Y',1,'N',0,null)";
20+
case TF_BOOLEAN -> "decode(?1,'T',1,'F',0,null)";
21+
default -> null;
22+
};
2623
}
2724

2825
public static String toBoolean(CastType from) {
29-
switch ( from ) {
30-
case STRING:
31-
return "decode(?1,'T',true,'F',false,'Y',true,'N',false,null)";
32-
case YN_BOOLEAN:
33-
return "decode(?1,'Y',true,'N',false,null)";
34-
case TF_BOOLEAN:
35-
return "decode(?1,'T',true,'F',false,null)";
36-
case INTEGER:
37-
case LONG:
38-
case INTEGER_BOOLEAN:
39-
return "decode(abs(sign(?1)),1,true,0,false,null)";
40-
}
41-
return null;
26+
return switch ( from ) {
27+
case STRING -> "decode(?1,'T',true,'F',false,'Y',true,'N',false,null)";
28+
case YN_BOOLEAN -> "decode(?1,'Y',true,'N',false,null)";
29+
case TF_BOOLEAN -> "decode(?1,'T',true,'F',false,null)";
30+
case INTEGER, LONG, INTEGER_BOOLEAN -> "decode(abs(sign(?1)),1,true,0,false,null)";
31+
default -> null;
32+
};
4233
}
4334

4435
public static String toIntegerBoolean(CastType from) {
45-
switch ( from ) {
46-
case STRING:
47-
return "decode(?1,'T',1,'F',0,'Y',1,'N',0,null)";
48-
case YN_BOOLEAN:
49-
return "decode(?1,'Y',1,'N',0,null)";
50-
case TF_BOOLEAN:
51-
return "decode(?1,'T',1,'F',0,null)";
52-
case INTEGER:
53-
case LONG:
54-
return "abs(sign(?1))";
55-
}
56-
return null;
36+
return switch ( from ) {
37+
case STRING -> "decode(?1,'T',1,'F',0,'Y',1,'N',0,null)";
38+
case YN_BOOLEAN -> "decode(?1,'Y',1,'N',0,null)";
39+
case TF_BOOLEAN -> "decode(?1,'T',1,'F',0,null)";
40+
case INTEGER, LONG -> "abs(sign(?1))";
41+
default -> null;
42+
};
5743
}
5844

5945
public static String toYesNoBoolean(CastType from) {
60-
switch ( from ) {
61-
case STRING:
62-
return "decode(?1,'T','Y','F','N','Y','Y','N','N',null)";
63-
case INTEGER_BOOLEAN:
64-
return "decode(?1,1,'Y',0,'N',null)";
65-
case TF_BOOLEAN:
66-
return "decode(?1,'T','Y','F','N',null)";
67-
case BOOLEAN:
68-
return "decode(?1,true,'Y',false,'N',null)";
69-
case INTEGER:
70-
case LONG:
71-
return "decode(abs(sign(?1)),1,'Y',0,'N',null)";
72-
}
73-
return null;
46+
return switch ( from ) {
47+
case STRING -> "decode(?1,'T','Y','F','N','Y','Y','N','N',null)";
48+
case INTEGER_BOOLEAN -> "decode(?1,1,'Y',0,'N',null)";
49+
case TF_BOOLEAN -> "decode(?1,'T','Y','F','N',null)";
50+
case BOOLEAN -> "decode(?1,true,'Y',false,'N',null)";
51+
case INTEGER, LONG -> "decode(abs(sign(?1)),1,'Y',0,'N',null)";
52+
default -> null;
53+
};
7454
}
7555

7656
public static String toTrueFalseBoolean(CastType from) {
77-
switch ( from ) {
78-
case STRING:
79-
return "decode(?1,'T','T','F','F','Y','T','N','F',null)";
80-
case INTEGER_BOOLEAN:
81-
return "decode(?1,1,'T',0,'F',null)";
82-
case YN_BOOLEAN:
83-
return "decode(?1,'Y','T','N','F',null)";
84-
case BOOLEAN:
85-
return "decode(?1,true,'T',false,'F',null)";
86-
case INTEGER:
87-
case LONG:
88-
return "decode(abs(sign(?1)),1,'T',0,'F',null)";
89-
}
90-
return null;
57+
return switch ( from ) {
58+
case STRING -> "decode(?1,'T','T','F','F','Y','T','N','F',null)";
59+
case INTEGER_BOOLEAN -> "decode(?1,1,'T',0,'F',null)";
60+
case YN_BOOLEAN -> "decode(?1,'Y','T','N','F',null)";
61+
case BOOLEAN -> "decode(?1,true,'T',false,'F',null)";
62+
case INTEGER, LONG -> "decode(abs(sign(?1)),1,'T',0,'F',null)";
63+
default -> null;
64+
};
9165
}
9266

9367
public static String toString(CastType from) {
94-
switch ( from ) {
95-
case INTEGER_BOOLEAN:
96-
return "decode(?1,0,'false',1,'true',null)";
97-
case TF_BOOLEAN:
98-
return "decode(?1,'T','true','F','false',null)";
99-
case YN_BOOLEAN:
100-
return "decode(?1,'Y','true','N','false',null)";
101-
case BOOLEAN:
102-
return "decode(?1,true,'true',false,'false',null)";
103-
}
104-
return null;
68+
return switch ( from ) {
69+
case INTEGER_BOOLEAN -> "decode(?1,0,'false',1,'true',null)";
70+
case TF_BOOLEAN -> "decode(?1,'T','true','F','false',null)";
71+
case YN_BOOLEAN -> "decode(?1,'Y','true','N','false',null)";
72+
case BOOLEAN -> "decode(?1,true,'true',false,'false',null)";
73+
default -> null;
74+
};
10575
}
10676
}

‎hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java

+9
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@
3535
import org.hibernate.dialect.pagination.OffsetFetchLimitHandler;
3636
import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
3737
import org.hibernate.dialect.sequence.SequenceSupport;
38+
import org.hibernate.dialect.type.PgJdbcHelper;
39+
import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
40+
import org.hibernate.dialect.type.PostgreSQLCastingInetJdbcType;
41+
import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
42+
import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
43+
import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
44+
import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
45+
import org.hibernate.dialect.type.PostgreSQLOrdinalEnumJdbcType;
46+
import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
3847
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
3948
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
4049
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;

‎hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.hibernate.dialect.pagination.LimitHandler;
4242
import org.hibernate.dialect.sequence.DB2SequenceSupport;
4343
import org.hibernate.dialect.sequence.SequenceSupport;
44+
import org.hibernate.dialect.type.DB2StructJdbcType;
4445
import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
4546
import org.hibernate.dialect.unique.UniqueDelegate;
4647
import org.hibernate.engine.jdbc.Size;

‎hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
import org.hibernate.dialect.sequence.SequenceSupport;
3131
import org.hibernate.dialect.temptable.TemporaryTable;
3232
import org.hibernate.dialect.temptable.TemporaryTableKind;
33+
import org.hibernate.dialect.type.H2DurationIntervalSecondJdbcType;
34+
import org.hibernate.dialect.type.H2JsonArrayJdbcTypeConstructor;
35+
import org.hibernate.dialect.type.H2JsonJdbcType;
3336
import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
3437
import org.hibernate.dialect.unique.UniqueDelegate;
3538
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;

‎hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.hibernate.dialect.identity.MariaDBIdentityColumnSupport;
2020
import org.hibernate.dialect.sequence.MariaDBSequenceSupport;
2121
import org.hibernate.dialect.sequence.SequenceSupport;
22+
import org.hibernate.dialect.type.MariaDBCastingJsonArrayJdbcTypeConstructor;
23+
import org.hibernate.dialect.type.MariaDBCastingJsonJdbcType;
2224
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
2325
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
2426
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
@@ -44,6 +46,7 @@
4446
import org.hibernate.type.SqlTypes;
4547
import org.hibernate.type.StandardBasicTypes;
4648
import org.hibernate.type.descriptor.jdbc.JdbcType;
49+
import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
4750
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
4851
import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
4952
import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;

‎hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
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.MySQLCastingJsonArrayJdbcTypeConstructor;
38+
import org.hibernate.dialect.type.MySQLCastingJsonJdbcType;
3739
import org.hibernate.engine.jdbc.Size;
3840
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
3941
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;

‎hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
import org.hibernate.dialect.sequence.SequenceSupport;
2424
import org.hibernate.dialect.temptable.TemporaryTable;
2525
import org.hibernate.dialect.temptable.TemporaryTableKind;
26+
import org.hibernate.dialect.type.OracleBooleanJdbcType;
27+
import org.hibernate.dialect.type.OracleEnumJdbcType;
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.OracleOrdinalEnumJdbcType;
32+
import org.hibernate.dialect.type.OracleReflectionStructJdbcType;
33+
import org.hibernate.dialect.type.OracleUserDefinedTypeExporter;
34+
import org.hibernate.dialect.type.OracleXmlArrayJdbcTypeConstructor;
35+
import org.hibernate.dialect.type.OracleXmlJdbcType;
2636
import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
2737
import org.hibernate.dialect.unique.UniqueDelegate;
2838
import org.hibernate.engine.config.spi.ConfigurationService;
@@ -108,8 +118,8 @@
108118
import static org.hibernate.LockOptions.SKIP_LOCKED;
109119
import static org.hibernate.LockOptions.WAIT_FOREVER;
110120
import static org.hibernate.cfg.DialectSpecificSettings.ORACLE_USE_BINARY_FLOATS;
111-
import static org.hibernate.dialect.OracleJdbcHelper.getArrayJdbcTypeConstructor;
112-
import static org.hibernate.dialect.OracleJdbcHelper.getNestedTableJdbcTypeConstructor;
121+
import static org.hibernate.dialect.type.OracleJdbcHelper.getArrayJdbcTypeConstructor;
122+
import static org.hibernate.dialect.type.OracleJdbcHelper.getNestedTableJdbcTypeConstructor;
113123
import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
114124
import static org.hibernate.internal.util.JdbcExceptionHelper.extractErrorCode;
115125
import static org.hibernate.internal.util.StringHelper.isEmpty;

‎hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.List;
99

1010
import org.hibernate.AssertionFailure;
11+
import org.hibernate.dialect.type.OracleArrayJdbcType;
1112
import org.hibernate.engine.spi.SessionFactoryImplementor;
1213
import org.hibernate.metamodel.mapping.CollectionPart;
1314
import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;

‎hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java

+10
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@
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.PostgreSQLStructCastingJdbcType;
48+
import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
3949
import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
4050
import org.hibernate.dialect.unique.UniqueDelegate;
4151
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;

‎hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import org.hibernate.dialect.sequence.SQLServer16SequenceSupport;
3939
import org.hibernate.dialect.sequence.SQLServerSequenceSupport;
4040
import org.hibernate.dialect.sequence.SequenceSupport;
41+
import org.hibernate.dialect.type.SQLServerCastingXmlArrayJdbcTypeConstructor;
42+
import org.hibernate.dialect.type.SQLServerCastingXmlJdbcType;
4143
import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
4244
import org.hibernate.dialect.unique.UniqueDelegate;
4345
import org.hibernate.engine.jdbc.Size;

0 commit comments

Comments
 (0)