Fix SybaseASEDialect column lenght resolution

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

@@ -508,6 +508,23 @@ public JdbcType resolveSqlTypeDescriptor(
 		);
 	}
 
+	@Override
+	public int resolveSqlTypeLength(
+			String columnTypeName,
+			int jdbcTypeCode,
+			int precision,
+			int scale,
+			int displaySize) {
+		// It seems MariaDB/MySQL return the precision in bytes depending on the charset,
+		// so to detect whether we have a single character here, we check the display size
+		if ( jdbcTypeCode == Types.CHAR && precision <= 4 ) {
+			return displaySize;
+		}
+		else {
+			return precision;
+		}
+	}
+
 	@Override
 	public int getPreferredSqlTypeCodeForBoolean() {
 		return Types.BIT;

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

@@ -10,14 +10,12 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.Map;
 
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.RowLockStrategy;
 import org.hibernate.dialect.SybaseDriverKind;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.TopLimitHandler;
@@ -33,7 +31,6 @@
 import org.hibernate.query.sqm.IntervalType;
 import org.hibernate.query.sqm.TemporalUnit;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.sql.ForUpdateFragment;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
 import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
@@ -237,22 +234,6 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		}
 	}
 
-	@Override
-	public int resolveSqlTypeLength(
-			String columnTypeName,
-			int jdbcTypeCode,
-			int precision,
-			int scale,
-			int displaySize) {
-		// Sybase ASE reports the "actual" precision in the display size
-		switch ( jdbcTypeCode ) {
-			case Types.REAL:
-			case Types.DOUBLE:
-				return displaySize;
-		}
-		return super.resolveSqlTypeLength( columnTypeName, jdbcTypeCode, precision, scale, displaySize );
-	}
-
 	@Override
 	public String currentDate() {
 		return "current_date()";

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

@@ -158,6 +158,23 @@ public JdbcType resolveSqlTypeDescriptor(
 		);
 	}
 
+	@Override
+	public int resolveSqlTypeLength(
+			String columnTypeName,
+			int jdbcTypeCode,
+			int precision,
+			int scale,
+			int displaySize) {
+		// Sybase jconnect driver reports the "actual" precision in the display size
+		switch ( jdbcTypeCode ) {
+			case Types.VARCHAR:
+			case Types.REAL:
+			case Types.DOUBLE:
+				return displaySize;
+		}
+		return super.resolveSqlTypeLength( columnTypeName, jdbcTypeCode, precision, scale, displaySize );
+	}
+
 	@Override
 	public SqmTranslatorFactory getSqmTranslatorFactory() {
 		return new StandardSqmTranslatorFactory() {

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

@@ -764,14 +764,7 @@ public int resolveSqlTypeLength(
 			int precision,
 			int scale,
 			int displaySize) {
-		// It seems MariaDB/MySQL return the precision in bytes depending on the charset,
+		return precision;
-		// so to detect whether we have a single character here, we check the display size
-		if ( jdbcTypeCode == Types.CHAR && precision <= 4 ) {
-			return displaySize;
-		}
-		else {
-			return precision;
-		}
 	}
 
 	/**

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

@@ -544,6 +544,23 @@ public JdbcType resolveSqlTypeDescriptor(
 		);
 	}
 
+	@Override
+	public int resolveSqlTypeLength(
+			String columnTypeName,
+			int jdbcTypeCode,
+			int precision,
+			int scale,
+			int displaySize) {
+		// It seems MariaDB/MySQL return the precision in bytes depending on the charset,
+		// so to detect whether we have a single character here, we check the display size
+		if ( jdbcTypeCode == Types.CHAR && precision <= 4 ) {
+			return displaySize;
+		}
+		else {
+			return precision;
+		}
+	}
+
 	@Override
 	public int getPreferredSqlTypeCodeForBoolean() {
 		return Types.BIT;

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

@@ -251,22 +251,6 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		}
 	}
 
-	@Override
-	public int resolveSqlTypeLength(
-			String columnTypeName,
-			int jdbcTypeCode,
-			int precision,
-			int scale,
-			int displaySize) {
-		// Sybase ASE reports the "actual" precision in the display size
-		switch ( jdbcTypeCode ) {
-			case Types.REAL:
-			case Types.DOUBLE:
-				return displaySize;
-		}
-		return super.resolveSqlTypeLength( columnTypeName, jdbcTypeCode, precision, scale, displaySize );
-	}
-
 	@Override
 	public String currentDate() {
 		return "current_date()";

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

@@ -140,6 +140,23 @@ public JdbcType resolveSqlTypeDescriptor(
 		);
 	}
 
+	@Override
+	public int resolveSqlTypeLength(
+			String columnTypeName,
+			int jdbcTypeCode,
+			int precision,
+			int scale,
+			int displaySize) {
+		// Sybase jconnect driver reports the "actual" precision in the display size
+		switch ( jdbcTypeCode ) {
+			case Types.VARCHAR:
+			case Types.REAL:
+			case Types.DOUBLE:
+				return displaySize;
+		}
+		return super.resolveSqlTypeLength( columnTypeName, jdbcTypeCode, precision, scale, displaySize );
+	}
+
 	@Override
 	public SqmTranslatorFactory getSqmTranslatorFactory() {
 		return new StandardSqmTranslatorFactory() {

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

@@ -13,6 +13,7 @@
 
 import org.hibernate.boot.model.naming.DatabaseIdentifier;
 import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.tool.schema.extract.spi.ExtractionContext;
 import org.hibernate.tool.schema.extract.spi.TableInformation;
 
@@ -134,6 +135,8 @@ protected <T> T processImportedKeysResultSet(
 	}
 
 	protected void addColumns(TableInformation tableInformation) {
+		final Dialect dialect = getExtractionContext().getJdbcEnvironment().getDialect();
+
 		final ExtractionContext extractionContext = getExtractionContext();
 		// We use this dummy query to retrieve the table information through the ResultSetMetaData
 		// This is significantly better than to use the DatabaseMetaData especially on Oracle with synonyms enabled
@@ -153,13 +156,22 @@ protected void addColumns(TableInformation tableInformation) {
 
 						for ( int i = 1; i <= columnCount; i++ ) {
 							final String columnName = metaData.getColumnName( i );
+							final int columnType = metaData.getColumnType( i );
+							final String typeName = new StringTokenizer( metaData.getColumnTypeName( i ), "()" ).nextToken();
+							final int scale = metaData.getScale( i );
 							final ColumnInformationImpl columnInformation = new ColumnInformationImpl(
 									tableInformation,
 									DatabaseIdentifier.toIdentifier( columnName ),
-									metaData.getColumnType( i ),
+									columnType,
-									new StringTokenizer( metaData.getColumnTypeName( i ), "()" ).nextToken(),
+									typeName,
-									metaData.getPrecision( i ),
+									dialect.resolveSqlTypeLength(
-									metaData.getScale( i ),
+											typeName,
+											columnType,
+											metaData.getPrecision( i ),
+											scale,
+											metaData.getColumnDisplaySize( i )
+									),
+									scale,
 									interpretNullable( metaData.isNullable( i ) )
 							);
 							tableInformation.addColumn( columnInformation );