run DROP COLUMN for ONLY table

pgcodekeeper · Apr 22, 2019 · 212e85e · 212e85e
1 parent ba86661
commit 212e85e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apgdiff/src/main/java/cz/startnet/utils/pgdiff/schema/AbstractColumn.java b/apgdiff/src/main/java/cz/startnet/utils/pgdiff/schema/AbstractColumn.java
@@ -86,8 +86,8 @@ public void setLocation(PgObjLocation location) {
         getMeta().setLocation(location);
     }
 
-    protected String getAlterTable() {
-        return ((AbstractTable) getParent()).getAlterTable(false, false);
+    protected String getAlterTable(boolean nextLine, boolean only) {
+        return ((AbstractTable) getParent()).getAlterTable(nextLine, only);
     }
 
     @Override

diff --git a/apgdiff/src/main/java/cz/startnet/utils/pgdiff/schema/MsColumn.java b/apgdiff/src/main/java/cz/startnet/utils/pgdiff/schema/MsColumn.java
@@ -76,7 +76,7 @@ public String getFullDefinition() {
     public String getCreationSQL() {
         StringBuilder sb = new StringBuilder();
 
-        sb.append(getAlterTable());
+        sb.append(getAlterTable(false, false));
         sb.append("\n\tADD ").append(MsDiffUtils.quoteName(name)).append(' ');
         if (getExpression() != null) {
             sb.append("AS ").append(getExpression());
@@ -192,13 +192,13 @@ private void compareDefaults(String oldDefaultName, String oldDefault,
         if (!Objects.equals(oldDefault, newDefault)
                 || !Objects.equals(oldDefaultName, newDefaultName)) {
             if (oldDefault != null) {
-                sb.append(((AbstractTable)this.getParent()).getAlterTable(true, false));
+                sb.append(getAlterTable(true, false));
                 sb.append(" DROP CONSTRAINT ").append(MsDiffUtils.quoteName(oldDefaultName));
                 sb.append(GO);
             }
 
             if (newDefault != null) {
-                sb.append(((AbstractTable)this.getParent()).getAlterTable(true, false));
+                sb.append(getAlterTable(true, false));
                 sb.append(" ADD CONSTRAINT ").append(MsDiffUtils.quoteName(newDefaultName));
                 sb.append(" DEFAULT ").append(newDefault);
                 sb.append(" FOR ").append(MsDiffUtils.quoteName(name));
@@ -259,7 +259,7 @@ private String getAlterColumn(boolean newLine, boolean only, String column) {
 
     @Override
     public String getDropSQL() {
-        return getAlterTable() + "\n\tDROP COLUMN " + MsDiffUtils.getQuotedName(getName()) + GO;
+        return getAlterTable(false, false) + "\n\tDROP COLUMN " + MsDiffUtils.getQuotedName(getName()) + GO;
     }
 
     @Override

diff --git a/apgdiff/src/main/java/cz/startnet/utils/pgdiff/schema/PgColumn.java b/apgdiff/src/main/java/cz/startnet/utils/pgdiff/schema/PgColumn.java
@@ -70,7 +70,7 @@ public String getCreationSQL() {
         StringBuilder sb = new StringBuilder();
 
         if (getType() != null) {
-            sb.append(getAlterTable());
+            sb.append(getAlterTable(false, false));
             sb.append("\n\tADD COLUMN ")
             .append(PgDiffUtils.getQuotedName(name))
             .append(' ')
@@ -108,7 +108,7 @@ private String getAlterColumn(boolean newLine, boolean only, String column) {
     @Override
     public String getDropSQL() {
         if (getType() != null) {
-            return getAlterTable() + "\n\tDROP COLUMN "
+            return getAlterTable(false, true) + "\n\tDROP COLUMN "
                     + PgDiffUtils.getQuotedName(getName()) + ';';
         }