Skip to content

Commit 3d76942

Browse files
committed
HHH-19260 - Move supportsIntersect() from AbstractSqlAstTranslator to Dialect
Signed-off-by: Jan Schatteman <[email protected]>
1 parent 4dff98d commit 3d76942

16 files changed

+48
-43
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,4 +1112,10 @@ public String getDual() {
11121112
public String getFromDualForSelectOnly() {
11131113
return " from " + getDual();
11141114
}
1115+
1116+
@Override
1117+
public boolean supportsIntersect() {
1118+
return false;
1119+
}
1120+
11151121
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,6 @@ private boolean supportsOffsetFetchClause() {
264264
return getDialect().getVersion().isSameOrAfter( 3 );
265265
}
266266

267-
@Override
268-
protected boolean supportsIntersect() {
269-
return false;
270-
}
271-
272267
@Override
273268
protected boolean supportsNestedWithClause() {
274269
return false;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,4 +302,10 @@ public String getDual() {
302302
public String getFromDualForSelectOnly() {
303303
return getVersion().isBefore( 10, 4 ) ? ( " from " + getDual() ) : "";
304304
}
305+
306+
@Override
307+
public boolean supportsIntersect() {
308+
return getVersion().isSameOrAfter( 10, 3 );
309+
}
310+
305311
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,6 @@ protected boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
407407
return false;
408408
}
409409

410-
@Override
411-
protected boolean supportsIntersect() {
412-
return dialect.getVersion().isSameOrAfter( 10, 3 );
413-
}
414-
415410
@Override
416411
public MariaDBLegacyDialect getDialect() {
417412
return this.dialect;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,4 +1509,9 @@ public boolean supportsDistinctFromPredicate() {
15091509
return false;
15101510
}
15111511

1512+
@Override
1513+
public boolean supportsIntersect() {
1514+
return false;
1515+
}
1516+
15121517
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,6 @@ protected boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
384384
return false;
385385
}
386386

387-
@Override
388-
protected boolean supportsIntersect() {
389-
return false;
390-
}
391-
392387
@Override
393388
protected boolean supportsSimpleQueryGrouping() {
394389
return getDialect().getVersion().isSameOrAfter( 8 );

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,4 +729,11 @@ public LimitHandler getLimitHandler() {
729729
public String getDual() {
730730
return "(select 1 c1)";
731731
}
732+
733+
@Override
734+
public boolean supportsIntersect() {
735+
// At least the version that
736+
return false;
737+
}
738+
732739
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,6 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
492492
}
493493
}
494494

495-
@Override
496-
protected boolean supportsIntersect() {
497-
// At least the version that
498-
return false;
499-
}
500-
501495
@Override
502496
protected void renderSelectTupleComparison(
503497
List<SqlSelection> lhsExpressions,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5910,4 +5910,8 @@ public boolean supportsDuplicateSelectItemsInQueryGroup() {
59105910
return true;
59115911
}
59125912

5913+
public boolean supportsIntersect() {
5914+
return true;
5915+
}
5916+
59135917
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,4 +378,10 @@ public boolean equivalentTypes(int typeCode1, int typeCode2) {
378378
|| typeCode1 == SqlTypes.JSON && typeCode2 == Types.LONGVARCHAR
379379
|| super.equivalentTypes( typeCode1, typeCode2 );
380380
}
381+
382+
@Override
383+
public boolean supportsIntersect() {
384+
return true;
385+
}
386+
381387
}

0 commit comments

Comments
 (0)