pgtrigger 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69d91b5eccbc5a5ff31f816b10487d23ad475ed0
-  data.tar.gz: d4d24a6f3cc99497eb1e9e8bef4a21f01a68e956
+  metadata.gz: 9a6a196d78d94e5029eff17448fa0c30378168af
+  data.tar.gz: cd8bff0580bc33893b9fc9fdee0990b4e0482b07
 SHA512:
-  metadata.gz: f2db1dfc61a3088e41f0d0eea0c0f53ba916900e0a4750b674c39ebad2dc007822837c6fb61c540e56718b3effd4feac23ec2ef8316659a3d2c75a345ff35641
-  data.tar.gz: 301c5228860337cffe2591725173eb58578671a332323d9e0f29c86eef71cc620ab3e06e454e92be376e37cb1f5c8f606917edde8c2d1285fc21d99a0f364392
+  metadata.gz: a707b1ffdd3383ad6d9fa3b780fdce7f05ddd3681bea2a3421163607aab91d2615db58ed62b330aef3c6a0cd37b049b149ac7048a4036a16a4d6d0a0aed4a84e
+  data.tar.gz: 04faca13c437e3ea95e010b67564cb951dc5e3073dcbd229bf8d780e9a9b43c203d2b6d314c09fd806be69abefca8743a3cd6495de256aeacfbe742fb95e4d61

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+/pgtrigger-*.gem

data/README.md

@@ -15,7 +15,7 @@ gem 'pgtrigger'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -28,9 +28,11 @@ Create a migration like this
 ```ruby
 class AddTriggerToSomeTable < ActiveRecord::Migration[5.1]
   def up
-    create_trigger(:table_name, :increase_order, before: [:insert]) do
+    create_trigger(:table_name, :increase_order, before: [:insert, :update], declare: {var_1: "text := 'test'", var_2: :integer}) do
         <<-TRIGGERSQL
-            NEW."order" = (
+            var_2 := -1
+
+            NEW."order" := (
               SELECT COALESCE(MAX("order"), 0) +1
               FROM table_name
             );
@@ -48,8 +50,9 @@ end
 
 The create_trigger method, the first and second parameters are about table and name of trigger respectively.
 The third params can be hashes ```before:``` or ```after:```, passing string or array to indicate what event this trigger it will be executed.
+The param ```declare:``` is used to declare variables
 
-Yet is necessary to specify the down method, otherwise the trigger cannot be removed when execute migration rollback.
+**NOTE:** Yet is necessary to specify the down method, otherwise the trigger cannot be removed when execute migration rollback.
 
 ## Development
 

data/lib/pgtrigger/active_record/migration.rb

@@ -1,16 +1,21 @@
 module ActiveRecord
   class Migration
-    def create_trigger(table_name, trigger_name, after: nil, before: nil)
+    def create_trigger(table_name, trigger_name, after: nil, before: nil, declare: nil)
       raise "Not defined after or before for create_trigger" unless after || before
       raise "Define only on after or before" if after && before
 
       trigger_name = Pgtrigger::Utils.build_trigger_name(table_name, trigger_name)
 
+      if declare
+        declare = "DECLARE \n\t\t#{declare.map{|var| var.to_a.join(" ")}.join(";\n\t\t")};"
+      end
+
       execute(<<-TRIGGERSQL
           CREATE OR REPLACE FUNCTION #{trigger_name}_func()
             RETURNS trigger
             LANGUAGE plpgsql
           AS $function$
+          #{declare}
           BEGIN
             #{yield}
           END;

data/lib/pgtrigger/active_record/schema_dumper.rb

@@ -23,12 +23,18 @@ module ActiveRecord
         table_name = trigger["event_object_table"]
         trigger_name = trigger["trigger_name"].gsub("_#{table_name}_trigger", '')
 
-        after_or_before = "#{trigger['action_timing'].downcase}: \"#{trigger['event_manipulation']}\""
+        event_manipulation = discovery_event(trigger['trigger_name']).to_json
+        event_manipulation = "#{trigger['action_timing'].downcase}: #{event_manipulation}"
+
+        procedure = discovery_trigger_method(table_name, trigger_name)
+
+        declare = parse_trigger_declarations(procedure["definition"])
+        declare = ", declare: #{declare}" if declare
 
         triggers << "\n"
-        triggers << "\tcreate_trigger \"#{table_name}\", \"#{trigger_name}\", #{after_or_before} do\n"
+        triggers << "\tcreate_trigger \"#{table_name}\", \"#{trigger_name}\", #{event_manipulation} #{declare} do\n"
         triggers << "<<-TRIGGERBODY\n"
-        triggers << parse_trigger_body(table_name, trigger_name)
+        triggers << parse_trigger_body(procedure["definition"])
         triggers << "\nTRIGGERBODY\n"
         triggers << "\tend # create_trigger"
         triggers << "\n"
@@ -39,19 +45,40 @@ module ActiveRecord
 
     def discovery_triggers
       sql = <<-DETECTTRIGGER
-        SELECT * FROM information_schema.triggers
+        SELECT DISTINCT trigger_name, event_object_table, action_timing
+        FROM information_schema.triggers
         WHERE trigger_schema = current_schema();
       DETECTTRIGGER
-      result = @connection.execute(sql)
+
+      @connection.execute(sql)
+    end
+
+    def discovery_event(trigger_name)
+      sql = <<-DETECTTRIGGER
+        SELECT DISTINCT event_manipulation
+        FROM information_schema.triggers
+        WHERE trigger_schema = current_schema()
+          AND trigger_name = '#{trigger_name}'
+      DETECTTRIGGER
+
+      @connection.execute(sql).pluck("event_manipulation")
     end
 
-    def parse_trigger_body(table_name, trigger_name)
-      procedure = discovery_trigger_method(table_name, trigger_name)
-      definition = procedure["definition"]
+    def parse_trigger_body(definition)
       procedure_body = definition[definition.index("BEGIN")+5..definition.size]
       procedure_body[0..procedure_body.rindex("END") -1].strip
     end
 
+    def parse_trigger_declarations(definition)
+      declare = definition[definition.index("DECLARE")+7..definition.size]
+      declare = declare[0, declare.index("BEGIN")].strip.split(";")
+      declare = declare.map{ |variable|
+        var = variable.strip
+        var = var.split(" ")
+        { var.shift => var.join(" ") }
+      }
+    end
+
     def discovery_trigger_method(table_name, trigger_name)
       sql = <<-DISCOVERYTRIGGERMETHOD
             SELECT

data/lib/pgtrigger/version.rb

@@ -1,3 +1,3 @@
 module Pgtrigger
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtrigger
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - André Alencar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,6 @@ files:
 - lib/pgtrigger/active_record/migration.rb
 - lib/pgtrigger/active_record/schema_dumper.rb
 - lib/pgtrigger/version.rb
-- pgtrigger-0.1.1.gem
 - pgtrigger.gemspec
 homepage: https://github.com/alencarandre/pgtrigger
 licenses: