HHH-14654 Fix for schema validation bug

hibernate · Jun 21, 2021 · 7329f44 · 7329f44
1 parent bdc08af
commit 7329f44
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 0 deletions.
diff --git a/...src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDB202SpatialDialect.java b/...src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachDB202SpatialDialect.java
@@ -42,4 +42,9 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		delegateContributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( isSpatial( typeCode1 ) && isSpatial( typeCode2 ) );
+	}
 }
diff --git a/...src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachSpatialDialectTrait.java b/...src/main/java/org/hibernate/spatial/dialect/cockroachdb/CockroachSpatialDialectTrait.java
@@ -74,4 +74,9 @@ default boolean supports(SpatialFunction function) {
 		return DELEGATE.supports( function );
 	}
 
+
+	default boolean isSpatial(int typeCode) {
+		return DELEGATE.isSpatial( typeCode );
+	}
+
 }
diff --git a/...te-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGSpatialDialectTrait.java b/...te-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PGSpatialDialectTrait.java
@@ -7,6 +7,8 @@
 
 package org.hibernate.spatial.dialect.postgis;
 
+import java.sql.Types;
+
 import org.hibernate.spatial.SpatialDialect;
 import org.hibernate.spatial.SpatialFunction;
 import org.hibernate.spatial.dialect.SpatialFunctionsRegistry;
@@ -125,4 +127,13 @@ default boolean supportsFiltering() {
 	default boolean supports(SpatialFunction function) {
 		return support.supports( function );
 	}
+
+	/**
+	 * Checks whether the typeCode is (potentially) the code for a spatial type
+	 * @param typeCode the JDBC type code
+	 * @return if the typecode corresponds with a spatialt type
+	 */
+	default boolean isSpatial(int typeCode){
+		return support.isSpatial( typeCode );
+	}
 }
diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG10Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG10Dialect.java
@@ -7,6 +7,7 @@
 
 package org.hibernate.spatial.dialect.postgis;
 
+import java.sql.Types;
 import java.util.Map;
 
 import org.hibernate.boot.model.TypeContributions;
@@ -36,4 +37,11 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( isSpatial( typeCode1 ) && isSpatial( typeCode2 ) );
+	}
+
+
 }
diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG82Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG82Dialect.java
@@ -48,6 +48,11 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( support.isSpatial( typeCode1 ) && support.isSpatial( typeCode2 ) );
+	}
 
 	@Override
 	public String getSpatialRelateSQL(String columnName, int spatialRelation) {

diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG91Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG91Dialect.java
@@ -48,6 +48,12 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( support.isSpatial( typeCode1 ) && support.isSpatial( typeCode2 ) );
+	}
+
 	/**
 	 * Returns the SQL fragment for the SQL WHERE-clause when parsing
 	 * <code>org.hibernatespatial.criterion.SpatialRelateExpression</code>s

diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG92Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG92Dialect.java
@@ -48,6 +48,12 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( support.isSpatial( typeCode1 ) && support.isSpatial( typeCode2 ) );
+	}
+
 	/**
 	 * Returns the SQL fragment for the SQL WHERE-clause when parsing
 	 * <code>org.hibernatespatial.criterion.SpatialRelateExpression</code>s

diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java
@@ -48,6 +48,12 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( support.isSpatial( typeCode1 ) && support.isSpatial( typeCode2 ) );
+	}
+
 	/**
 	 * Returns the SQL fragment for the SQL WHERE-clause when parsing
 	 * <code>org.hibernatespatial.criterion.SpatialRelateExpression</code>s

diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java
@@ -48,6 +48,12 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( support.isSpatial( typeCode1 ) && support.isSpatial( typeCode2 ) );
+	}
+
 	/**
 	 * Returns the SQL fragment for the SQL WHERE-clause when parsing
 	 * <code>org.hibernatespatial.criterion.SpatialRelateExpression</code>s

diff --git a/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java b/...rnate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java
@@ -42,4 +42,9 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( isSpatial( typeCode1 ) && isSpatial( typeCode2 ) );
+	}
 }
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG9Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG9Dialect.java
@@ -48,6 +48,12 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		support.contributeTypes( typeContributions, serviceRegistry );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		return super.equivalentTypes( typeCode1, typeCode2 ) ||
+				( support.isSpatial( typeCode1 ) && support.isSpatial( typeCode2 ) );
+	}
+
 	/**
 	 * Returns the SQL fragment for the SQL WHERE-clause when parsing
 	 * <code>org.hibernatespatial.criterion.SpatialRelateExpression</code>s

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSupport.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSupport.java
@@ -7,6 +7,7 @@
 package org.hibernate.spatial.dialect.postgis;
 
 import java.io.Serializable;
+import java.sql.Types;
 
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.service.ServiceRegistry;
@@ -47,6 +48,10 @@ public SpatialFunctionsRegistry functionsToRegister() {
 		return postgisFunctions;
 	}
 
+	public boolean isSpatial(int typeCode){
+		return typeCode == Types.OTHER || typeCode == PGGeometryTypeDescriptor.INSTANCE_WKB_1.getSqlType();
+	}
+
 	/**
 	 * Returns the SQL fragment for the SQL WHERE-clause when parsing
 	 * <code>org.hibernatespatial.criterion.SpatialRelateExpression</code>s