rails-pg_trigger 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44aab12612f46126b08d12e199cb56b8011848c3f6d6fd1297d3dc82079640d0
-  data.tar.gz: 7cc00af7a6f44b0d3c773a70526a907656c7eeecbcd8e73857330011946a206b
+  metadata.gz: 2f40387dfea07ab95c4dca20f9b26c2af48fd1fda8dffcb360048fa409a08d32
+  data.tar.gz: 17b3356c9bc2ebb418921bab81e7d6722d03dc47021e4a47be6657f4014b804d
 SHA512:
-  metadata.gz: b8c0b565a02f88efbf883c1bf76fcd9e9e18c49ddcdb90b40399521635f193a2bcded0421b297e3f553a8fea863a87d142cda075469d025bbb50d19253bb45af
-  data.tar.gz: 53fc370375dd2cac4ccc0699a260e35829fdf5d353097001ab1675be0267d18826a0fb9c2745fe97a9edc228eccd7ca3905b473471f7172f11798a28b6881e90
+  metadata.gz: 842f7827eaa749632f4f6e58fc8345f6bf3e6f084d8ed2e197703a548c6e373a837a0b626e2e262eaf91c9bb4395dc7ea0eb73277ce7172124d883a05843fa86
+  data.tar.gz: db8e8a003a9e4236683568c13686f228c8acb56a05948d7e795c8bd5364ebdaec7e388a110b21f428f074aa53c1fc8cc4bbde973a00011e921966c4b605c1a56

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [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

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/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.3"
+  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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ccocchi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -104,7 +104,7 @@ metadata:
   homepage_uri: https://github.com/ccocchi/rails-pg_trigger
   source_code_uri: https://github.com/ccocchi/rails-pg_trigger
   changelog_uri: https://github.com/ccocchi/rails-pg_trigger/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Postgres triggers for Rails
 test_files: []