fix sql server drop column with default value code

JumpMind · Aug 8, 2013 · e29c9c7 · e29c9c7
1 parent da01bd4
commit e29c9c7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlBuilder.java
@@ -573,18 +573,17 @@ protected void processChange(Database currentModel, Database desiredModel,
     }
 
     protected void dropDefaultConstraint(String tableName, String columnName, StringBuilder ddl) {         
-        println(              "DECLARE @sql NVARCHAR(2000)                                                                  ", ddl);
-        println(              "WHILE 1=1                                                                                    ", ddl);
         println(              "BEGIN                                                                                        ", ddl);
-        println(String.format("SELECT TOP 1 @sql = N'alter table ''%s'' drop constraint ['+dc.NAME+N']'                       ", tableName), ddl);
-        println(              "from sys.default_constraints dc                                                              ", ddl);
+        println(              "DECLARE @sql NVARCHAR(2000)                                                                  ", ddl);        
+        println(String.format("SELECT TOP 1 @sql = N'alter table \"%s\" drop constraint ['+dc.NAME+N']'                     ", tableName), ddl);
+        println(              "FROM sys.default_constraints dc                                                              ", ddl);
         println(              "JOIN sys.columns c                                                                           ", ddl);
         println(              "    ON c.default_object_id = dc.object_id                                                    ", ddl);
         println(              "WHERE                                                                                        ", ddl);
         println(String.format("    dc.parent_object_id = OBJECT_ID('%s')                                                    ", tableName), ddl);
         println(String.format("AND c.name = N'%s'                                                                           ", columnName), ddl);
-        println(              "IF @@ROWCOUNT = 0 BREAK                                                                      ", ddl);
-        println(              "EXEC (@sql)                                                                                  ", ddl);
+        println(              "IF @@ROWCOUNT > 0                                                                            ", ddl);
+        println(              "  EXEC (@sql)                                                                                ", ddl);
         println(              "END                                                                                          ", ddl);
         printEndOfStatement(ddl);        
     }