diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java index 43ada8da84..c9d3c00c55 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java @@ -1196,9 +1196,4 @@ public class CockroachDialect extends Dialect { public boolean supportsFromClauseInUpdate() { return true; } - - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java index 8c1537a73a..070091a266 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java @@ -1316,9 +1316,4 @@ public class DB2Dialect extends Dialect { public boolean supportsFromClauseInUpdate() { return getDB2Version().isSameOrAfter( 11 ); } - - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index 494b97dfe0..622479b703 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -1007,8 +1007,4 @@ public class H2Dialect extends Dialect { return true; } - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java index c41d01429b..fa0ca8189f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -727,9 +727,4 @@ public class HSQLDialect extends Dialect { public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() { return DmlTargetColumnQualifierSupport.TABLE_ALIAS; } - - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java index d11449f8de..d107bd8939 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -1581,9 +1581,4 @@ public class MySQLDialect extends Dialect { } return sqlCheckConstraint; } - - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java index 1610ef662f..9dc3f79952 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java @@ -1702,9 +1702,4 @@ public class OracleDialect extends Dialect { } return sqlCheckConstraint; } - - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java index ebb92e9ea2..67fa1ce56a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java @@ -1598,9 +1598,4 @@ public class PostgreSQLDialect extends Dialect { public boolean supportsFromClauseInUpdate() { return true; } - - @Override - public boolean supportsTableOptions() { - return true; - } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java index 70343e8836..2f0dbd9088 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java @@ -113,13 +113,12 @@ public class StandardTableExporter implements Exporter { applyTableTypeString( createTable ); } - final List sqlStrings = new ArrayList<>(); if ( StringHelper.isNotEmpty( table.getOptions() ) ) { - if ( dialect.supportsTableOptions() ) { - createTable.append( " " ); - createTable.append( table.getOptions() ); - } + createTable.append( " " ); + createTable.append( table.getOptions() ); } + + final List sqlStrings = new ArrayList<>(); sqlStrings.add( createTable.toString() ); applyComments( table, formattedTableName, sqlStrings ); applyInitCommands( table, sqlStrings, context ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java index c5c6b9dc9f..9b9549a165 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/tableoptions/TableOptionsTest.java @@ -14,8 +14,6 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.orm.junit.BaseUnitTest; -import org.hibernate.testing.orm.junit.DialectFeatureChecks; -import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -24,7 +22,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; @BaseUnitTest -@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTableOptions.class) public class TableOptionsTest { static final String TABLE_NAME = "PRIMARY_TABLE"; static final String TABLE_OPTIONS = "option_1"; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java index a3bfa9aae0..d775d6cbc7 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java @@ -705,11 +705,4 @@ abstract public class DialectFeatureChecks { return dialect.getNationalizationSupport() == NationalizationSupport.EXPLICIT; } } - - public static class SupportsTableOptions implements DialectFeatureCheck{ - @Override - public boolean apply(Dialect dialect) { - return dialect.supportsTableOptions(); - } - } }