Revision: 3233
Author: silva.josemanuel1
Date: Tue Jan 19 09:27:32 2010
Log: NEW - bug 1975: NPE on DDL generation when comment is null
http://trillian.sqlpower.ca/bugzilla/show_bug.cgi?id=1975
http://code.google.com/p/power-architect/source/detail?r=3233

Modified:
 /trunk/src/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java

=======================================
--- /trunk/src/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java Mon Dec 21 08:27:43 2009 +++ /trunk/src/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java Tue Jan 19 09:27:32 2010
@@ -495,15 +495,17 @@

        @Override
        public void addComment(SQLTable t, boolean includeColumns) {
-               print("\nALTER TABLE ");
-               print(toQualifiedName(t));
-               print(" COMMENT '");
-               print(t.getRemarks().replaceAll("'", "''"));
-               print("'");
-               endStatement(DDLStatement.StatementType.ALTER, t);
-               if (includeColumns) {
-                       addColumnComments(t);
-               }
+           if (t.getRemarks() != null && t.getRemarks().trim().length() > 0) {
+               print("\nALTER TABLE ");
+               print(toQualifiedName(t));
+               print(" COMMENT '");
+               print(t.getRemarks().replaceAll("'", "''"));
+               print("'");
+               endStatement(DDLStatement.StatementType.ALTER, t);
+           }
+        if (includeColumns) {
+            addColumnComments(t);
+        }
        }

     @Override

Reply via email to