HHH-8003 Create "sqlDropString" method in Dialect to handle "if exists"

correctly

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

@@ -2012,6 +2012,18 @@ public abstract class Dialect implements ConversionContext {
 		return false;
 	}
 	
+	public String getDropTableString( String tableName ) {
+		StringBuilder buf = new StringBuilder( "drop table " );
+		if ( supportsIfExistsBeforeTableName() ) {
+			buf.append( "if exists " );
+		}
+		buf.append( tableName ).append( getCascadeConstraintsString() );
+		if ( supportsIfExistsAfterTableName() ) {
+			buf.append( " if exists" );
+		}
+		return buf.toString();
+	}
+
 	/**
 	 * Does this dialect support column-level check constraints?
 	 *

hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java

@@ -134,15 +134,7 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 	}
 
 	public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
-		StringBuilder sqlDropString = new StringBuilder( "drop table " );
+		return new String[] { dialect.getDropTableString( tableName ) };
-		if ( dialect.supportsIfExistsBeforeTableName() ) {
-			sqlDropString.append( "if exists " );
-		}
-		sqlDropString.append( tableName ).append( dialect.getCascadeConstraintsString() );
-		if ( dialect.supportsIfExistsAfterTableName() ) {
-			sqlDropString.append( " if exists" );
-		}
-		return new String[] { sqlDropString.toString() };
 	}
 
 	public Object generatorKey() {

hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java

@@ -211,15 +211,7 @@ public class TableGenerator implements PersistentIdentifierGenerator, Configurab
 	}
 
 	public String[] sqlDropStrings(Dialect dialect) {
-		StringBuilder sqlDropString = new StringBuilder( "drop table " );
+		return new String[] { dialect.getDropTableString( tableName ) };
-		if ( dialect.supportsIfExistsBeforeTableName() ) {
-			sqlDropString.append( "if exists " );
-		}
-		sqlDropString.append( tableName ).append( dialect.getCascadeConstraintsString() );
-		if ( dialect.supportsIfExistsAfterTableName() ) {
-			sqlDropString.append( " if exists" );
-		}
-		return new String[] { sqlDropString.toString() };
 	}
 
 	public Object generatorKey() {

hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java

@@ -571,14 +571,6 @@ public class TableGenerator implements PersistentIdentifierGenerator, Configurab
 
 	@Override
 	public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
-		StringBuilder sqlDropString = new StringBuilder().append( "drop table " );
+		return new String[] { dialect.getDropTableString( tableName ) };
-		if ( dialect.supportsIfExistsBeforeTableName() ) {
-			sqlDropString.append( "if exists " );
-		}
-		sqlDropString.append( tableName ).append( dialect.getCascadeConstraintsString() );
-		if ( dialect.supportsIfExistsAfterTableName() ) {
-			sqlDropString.append( " if exists" );
-		}
-		return new String[] { sqlDropString.toString() };
 	}
 }

hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java

@@ -187,15 +187,7 @@ public class TableStructure implements DatabaseStructure {
 
 	@Override
 	public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
-		StringBuilder sqlDropString = new StringBuilder().append( "drop table " );
+		return new String[] { dialect.getDropTableString( tableName ) };
-		if ( dialect.supportsIfExistsBeforeTableName() ) {
-			sqlDropString.append( "if exists " );
-		}
-		sqlDropString.append( tableName ).append( dialect.getCascadeConstraintsString() );
-		if ( dialect.supportsIfExistsAfterTableName() ) {
-			sqlDropString.append( " if exists" );
-		}
-		return new String[] { sqlDropString.toString() };
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/mapping/Table.java

@@ -571,16 +571,7 @@ public class Table implements RelationalModel, Serializable {
 	}
 
 	public String sqlDropString(Dialect dialect, String defaultCatalog, String defaultSchema) {
-		StringBuilder buf = new StringBuilder( "drop table " );
+		return dialect.getDropTableString( getQualifiedName( dialect, defaultCatalog, defaultSchema ) );
-		if ( dialect.supportsIfExistsBeforeTableName() ) {
-			buf.append( "if exists " );
-		}
-		buf.append( getQualifiedName( dialect, defaultCatalog, defaultSchema ) )
-				.append( dialect.getCascadeConstraintsString() );
-		if ( dialect.supportsIfExistsAfterTableName() ) {
-			buf.append( " if exists" );
-		}
-		return buf.toString();
 	}
 
 	public PrimaryKey getPrimaryKey() {

hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java

@@ -268,16 +268,7 @@ public class Table extends AbstractTableSpecification implements Exportable {
 
 	@Override
 	public String[] sqlDropStrings(Dialect dialect) {
-		StringBuilder buf = new StringBuilder( "drop table " );
+		return new String[] { dialect.getDropTableString( getQualifiedName( dialect ) ) };
-		if ( dialect.supportsIfExistsBeforeTableName() ) {
-			buf.append( "if exists " );
-		}
-		buf.append( getQualifiedName( dialect ) )
-				.append( dialect.getCascadeConstraintsString() );
-		if ( dialect.supportsIfExistsAfterTableName() ) {
-			buf.append( " if exists" );
-		}
-		return new String[] { buf.toString() };
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BasicConnectionTest.java

@@ -72,7 +72,13 @@ public class BasicConnectionTest extends BaseCoreFunctionalTestCase {
 
 		try {
 			Statement statement = jdbcCoord.getStatementPreparer().createStatement();
-			jdbcCoord.getResultSetReturn().execute( statement, "drop table SANDBOX_JDBC_TST if exists" );
+			String dropSql = getDialect().getDropTableString( "SANDBOX_JDBC_TST" );
+			try {
+				jdbcCoord.getResultSetReturn().execute( statement, dropSql );
+			}
+			catch ( Exception e ) {
+				// ignore if the DB doesn't support "if exists" and the table doesn't exist
+			}
 			jdbcCoord.getResultSetReturn().execute( statement,
 					"create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" );
 			assertTrue( jdbcCoord.hasRegisteredResources() );

hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java

@@ -80,7 +80,13 @@ public class BatchingTest extends BaseCoreFunctionalTestCase implements BatchKey
 
 		// set up some tables to use
 		Statement statement = jdbcCoordinator.getStatementPreparer().createStatement();
-		jdbcCoordinator.getResultSetReturn().execute( statement, "drop table SANDBOX_JDBC_TST if exists" );
+		String dropSql = getDialect().getDropTableString( "SANDBOX_JDBC_TST" );
+		try {
+			jdbcCoordinator.getResultSetReturn().execute( statement, dropSql );
+		}
+		catch ( Exception e ) {
+			// ignore if the DB doesn't support "if exists" and the table doesn't exist
+		}
 		jdbcCoordinator.getResultSetReturn().execute( statement, "create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" );
 		assertTrue( jdbcCoordinator.hasRegisteredResources() );
 		assertTrue( logicalConnection.isPhysicallyConnected() );
@@ -138,8 +144,13 @@ public class BatchingTest extends BaseCoreFunctionalTestCase implements BatchKey
 
 		// set up some tables to use
 		Statement statement = jdbcCoordinator.getStatementPreparer().createStatement();
-		jdbcCoordinator.getResultSetReturn().execute( statement, "drop table SANDBOX_JDBC_TST if exists" );
+		String dropSql = getDialect().getDropTableString( "SANDBOX_JDBC_TST" );
-		jdbcCoordinator.getResultSetReturn().execute( statement, "create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" );
+		try {
+			jdbcCoordinator.getResultSetReturn().execute( statement, dropSql );
+		}
+		catch ( Exception e ) {
+			// ignore if the DB doesn't support "if exists" and the table doesn't exist
+		}		jdbcCoordinator.getResultSetReturn().execute( statement, "create table SANDBOX_JDBC_TST ( ID integer, NAME varchar(100) )" );
 		assertTrue( jdbcCoordinator.hasRegisteredResources() );
 		assertTrue( logicalConnection.isPhysicallyConnected() );
 		jdbcCoordinator.release( statement );