added support for CREATE TRIGGER ... UPDATE OF column

ellmkay · Sep 20, 2012 · 532b079 · 532b079
1 parent f855af5
commit 532b079
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ website at http://apgdiff.startnet.biz/
 
 #### New Features
 * Added support for ALTER SEQUENCE OWNED BY (patch by Mikhail Petrov).
+* Added support for CREATE TRIGGER ... UPDATE OF column.
 
 #### Fixes
 * Fixed issue with comments not being added on newly created columns.

diff --git a/src/main/java/cz/startnet/utils/pgdiff/parsers/CreateTriggerParser.java b/src/main/java/cz/startnet/utils/pgdiff/parsers/CreateTriggerParser.java
@@ -57,6 +57,12 @@ public static void parse(final PgDatabase database,
                 trigger.setOnInsert(true);
             } else if (parser.expectOptional("UPDATE")) {
                 trigger.setOnUpdate(true);
+
+                if (parser.expectOptional("OF")) {
+                    do {
+                        trigger.addUpdateColumn(parser.parseIdentifier());
+                    } while (parser.expectOptional(","));
+                }
             } else if (parser.expectOptional("DELETE")) {
                 trigger.setOnDelete(true);
             } else if (parser.expectOptional("TRUNCATE")) {

diff --git a/src/main/java/cz/startnet/utils/pgdiff/schema/PgTrigger.java b/src/main/java/cz/startnet/utils/pgdiff/schema/PgTrigger.java
@@ -6,6 +6,9 @@
 package cz.startnet.utils.pgdiff.schema;
 
 import cz.startnet.utils.pgdiff.PgDiffUtils;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Stores trigger information.
@@ -52,6 +55,11 @@ public class PgTrigger {
      * Whether the trigger should be fired on TRUNCATE.
      */
     private boolean onTruncate;
+    /**
+     * Optional list of columns for UPDATE event.
+     */
+    @SuppressWarnings("CollectionWithoutInitialCapacity")
+    private final List<String> updateColumns = new ArrayList<String>();
     /**
      * WHEN condition.
      */
@@ -124,6 +132,23 @@ public String getCreationSQL() {
             }
 
             sbSQL.append(" UPDATE");
+
+            if (!updateColumns.isEmpty()) {
+                sbSQL.append(" OF");
+
+                boolean first = true;
+
+                for (final String columnName : updateColumns) {
+                    if (first) {
+                        first = false;
+                    } else {
+                        sbSQL.append(',');
+                    }
+
+                    sbSQL.append(' ');
+                    sbSQL.append(columnName);
+                }
+            }
         }
 
         if (isOnDelete()) {
@@ -324,6 +349,24 @@ public String getTableName() {
         return tableName;
     }
 
+    /**
+     * Getter for {@link #updateColumns}.
+     *
+     * @return {@link #updateColumns}
+     */
+    public List<String> getUpdateColumns() {
+        return Collections.unmodifiableList(updateColumns);
+    }
+
+    /**
+     * Adds column name to the list of update columns.
+     *
+     * @param columnName column name
+     */
+    public void addUpdateColumn(final String columnName) {
+        updateColumns.add(columnName);
+    }
+
     /**
      * Getter for {@link #when}.
      *
@@ -359,6 +402,17 @@ public boolean equals(final Object object) {
                     && (onUpdate == trigger.isOnUpdate())
                     && (onTruncate == trigger.isOnTruncate())
                     && tableName.equals(trigger.getTableName());
+
+            if (equals) {
+                final List<String> sorted1 =
+                        new ArrayList<String>(updateColumns);
+                final List<String> sorted2 =
+                        new ArrayList<String>(trigger.getUpdateColumns());
+                Collections.sort(sorted1);
+                Collections.sort(sorted2);
+
+                equals = sorted1.equals(sorted2);
+            }
         }
 
         return equals;

diff --git a/src/test/resources/cz/startnet/utils/pgdiff/drop_trigger_original.sql b/src/test/resources/cz/startnet/utils/pgdiff/drop_trigger_original.sql
@@ -57,7 +57,7 @@ ALTER TABLE public.test_table OWNER TO fordfrog;
 --
 
 CREATE TRIGGER test_table_trigger
-    BEFORE INSERT OR UPDATE ON test_table
+    BEFORE INSERT OR UPDATE OF id ON test_table
     FOR EACH ROW
     EXECUTE PROCEDURE test_table_trigger();
 

diff --git a/src/test/resources/cz/startnet/utils/pgdiff/modify_trigger_diff.sql b/src/test/resources/cz/startnet/utils/pgdiff/modify_trigger_diff.sql
@@ -2,6 +2,6 @@
 DROP TRIGGER test_table_trigger ON test_table;
 
 CREATE TRIGGER test_table_trigger
-	BEFORE INSERT ON test_table
+	BEFORE INSERT OR UPDATE OF id ON test_table
 	FOR EACH STATEMENT
 	EXECUTE PROCEDURE test_table_trigger();
diff --git a/src/test/resources/cz/startnet/utils/pgdiff/modify_trigger_new.sql b/src/test/resources/cz/startnet/utils/pgdiff/modify_trigger_new.sql
@@ -57,7 +57,7 @@ ALTER TABLE public.test_table OWNER TO fordfrog;
 --
 
 CREATE TRIGGER test_table_trigger
-    BEFORE INSERT ON test_table
+    BEFORE INSERT OR UPDATE OF id ON test_table
     FOR EACH STATEMENT
     EXECUTE PROCEDURE test_table_trigger();