rails-pg_trigger 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4fadc7023d22fd1843ebab5974e7212fdc620de62059ae102657b6c24a1191
-  data.tar.gz: f8bfc0acf6c0647167ccbc3803dc6826fb1c96d56fdf7faf292dca6c08a8721b
+  metadata.gz: 2f40387dfea07ab95c4dca20f9b26c2af48fd1fda8dffcb360048fa409a08d32
+  data.tar.gz: 17b3356c9bc2ebb418921bab81e7d6722d03dc47021e4a47be6657f4014b804d
 SHA512:
-  metadata.gz: b1df9ba8c9d32fb33106e6939e183aa0917a150c22f3f77b39bda995ff1cdbee2ddd646a4cd6efbbb8a8a43c02a3b2375765f9d9ff96cb5ed04d26afb462ae1f
-  data.tar.gz: bad3ffd878a86fe85577da0ceec414ce17bab77cd5834abc5628536966c3b66bcc0643669c75703c2c64253703c150f6a67709b7b7887942adf6ed9a91fc3779
+  metadata.gz: 842f7827eaa749632f4f6e58fc8345f6bf3e6f084d8ed2e197703a548c6e373a837a0b626e2e262eaf91c9bb4395dc7ea0eb73277ce7172124d883a05843fa86
+  data.tar.gz: db8e8a003a9e4236683568c13686f228c8acb56a05948d7e795c8bd5364ebdaec7e388a110b21f428f074aa53c1fc8cc4bbde973a00011e921966c4b605c1a56

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-## [0.1.2]
+## [Unreleased]
+
+## [0.1.4] - 2024-03-25
+
+- Implement `nowrap`
+- Allow parenthesis-wrapped condition
+- Force negative condition to be parenthesis-wrapped
+
+## [0.1.3] - 2024-02-11
+
+- Correclty rollback updated triggers
+- Fix noop in non dev/test environments
+
+## [0.1.2] - 2024-01-22
 
 - `where_clause` is now also used to compare triggers
 - Add trigger's columns in generated SQL and name

data/lib/pg_trigger/generator.rb

@@ -96,8 +96,8 @@ module PgTrigger
       def drop_trigger_command(t)
         make_command("drop_trigger", t) do |s|
           s += t.drop_trigger_sql
-          s.newline
           if t.create_function?
+            s.newline
             s += t.drop_function_sql
           end
         end

data/lib/pg_trigger/noop.rb

@@ -3,8 +3,23 @@ module PgTrigger::Noop
     other.extend ClassMethods
   end
 
+  class Proxy
+    def self.chain(*methods)
+      methods.each do |m|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{m}(*)
+            self
+          end
+        RUBY
+      end
+    end
+
+    chain :on, :of, :after, :before, :named, :where, :nowrap
+  end
+
   module ClassMethods
     def trigger
+      Proxy.new
     end
   end
 end

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?(e)
+            plan.update_trigger(e, t) unless t.same?(e)
           else
             plan.add_trigger(t)
           end
@@ -81,12 +81,12 @@ module PgTrigger
       @actions[:to_remove] << t
     end
 
-    def update_trigger(t)
+    def update_trigger(old_t, new_t)
       set_type :update
-      set_table t.table
+      set_table new_t.table
 
-      @actions[:to_remove] << t
-      @actions[:to_add] << t
+      @actions[:to_remove] << old_t
+      @actions[:to_add] << new_t
     end
 
     private

data/lib/pg_trigger/trigger.rb

@@ -26,7 +26,7 @@ module PgTrigger
         "(?<timing>AFTER|BEFORE)",
         "(?<events>(?:INSERT|UPDATE|DELETE)(?: OR (?:INSERT|UPDATE|DELETE))?)",
         "(?:OF(?<columns>(?:\\s[a-z0-9_]+,?)+)\\s)?ON (?:[\\w\"]+\\.)?(?<table>\\w+)",
-        "FOR EACH ROW(?: WHEN \\((?<where>[^\\)]+)\\))?",
+        "FOR EACH ROW(?: WHEN \\((?<where>\\(?[^\\)]+\\)?)\\))?",
         "EXECUTE FUNCTION (?:\\w+\\.)?(?<fn>\\w+)",
       ].join("\\s")
       .yield_self { |str| Regexp.new(str) }
@@ -51,7 +51,10 @@ module PgTrigger
           trigger.where(where)
         end
 
-        trigger.nowrap if match[:fn] != match[:name]
+        if match[:fn] != match[:name]
+          trigger.nowrap { "#{match[:fn]}()" }
+        end
+
         trigger
       end
     end
@@ -88,6 +91,9 @@ module PgTrigger
     end
 
     def where(condition)
+      if condition.start_with?("NOT", "not")
+        raise AmbiguousConditionError, "when condition starting with a NOT should be enclosed in parenthesis"
+      end
       @where = condition
     end
 
@@ -125,6 +131,10 @@ module PgTrigger
       !@options[:nowrap]
     end
 
+    def nowrap?
+      @options[:nowrap]
+    end
+
     def create_function_sql
       str = IndentedString.new(size: 4)
       str += @content
@@ -141,6 +151,12 @@ module PgTrigger
     end
 
     def create_trigger_sql
+      action = if create_function?
+        "#{name}();"
+      else
+        @content
+      end
+
       sql = "CREATE TRIGGER #{name}\n"
       sql << @timing.to_s.upcase
       sql << " #{events.map(&:upcase).join(" OR ")} "
@@ -148,7 +164,7 @@ module PgTrigger
       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 << "EXECUTE FUNCTION #{action}"
 
       sql
     end

data/lib/pg_trigger/version.rb

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

data/lib/pg_trigger.rb

@@ -5,6 +5,7 @@ require_relative "pg_trigger/railtie"
 
 module PgTrigger
   class InvalidTriggerDefinition < StandardError; end
+  class AmbiguousConditionError < StandardError; end
 
   class << self
     attr_accessor :structure_file_path, :schema, :migrations_path, :raise_on_invalid_definition

metadata

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