rails-pg_trigger 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20870cd133b627bbdab5bfe175faf4ea8a4e203c7258c4e6926a3ecd0b5cc07
-  data.tar.gz: 27955f294a387c3bc40b88d68f4f363c240c819cb7a9f27c972fade8c2db89b4
+  metadata.gz: dd4fadc7023d22fd1843ebab5974e7212fdc620de62059ae102657b6c24a1191
+  data.tar.gz: f8bfc0acf6c0647167ccbc3803dc6826fb1c96d56fdf7faf292dca6c08a8721b
 SHA512:
-  metadata.gz: 37ea780b68669610fb44af40a99e71cfef021471b9d663d3d033833f699e5de4aa299036da50eed1894df4aff175a00ba0316095242915b471b333c76cd0de8a
-  data.tar.gz: a07f6751a7c43d8d31f44697b0918efed7013f2609e10dc2fc2521dc2b6f3f794640a6a707ceec1cbbbc508487af04b22f2205a3f1af56bd5480ed36fbfdbba7
+  metadata.gz: b1df9ba8c9d32fb33106e6939e183aa0917a150c22f3f77b39bda995ff1cdbee2ddd646a4cd6efbbb8a8a43c02a3b2375765f9d9ff96cb5ed04d26afb462ae1f
+  data.tar.gz: bad3ffd878a86fe85577da0ceec414ce17bab77cd5834abc5628536966c3b66bcc0643669c75703c2c64253703c150f6a67709b7b7887942adf6ed9a91fc3779

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.1.2]
+
+- `where_clause` is now also used to compare triggers
+- Add trigger's columns in generated SQL and name
+- Correctly sequence creations and deletions in migration
+- Ignore case when comparing where clauses
+
 ## [0.1.1]
 
 - Relax pg version dependency

data/lib/pg_trigger/generator.rb

@@ -43,9 +43,9 @@ module PgTrigger
       def generate_output
         @output = ""
         header
-        up(:up)
+        add_direction(:up)
         @output << "\n"
-        up(:down)
+        add_direction(:down)
         footer
       end
 
@@ -58,34 +58,21 @@ module PgTrigger
         @output << "class #{migration_name} < ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]\n"
       end
 
-      def up(dir)
+      def add_direction(dir)
         res = IndentedString.new(size: 2, initial_indent: true)
         res << "def #{dir}\n"
         res.indent!
 
-        create = ->(t) do
-          add_command("create_trigger", t) do |s|
-            if t.create_function?
-              s += t.create_function_sql
-              s.newline
-            end
-            s += t.create_trigger_sql
-          end
-        end
+        blocks = []
 
-        drop = ->(t) do
-          add_command("drop_trigger", t) do |s|
-            s += t.drop_trigger_sql
-            s.newline
-            if t.create_function?
-              s += t.drop_function_sql
-            end
-          end
+        if dir == :up
+          blocks.concat @plan.removed_triggers.map { |t| drop_trigger_command(t) }
+          blocks.concat @plan.new_triggers.map { |t| create_trigger_command(t) }
+        else
+          blocks.concat @plan.new_triggers.map { |t| drop_trigger_command(t) }
+          blocks.concat @plan.removed_triggers.map { |t| create_trigger_command(t) }
         end
 
-        blocks = @plan.new_triggers.map { |t| (dir == :up ? create : drop).call(t) }
-        blocks.concat @plan.removed_triggers.map { |t| (dir == :up ? drop : create).call(t) }
-
         res += blocks.join("\n")
         res.outdent!
         res << "end\n"
@@ -96,7 +83,27 @@ module PgTrigger
         @output << "end\n"
       end
 
-      def add_command(cmd, t)
+      def create_trigger_command(t)
+        make_command("create_trigger", t) do |s|
+          if t.create_function?
+            s += t.create_function_sql
+            s.newline
+          end
+          s += t.create_trigger_sql
+        end
+      end
+
+      def drop_trigger_command(t)
+        make_command("drop_trigger", t) do |s|
+          s += t.drop_trigger_sql
+          s.newline
+          if t.create_function?
+            s += t.drop_function_sql
+          end
+        end
+      end
+
+      def make_command(cmd, t)
         res = IndentedString.new(size: 0)
         res << %{#{cmd} "#{t.name}", <<~SQL\n}
         res.indent!

data/lib/pg_trigger/plan.rb

@@ -20,7 +20,7 @@ module PgTrigger
         @expected.each do |t|
           e = @existing.find { |_t| _t.name == t.name }
           if e
-            plan.update_trigger(t) unless t.same_content_as?(e)
+            plan.update_trigger(t) unless t.same?(e)
           else
             plan.add_trigger(t)
           end

data/lib/pg_trigger/trigger.rb

@@ -108,8 +108,9 @@ module PgTrigger
     def where_clause = @where
 
     # Compare content without taking indentation into account
-    def same_content_as?(other)
-      content.gsub(/\s+/, " ") == other.content.gsub(/\s+/, " ")
+    def same?(other)
+      where_clause&.downcase == other&.where_clause&.downcase &&
+        content.gsub(/\s+/, " ") == other.content.gsub(/\s+/, " ")
     end
 
     FN_CONTENT_REGEX = /BEGIN\s+(?<content>.+;)\n\s+RETURN NULL;/m
@@ -140,14 +141,16 @@ module PgTrigger
     end
 
     def create_trigger_sql
-      whr = @where.nil? ? "" : "\nWHEN (#@where)"
+      sql = "CREATE TRIGGER #{name}\n"
+      sql << @timing.to_s.upcase
+      sql << " #{events.map(&:upcase).join(" OR ")} "
+      sql << "OF #{columns.join(", ")} " if columns.any?
+      sql << "ON #{adapter.quote_table_name(@table)}\n"
+      sql << "FOR EACH ROW\n"
+      sql << "WHEN (#{@where})\n" unless @where.nil?
+      sql << "EXECUTE FUNCTION #{name}();"
 
-      <<~SQL
-        CREATE TRIGGER #{name}
-        #{@timing.upcase} #{events.map(&:upcase).join(" OR ")} ON #{adapter.quote_table_name(@table)}
-        FOR EACH ROW#{whr}
-        EXECUTE FUNCTION #{name}();
-      SQL
+      sql
     end
 
     def drop_function_sql
@@ -181,10 +184,18 @@ module PgTrigger
     end
 
     def inferred_name
-      [@table,
-      @timing,
-      @events.join("_or_"),
-      ].join("_").downcase.slice(0, 60) << "_tr"
+      base = [
+        @table,
+        @timing,
+        @events.join("_or_"),
+      ].join("_").downcase
+
+      if columns.any?
+        addendum = "_of_#{columns.join("_")}"
+        base << addendum if base.length + addendum.length <= 60
+      end
+
+      base.slice(0, 60) << "_tr"
     end
   end
 end

data/lib/pg_trigger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgTrigger
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg_trigger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ccocchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord