HHH-10451 - Fix generation of 'comment on table ... ' and 'comment on…

… column' statements
hibernate · Jan 25, 2016 · 8e32162 · 8e32162
1 parent 53872de
commit 8e32162
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
@@ -145,16 +145,26 @@ public String[] getSqlCreateStrings(Table table, Metadata metadata) {
 		List<String> sqlStrings = new ArrayList<String>();
 		sqlStrings.add( buf.toString() );
 
-		applyComments( table, sqlStrings );
+		applyComments( table, tableName, sqlStrings );
 
 		applyInitCommands( table, sqlStrings );
 
 		return sqlStrings.toArray( new String[ sqlStrings.size() ] );
 	}
 
-	protected void applyComments(Table table, List<String> sqlStrings) {
-		if ( table.getComment() != null ) {
-			sqlStrings.add( dialect.getTableComment( table.getComment() ) );
+	protected void applyComments(Table table, QualifiedName tableName, List<String> sqlStrings) {
+		if ( dialect.supportsCommentOn() ) {
+			if ( table.getComment() != null ) {
+				sqlStrings.add( "comment on table " + tableName + " is '" + table.getComment() + "'" );
+			}
+			final Iterator iter = table.getColumnIterator();
+			while ( iter.hasNext() ) {
+				Column column = (Column) iter.next();
+				String columnComment = column.getComment();
+				if ( columnComment != null ) {
+					sqlStrings.add( "comment on column " + tableName + column.getQuotedName( dialect ) + " is '" + columnComment + "'" );
+				}
+			}
 		}
 	}