Fix ReSaveReferencedDeletedEntity for CockroachDB and HANA

Author: beikov

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

@@ -199,7 +199,7 @@ protected String columnType(int sqlTypeCode) {
 			// "long" string types
 			case LONG32VARCHAR:
 			case LONG32NVARCHAR:
-				return "varchar";
+				return "text";
 			case BLOB:
 			case CLOB:
 			case NCLOB:
@@ -232,9 +232,10 @@ protected String castType(int sqlTypeCode) {
 			case NCHAR:
 			case VARCHAR:
 			case NVARCHAR:
+				return "varchar";
 			case LONG32VARCHAR:
 			case LONG32NVARCHAR:
-				return "varchar";
+				return "text";
 			case BINARY:
 			case VARBINARY:
 			case LONG32VARBINARY:

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

@@ -220,7 +220,7 @@ protected String columnType(int sqlTypeCode) {
 			// since there's no real difference between TEXT and VARCHAR,
 			// except for the length limit, we can just use 'text' for the
 			// "long" string types
-			case LONG32VARCHAR, LONG32NVARCHAR -> "varchar";
+			case LONG32VARCHAR, LONG32NVARCHAR -> "text";
 
 			// use oid as the blob/clob type on Postgres because
 			// the JDBC driver doesn't allow using bytea/text via
@@ -246,7 +246,8 @@ protected String columnType(int sqlTypeCode) {
 	@Override
 	protected String castType(int sqlTypeCode) {
 		return switch (sqlTypeCode) {
-			case CHAR, NCHAR, VARCHAR, NVARCHAR, LONG32VARCHAR, LONG32NVARCHAR -> "varchar";
+			case CHAR, NCHAR, VARCHAR, NVARCHAR -> "varchar";
+			case LONG32VARCHAR, LONG32NVARCHAR -> "text";
 			case BINARY, VARBINARY, LONG32VARBINARY -> "bytea";
 			default -> super.castType( sqlTypeCode );
 		};

hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java

@@ -76,8 +76,9 @@ public void testReSaveDeletedEntityWithDetach() {
 	@Entity(name = "Child")
 	public static class Child {
 		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		@GeneratedValue
 		private Integer id;
+		private String name;
 
 		public Integer getId() {
 			return id;
@@ -91,7 +92,7 @@ public void setId(Integer id) {
 	@Entity(name = "Parent")
 	public static class Parent {
 		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		@GeneratedValue
 		private Integer id;
 
 		@OneToOne(cascade = CascadeType.ALL)