HHH-18802 Add XML aggregate support for SQL Server

Author: beikov

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

@@ -52,8 +52,10 @@
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.common.FetchClauseType;
 import org.hibernate.query.sqm.IntervalType;
@@ -68,6 +70,7 @@
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.tool.schema.internal.StandardSequenceExporter;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
@@ -142,6 +145,17 @@ public Size resolveSize(
 			}
 		}
 	};
+	private final StandardTableExporter sqlServerTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isXml() ) {
+				// XML columns can't have check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 
 	public SQLServerLegacyDialect() {
@@ -1165,6 +1179,11 @@ public UniqueDelegate getUniqueDelegate() {
 		return uniqueDelegate;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return this.sqlServerTableExporter;
+	}
+
 	@Override
 	public Exporter<Sequence> getSequenceExporter() {
 		if ( exporter == null ) {

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

@@ -54,8 +54,10 @@
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.procedure.internal.SQLServerCallableStatementSupport;
 import org.hibernate.procedure.spi.CallableStatementSupport;
@@ -75,6 +77,7 @@
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.tool.schema.internal.StandardSequenceExporter;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeRegistry;
@@ -161,6 +164,17 @@ public Size resolveSize(
 			};
 		}
 	};
+	private final StandardTableExporter sqlServerTableExporter = new StandardTableExporter( this ) {
+		@Override
+		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
+			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( jdbcType.isXml() ) {
+				// XML columns can't have check constraints
+				return;
+			}
+			super.applyAggregateColumnCheck( buf, aggregateColumn );
+		}
+	};
 
 	public SQLServerDialect() {
 		this( MINIMUM_VERSION );
@@ -1109,6 +1123,11 @@ public UniqueDelegate getUniqueDelegate() {
 		return uniqueDelegate;
 	}
 
+	@Override
+	public Exporter<Table> getTableExporter() {
+		return this.sqlServerTableExporter;
+	}
+
 	@Override
 	public Exporter<Sequence> getSequenceExporter() {
 		return exporter == null ? super.getSequenceExporter() : exporter;

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

@@ -271,8 +271,11 @@ public static <X> X fromString(
 			String string,
 			boolean returnEmbeddable,
 			WrapperOptions options) throws SQLException {
+		if ( NULL_TAG.equals( string ) ) {
+			return null;
+		}
 		if ( !string.startsWith( START_TAG ) || !string.endsWith( END_TAG ) ) {
-			throw new IllegalArgumentException( "Illegal XML for struct: " + string );
+			throw new IllegalArgumentException( "XML not properly formatted: " + string );
 		}
 		int end;
 		final Object[] array;