Skip to content

Commit 02bddf9

Browse files
committed
remove deprecated/obsolete Dialect-related stuff
1 parent 146e383 commit 02bddf9

File tree

12 files changed

+10
-60
lines changed

12 files changed

+10
-60
lines changed

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
@@ -25,6 +25,7 @@
2525
import org.hibernate.LockOptions;
2626
import org.hibernate.boot.model.FunctionContributions;
2727
import org.hibernate.boot.model.TypeContributions;
28+
import org.hibernate.community.dialect.sequence.LegacyDB2SequenceSupport;
2829
import org.hibernate.dialect.DB2Dialect;
2930
import org.hibernate.dialect.DB2GetObjectExtractor;
3031
import org.hibernate.dialect.DB2StructJdbcType;
@@ -47,7 +48,6 @@
4748
import org.hibernate.dialect.pagination.LegacyDB2LimitHandler;
4849
import org.hibernate.dialect.pagination.LimitHandler;
4950
import org.hibernate.dialect.sequence.DB2SequenceSupport;
50-
import org.hibernate.dialect.sequence.LegacyDB2SequenceSupport;
5151
import org.hibernate.dialect.sequence.SequenceSupport;
5252
import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
5353
import org.hibernate.dialect.unique.SkipNullableUniqueDelegate;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.hibernate.boot.model.FunctionContributions;
88
import org.hibernate.dialect.DatabaseVersion;
99
import org.hibernate.dialect.function.CommonFunctionFactory;
10-
import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
1110
import org.hibernate.dialect.identity.DB2IdentityColumnSupport;
11+
import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
1212
import org.hibernate.dialect.identity.IdentityColumnSupport;
1313
import org.hibernate.dialect.pagination.FetchLimitHandler;
1414
import org.hibernate.dialect.pagination.LegacyDB2LimitHandler;
@@ -129,7 +129,7 @@ public LimitHandler getLimitHandler() {
129129
public IdentityColumnSupport getIdentityColumnSupport() {
130130
return getVersion().isSameOrAfter(7, 3)
131131
? DB2IdentityColumnSupport.INSTANCE
132-
: DB2390IdentityColumnSupport.INSTANCE;
132+
: DB2zIdentityColumnSupport.INSTANCE;
133133
}
134134

135135
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.hibernate.dialect.DatabaseVersion;
1010
import org.hibernate.dialect.TimeZoneSupport;
1111
import org.hibernate.dialect.function.CommonFunctionFactory;
12-
import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
12+
import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
1313
import org.hibernate.dialect.identity.IdentityColumnSupport;
1414
import org.hibernate.dialect.pagination.FetchLimitHandler;
1515
import org.hibernate.dialect.pagination.LimitHandler;
@@ -146,7 +146,7 @@ public LimitHandler getLimitHandler() {
146146

147147
@Override
148148
public IdentityColumnSupport getIdentityColumnSupport() {
149-
return DB2390IdentityColumnSupport.INSTANCE;
149+
return DB2zIdentityColumnSupport.INSTANCE;
150150
}
151151

152152
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ private static boolean isAnsiNull(DatabaseMetaData databaseMetaData) {
199199
return false;
200200
}
201201

202-
@Override
203202
public boolean isAnsiNullOn() {
204203
return ansiNull;
205204
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
393393
}
394394
}
395395
// I think intersect is only supported in 16.0 SP3
396-
if ( getDialect().isAnsiNullOn() ) {
396+
if ( ( (SybaseASELegacyDialect) getDialect() ).isAnsiNullOn() ) {
397397
if ( isLob ) {
398398
switch ( operator ) {
399399
case DISTINCT_FROM:

hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java renamed to hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/LegacyDB2SequenceSupport.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
* SPDX-License-Identifier: LGPL-2.1-or-later
33
* Copyright Red Hat Inc. and Hibernate Authors
44
*/
5-
package org.hibernate.dialect.sequence;
5+
package org.hibernate.community.dialect.sequence;
66

77
import org.hibernate.MappingException;
8+
import org.hibernate.dialect.sequence.SequenceSupport;
89

910
/**
1011
* Sequence support for {@link org.hibernate.dialect.DB2Dialect}.
1112
*
1213
* @author Gavin King
13-
*
14-
* @deprecated use {@code DB2SequenceSupport}
1514
*/
16-
@Deprecated(since="6.4")
1715
public class LegacyDB2SequenceSupport implements SequenceSupport {
1816

1917
public static final SequenceSupport INSTANCE = new LegacyDB2SequenceSupport();
@@ -42,4 +40,4 @@ public String getSequencePreviousValString(String sequenceName) throws MappingEx
4240
public String getDropSequenceString(String sequenceName) {
4341
return "drop sequence " + sequenceName + " restrict";
4442
}
45-
}
43+
}

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3820,17 +3820,6 @@ public boolean supportsNullPrecedence() {
38203820
return true;
38213821
}
38223822

3823-
/**
3824-
* A setting specific to {@link SybaseASEDialect}.
3825-
*
3826-
* @deprecated This is only called from {@link SybaseASESqlAstTranslator}
3827-
* so it doesn't need to be declared here.
3828-
*/
3829-
@Deprecated(since = "6")
3830-
public boolean isAnsiNullOn() {
3831-
return true;
3832-
}
3833-
38343823
/**
38353824
* Does this dialect/database require casting of non-string arguments
38363825
* in the {@code concat()} function?

hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,11 +1052,6 @@ public boolean supportsNullPrecedence() {
10521052
return wrapped.supportsNullPrecedence();
10531053
}
10541054

1055-
@Override
1056-
@Deprecated(since = "6")
1057-
public boolean isAnsiNullOn() {
1058-
return wrapped.isAnsiNullOn();
1059-
}
10601055

10611056
@Override
10621057
public boolean requiresCastForConcatenatingNonStrings() {

hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ private int pageSize(DialectResolutionInfo info) {
237237
return getInt( SYBASE_PAGE_SIZE, info.getConfigurationValues(), MAX_PAGE_SIZE );
238238
}
239239

240-
@Override
241240
public boolean isAnsiNullOn() {
242241
return ansiNull;
243242
}

hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
377377
}
378378
}
379379
// I think intersect is only supported in 16.0 SP3
380-
if ( getDialect().isAnsiNullOn() ) {
380+
if ( ( (SybaseASEDialect) getDialect() ).isAnsiNullOn() ) {
381381
if ( isLob ) {
382382
switch ( operator ) {
383383
case DISTINCT_FROM:

0 commit comments

Comments
 (0)