MSSQL Schema update and validation

README.md

@@ -35,7 +35,7 @@ Hibernate Reactive has been tested with:
 - Db2 11.5
 - CockroachDB 21.1
 - MS SQL Server 2019
-- [Hibernate ORM][] 5.6.0.Beta2
+- [Hibernate ORM][] 5.6.0.CR1
 - [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.1.4
 - [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.1.4
 - [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.1.4

build.gradle

@@ -53,7 +53,7 @@ version = projectVersion
 // ./gradlew clean build -PhibernateOrmVersion=5.5.1-SNAPSHOT
 ext {
     if ( !project.hasProperty('hibernateOrmVersion') ) {
-        hibernateOrmVersion = '5.6.0.Beta2'
+        hibernateOrmVersion = '5.6.0.CR1'
     }
     // For ORM, we need a parsed version (to get the family, ...)
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/AbstractReactiveInformationSchemaBasedExtractorImpl.java

@@ -130,6 +130,11 @@ private String normalizeLabel(String columnLabel) {
 		return toMetaDataObjectName( Identifier.toIdentifier( columnLabel ) );
 	}
 
+	@Override
+	protected String getResultSetTableTypesPhysicalTableConstant() {
+		return "BASE TABLE";
+	}
+
 	@Override
 	protected <T> T processCatalogsResultSet(ExtractionContext.ResultSetProcessor<T> processor) throws SQLException {
 		return getExtractionContext().getQueryResults(
@@ -150,7 +155,7 @@ protected <T> T processSchemaResultSet(
 		final StringBuilder sb = new StringBuilder()
 				.append( "select catalog_name as " ).append( getResultSetCatalogLabel() )
 				.append( " , schema_name as "  ).append( getResultSetSchemaLabel() )
-				.append( " from information_schema.schemata where true" );
+				.append( " from information_schema.schemata where 1 = 1" );
 		final List<Object> parameters = new ArrayList<>();
 		appendClauseAndParameterIfNotNullOrEmpty( " and catalog_name = ", catalog, sb, parameters );
 		appendClauseAndParameterIfNotNullOrEmpty( " and schema_name like ", schemaPattern, sb, parameters );
@@ -198,7 +203,7 @@ protected <T> T processTableResultSet(
 				// Remarks are not available from information_schema.
 				// Hibernate ORM does not currently do anything with remarks,
 				// so just return null for now.
-				.append( " from information_schema.tables where true" );
+				.append( " from information_schema.tables where 1 = 1" );
 		List<Object> parameterValues = new ArrayList<>();
 		appendClauseAndParameterIfNotNullOrEmpty( " and " + catalogColumn + " = ", catalog, sb, parameterValues );
 		appendClauseAndParameterIfNotNullOrEmpty( " and " + schemaColumn + " like ", schemaPattern, sb, parameterValues );
@@ -255,7 +260,7 @@ protected <T> T processColumnsResultSet(
 				// Hibernate's metadata for the column. ORM also considers
 				// the same column type name as a match, so the SQL code is
 				// optional. For now, just return null for the SQL type code.
-				.append( " from information_schema.columns where true" );
+				.append( " from information_schema.columns where 1 = 1" );
 
 		final List<Object> parameterValues = new ArrayList<>();
 		final String catalogColumn = getDatabaseCatalogColumnName(