Introduce Dialect.getCatalogSeparator()

This is ":" on Informix.

Also fix defaulted quoting strategy on Informix

Author: gavinking

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

@@ -4,11 +4,14 @@
  */
 package org.hibernate.community.dialect;
 
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
 import java.sql.Types;
 import java.time.temporal.TemporalAccessor;
 import java.util.Date;
 import java.util.TimeZone;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
@@ -24,6 +27,9 @@
 import org.hibernate.dialect.NullOrdering;
 import org.hibernate.dialect.Replacer;
 import org.hibernate.dialect.SelectItemReferenceStrategy;
+import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
 import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
 import org.hibernate.dialect.function.CaseLeastGreatestEmulation;
 import org.hibernate.dialect.function.CommonFunctionFactory;
@@ -629,6 +635,11 @@ public String getCurrentTimestampSelectString() {
 		return "select distinct current timestamp from informix.systables";
 	}
 
+	@Override
+	public String getCatalogSeparator() {
+		return ":";
+	}
+
 	@Override
 	public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy(
 			EntityMappingType rootEntityDescriptor,
@@ -926,4 +937,12 @@ public boolean supportsRowValueConstructorSyntaxInInList() {
 		return false;
 	}
 
+	@Override
+	public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, @Nullable DatabaseMetaData metadata)
+			throws SQLException {
+		if ( metadata == null ) {
+			builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.LOWER );
+		}
+		return super.buildIdentifierHelper( builder, metadata );
+	}
 }

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

@@ -3028,6 +3028,10 @@ public boolean supportsIfExistsAfterTypeName() {
 		return false;
 	}
 
+	public String getCatalogSeparator() {
+		return ".";
+	}
+
 	// callable statement support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	/**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java

@@ -101,7 +101,8 @@ public JdbcEnvironmentImpl(final ServiceRegistryImplementor serviceRegistry, fin
 		currentCatalog = identifierHelper.toIdentifier( cfgService.getSetting( DEFAULT_CATALOG, STRING ) );
 		currentSchema = Identifier.toIdentifier( cfgService.getSetting( DEFAULT_SCHEMA, STRING ) );
 
-		qualifiedObjectNameFormatter = new QualifiedObjectNameFormatterStandardImpl( nameQualifierSupport );
+		qualifiedObjectNameFormatter =
+				new QualifiedObjectNameFormatterStandardImpl( nameQualifierSupport, dialect.getCatalogSeparator() );
 
 		lobCreatorBuilder = makeLobCreatorBuilder( dialect );
 	}

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java

@@ -55,9 +55,9 @@ private Format buildFormat(
 		}
 	}
 
-	public QualifiedObjectNameFormatterStandardImpl(NameQualifierSupport nameQualifierSupport) {
+	public QualifiedObjectNameFormatterStandardImpl(NameQualifierSupport nameQualifierSupport, String catalogSeparator) {
 		// most dbs simply do <catalog>.<schema>.<name>
-		this( nameQualifierSupport, ".", false );
+		this( nameQualifierSupport, catalogSeparator, false );
 	}
 
 	public QualifiedObjectNameFormatterStandardImpl(

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java

@@ -12,6 +12,7 @@
 
 import org.hibernate.boot.model.naming.DatabaseIdentifier;
 import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.relational.QualifiedTableName;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.tool.schema.extract.spi.ExtractionContext;
 import org.hibernate.tool.schema.extract.spi.TableInformation;
@@ -157,11 +158,12 @@ protected void addColumns(TableInformation tableInformation) {
 
 		// We use this dummy query to retrieve the table information through the ResultSetMetaData
 		// Significantly better than using DatabaseMetaData especially on Oracle with synonyms enabled
+		final QualifiedTableName qualifiedTableName = tableInformation.getName();
 		final String tableName =
 				extractionContext.getSqlStringGenerationContext()
 						// The name comes from the database, so the case is correct
 						// But we quote here to avoid issues with reserved words
-						.format( tableInformation.getName().quote() );
+						.format( qualifiedTableName.quote() );
 
 		try {
 			extractionContext.getQueryResults(
@@ -178,9 +180,7 @@ protected void addColumns(TableInformation tableInformation) {
 			);
 		}
 		catch (SQLException e) {
-			throw convertSQLException( e,
-					"Error accessing column metadata: "
-							+ tableInformation.getName().toString() );
+			throw convertSQLException( e, "Error accessing column metadata: " + qualifiedTableName );
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/spi/ExtractionContext.java

@@ -6,7 +6,6 @@
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -38,7 +37,7 @@ default <T> T getQueryResults(
 			String queryString,
 			Object[] positionalParameters,
 			ResultSetProcessor<T> resultSetProcessor) throws SQLException {
-		try (PreparedStatement statement = getJdbcConnection().prepareStatement( queryString )) {
+		try ( var statement = getJdbcConnection().prepareStatement( queryString ) ) {
 			if ( positionalParameters != null ) {
 				for ( int i = 0 ; i < positionalParameters.length ; i++ ) {
 					statement.setObject( i + 1, positionalParameters[i] );

tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockJdbcServicesInitiator.java

@@ -58,7 +58,7 @@ public Identifier getCurrentSchema() {
 
 		@Override
 		public QualifiedObjectNameFormatter getQualifiedObjectNameFormatter() {
-			return new QualifiedObjectNameFormatterStandardImpl(getNameQualifierSupport());
+			return new QualifiedObjectNameFormatterStandardImpl(getNameQualifierSupport(), ".");
 		}
 
 		@Override