HHH-15573 SpannerDialect, schema creation generates SQL containing 'n…

…ull' instead of the column type
hibernate · Oct 7, 2022 · 9a9643c · 9a9643c
1 parent 742082a
commit 9a9643c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
@@ -63,10 +63,10 @@ else if ( table.getForeignKeys().size() > 0 ) {
 			keyColumns = Collections.emptyList();
 		}
 
-		return getTableString( table, keyColumns, context );
+		return getTableString( table, metadata, keyColumns, context );
 	}
 
-	private String[] getTableString(Table table, Iterable<Column> keyColumns, SqlStringGenerationContext context) {
+	private String[] getTableString(Table table, Metadata metadata, Iterable<Column> keyColumns, SqlStringGenerationContext context) {
 		String primaryKeyColNames = StreamSupport.stream( keyColumns.spliterator(), false )
 				.map( Column::getName )
 				.collect( Collectors.joining( "," ) );
@@ -75,10 +75,11 @@ private String[] getTableString(Table table, Iterable<Column> keyColumns, SqlStr
 
 
 		for ( Column column : table.getColumns() ) {
-			String columnDeclaration =
+			final String sqlType = column.getSqlType( metadata.getDatabase().getTypeConfiguration(), spannerDialect, metadata );
+			final String columnDeclaration =
 					column.getName()
-							+ " " + column.getSqlType()
-							+ ( column.isNullable() ? this.spannerDialect.getNullColumnString( column.getSqlType() ) : " not null" );
+							+ " " + sqlType
+							+ ( column.isNullable() ? this.spannerDialect.getNullColumnString( sqlType ) : " not null" );
 			colsAndTypes.add( columnDeclaration );
 		}