Skip to content

Commit 11e6a78

Browse files
jrenaatjrenaat
committed
HHH-19260 - Exclude tests for MySQL dialects
Previously, these tests relied on the MySQL dialects returning false for the supportsDistinctFromPredicate() method (came from the base Dialect class), but with the move of this method out of the SqlAstTranslator classes into the actual Dialect classes, it has now become true which made these tests fail Signed-off-by: Jan Schatteman <[email protected]>
1 parent c143220 commit 11e6a78

15 files changed

+29
-31
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.hibernate.dialect.Dialect;
1313
import org.hibernate.dialect.HANADialect;
1414
import org.hibernate.dialect.HSQLDialect;
15-
import org.hibernate.dialect.MariaDBDialect;
15+
import org.hibernate.dialect.MySQLDialect;
1616
import org.hibernate.dialect.OracleDialect;
1717
import org.hibernate.dialect.SQLServerDialect;
1818
import org.hibernate.dialect.SybaseASEDialect;
@@ -127,7 +127,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
127127
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
128128
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
129129
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
130-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
130+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
131131
public void testNativeQuery(SessionFactoryScope scope) {
132132
scope.inSession( em -> {
133133
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.hibernate.dialect.Dialect;
1414
import org.hibernate.dialect.HANADialect;
1515
import org.hibernate.dialect.HSQLDialect;
16-
import org.hibernate.dialect.MariaDBDialect;
16+
import org.hibernate.dialect.MySQLDialect;
1717
import org.hibernate.dialect.OracleDialect;
1818
import org.hibernate.dialect.SQLServerDialect;
1919
import org.hibernate.dialect.SybaseASEDialect;
@@ -128,7 +128,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
128128
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
129129
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
130130
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
131-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
131+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
132132
public void testNativeQuery(SessionFactoryScope scope) {
133133
scope.inSession( em -> {
134134
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.hibernate.dialect.Dialect;
99
import org.hibernate.dialect.HANADialect;
1010
import org.hibernate.dialect.HSQLDialect;
11-
import org.hibernate.dialect.MariaDBDialect;
11+
import org.hibernate.dialect.MySQLDialect;
1212
import org.hibernate.dialect.OracleDialect;
1313
import org.hibernate.dialect.SQLServerDialect;
1414
import org.hibernate.dialect.SybaseASEDialect;
@@ -134,7 +134,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
134134
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
135135
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
136136
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
137-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
137+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
138138
public void testNativeQuery(SessionFactoryScope scope) {
139139
scope.inSession( em -> {
140140
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.hibernate.dialect.Dialect;
1111
import org.hibernate.dialect.HANADialect;
1212
import org.hibernate.dialect.HSQLDialect;
13-
import org.hibernate.dialect.MariaDBDialect;
13+
import org.hibernate.dialect.MySQLDialect;
1414
import org.hibernate.dialect.OracleDialect;
1515
import org.hibernate.dialect.PostgresPlusDialect;
1616
import org.hibernate.dialect.SQLServerDialect;
@@ -143,7 +143,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
143143
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
144144
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
145145
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
146-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
146+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
147147
@SkipForDialect(dialectClass = PostgresPlusDialect.class, reason = "Seems that comparing date[] through JDBC is buggy. ERROR: operator does not exist: timestamp without time zone[] = date[]")
148148
public void testNativeQuery(SessionFactoryScope scope) {
149149
scope.inSession( em -> {

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.hibernate.dialect.Dialect;
1010
import org.hibernate.dialect.HANADialect;
1111
import org.hibernate.dialect.HSQLDialect;
12-
import org.hibernate.dialect.MariaDBDialect;
12+
import org.hibernate.dialect.MySQLDialect;
1313
import org.hibernate.dialect.OracleDialect;
1414
import org.hibernate.dialect.SQLServerDialect;
1515
import org.hibernate.dialect.SybaseASEDialect;
@@ -138,7 +138,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
138138
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
139139
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
140140
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
141-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
141+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
142142
public void testNativeQuery(SessionFactoryScope scope) {
143143
scope.inSession( em -> {
144144
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.hibernate.dialect.Dialect;
1111
import org.hibernate.dialect.HANADialect;
1212
import org.hibernate.dialect.HSQLDialect;
13-
import org.hibernate.dialect.MariaDBDialect;
1413
import org.hibernate.dialect.MySQLDialect;
1514
import org.hibernate.dialect.OracleDialect;
1615
import org.hibernate.dialect.SQLServerDialect;
@@ -130,8 +129,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
130129
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
131130
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
132131
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
133-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
134-
@SkipForDialect(dialectClass = MySQLDialect.class )
132+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
135133
@SkipForDialect(dialectClass = DerbyDialect.class )
136134
@SkipForDialect(dialectClass = DB2Dialect.class )
137135
public void testNativeQuery(SessionFactoryScope scope) {

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.hibernate.dialect.Dialect;
1313
import org.hibernate.dialect.HANADialect;
1414
import org.hibernate.dialect.HSQLDialect;
15-
import org.hibernate.dialect.MariaDBDialect;
15+
import org.hibernate.dialect.MySQLDialect;
1616
import org.hibernate.dialect.OracleDialect;
1717
import org.hibernate.dialect.SQLServerDialect;
1818
import org.hibernate.dialect.SybaseASEDialect;
@@ -136,7 +136,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
136136
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
137137
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
138138
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
139-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
139+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
140140
public void testNativeQuery(SessionFactoryScope scope) {
141141
scope.inSession( em -> {
142142
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.hibernate.dialect.Dialect;
1313
import org.hibernate.dialect.HANADialect;
1414
import org.hibernate.dialect.HSQLDialect;
15-
import org.hibernate.dialect.MariaDBDialect;
15+
import org.hibernate.dialect.MySQLDialect;
1616
import org.hibernate.dialect.OracleDialect;
1717
import org.hibernate.dialect.SQLServerDialect;
1818
import org.hibernate.dialect.SybaseASEDialect;
@@ -129,7 +129,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
129129
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
130130
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
131131
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
132-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
132+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
133133
public void testNativeQuery(SessionFactoryScope scope) {
134134
scope.inSession( em -> {
135135
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.hibernate.dialect.Dialect;
99
import org.hibernate.dialect.HANADialect;
1010
import org.hibernate.dialect.HSQLDialect;
11-
import org.hibernate.dialect.MariaDBDialect;
11+
import org.hibernate.dialect.MySQLDialect;
1212
import org.hibernate.dialect.OracleDialect;
1313
import org.hibernate.dialect.SQLServerDialect;
1414
import org.hibernate.dialect.SybaseASEDialect;
@@ -126,7 +126,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
126126
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
127127
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
128128
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
129-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
129+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
130130
public void testNativeQuery(SessionFactoryScope scope) {
131131
scope.inSession( em -> {
132132
final Dialect dialect = em.getDialect();

‎hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.hibernate.dialect.Dialect;
99
import org.hibernate.dialect.HANADialect;
1010
import org.hibernate.dialect.HSQLDialect;
11-
import org.hibernate.dialect.MariaDBDialect;
11+
import org.hibernate.dialect.MySQLDialect;
1212
import org.hibernate.dialect.OracleDialect;
1313
import org.hibernate.dialect.SQLServerDialect;
1414
import org.hibernate.dialect.SybaseASEDialect;
@@ -126,7 +126,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
126126
@SkipForDialect(dialectClass = SQLServerDialect.class, reason = "SQL Server requires a special function to compare XML")
127127
@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE requires a special function to compare XML")
128128
@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
129-
@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB requires a special function to compare LOBs")
129+
@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
130130
public void testNativeQuery(SessionFactoryScope scope) {
131131
scope.inSession( em -> {
132132
final Dialect dialect = em.getDialect();

0 commit comments

Comments
 (0)