HHH-18446 Added default SQL type code to LongVarbinaryJdbcType abd LongVarcharJdbcType

Author: cigaly

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarbinaryJdbcType.java

@@ -16,12 +16,24 @@ public class LongVarbinaryJdbcType extends VarbinaryJdbcType {
 
 	private final int jdbcTypeCode;
 
+	private final int defaultSqlTypeCode;
+
 	public LongVarbinaryJdbcType() {
 		this(Types.LONGVARBINARY);
 	}
 
 	public LongVarbinaryJdbcType(int jdbcTypeCode) {
+		this( jdbcTypeCode, jdbcTypeCode );
+	}
+
+	public LongVarbinaryJdbcType(final int jdbcTypeCode, final int defaultSqlTypeCode) {
 		this.jdbcTypeCode = jdbcTypeCode;
+		this.defaultSqlTypeCode = defaultSqlTypeCode;
+	}
+
+	@Override
+	public int getDefaultSqlTypeCode() {
+		return defaultSqlTypeCode;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarcharJdbcType.java

@@ -21,12 +21,19 @@ public class LongVarcharJdbcType extends VarcharJdbcType {
 
 	private final int jdbcTypeCode;
 
+	private final int defaultSqlTypeCode;
+
 	public LongVarcharJdbcType() {
 		this(Types.LONGVARCHAR);
 	}
 
 	public LongVarcharJdbcType(int jdbcTypeCode) {
+		this( jdbcTypeCode, jdbcTypeCode );
+	}
+
+	public LongVarcharJdbcType(final int jdbcTypeCode, final int defaultSqlTypeCode) {
 		this.jdbcTypeCode = jdbcTypeCode;
+		this.defaultSqlTypeCode = defaultSqlTypeCode;
 	}
 
 	@Override
@@ -39,6 +46,11 @@ public int getJdbcTypeCode() {
 		return jdbcTypeCode;
 	}
 
+	@Override
+	public int getDefaultSqlTypeCode() {
+		return defaultSqlTypeCode;
+	}
+
 	@Override
 	public JdbcType resolveIndicatedType(
 			JdbcTypeIndicators indicators,

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/JdbcTypeBaseline.java

@@ -85,12 +85,12 @@ public static void prime(BaselineTarget target) {
 		target.addDescriptor( BinaryJdbcType.INSTANCE );
 		target.addDescriptor( VarbinaryJdbcType.INSTANCE );
 		target.addDescriptor( LongVarbinaryJdbcType.INSTANCE );
-		target.addDescriptor( new LongVarbinaryJdbcType(SqlTypes.LONG32VARBINARY) );
+		target.addDescriptor( new LongVarbinaryJdbcType(SqlTypes.LONGVARBINARY, SqlTypes.LONG32VARBINARY) );
 
 		target.addDescriptor( CharJdbcType.INSTANCE );
 		target.addDescriptor( VarcharJdbcType.INSTANCE );
 		target.addDescriptor( LongVarcharJdbcType.INSTANCE );
-		target.addDescriptor( new LongVarcharJdbcType(SqlTypes.LONG32VARCHAR) );
+		target.addDescriptor( new LongVarcharJdbcType(SqlTypes.LONGVARCHAR, SqlTypes.LONG32VARCHAR) );
 
 		target.addDescriptor( BlobJdbcType.DEFAULT );
 		target.addDescriptor( ClobJdbcType.DEFAULT );
@@ -101,7 +101,7 @@ public static void prime(BaselineTarget target) {
 		target.addDescriptor( Types.NVARCHAR, VarcharJdbcType.INSTANCE );
 		target.addDescriptor( Types.LONGNVARCHAR, LongVarcharJdbcType.INSTANCE );
 		target.addDescriptor( Types.NCLOB, ClobJdbcType.DEFAULT );
-		target.addDescriptor( new LongVarcharJdbcType(SqlTypes.LONG32NVARCHAR) );
+		target.addDescriptor( new LongVarcharJdbcType(SqlTypes.LONGVARCHAR, SqlTypes.LONG32NVARCHAR) );
 
 		target.addDescriptor( RowIdJdbcType.INSTANCE );
 	}