sequel_postgresql_triggers 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c840eb70121de040c927fd25cf0611cf8c475bb
-  data.tar.gz: 39edf714024b57ace34c3aa0be20d10947a27133
+  metadata.gz: b5de693db244fa94aba445980a43f06ecdb91cb8
+  data.tar.gz: a0fb193ac3d11010daaace8c590eb5ab552bcdc1
 SHA512:
-  metadata.gz: 5533d19fb6cdf0dbb96c4a09a25dddbb814a189026c8c0d95e674f6a2109180d8b69023399399666e745e47dae48633592bfb757c708eb7ed34868f00169f7e1
-  data.tar.gz: 211a34c135965d5585662b1e1fb8f201413443704404742453b2e27ff6ad186c92ce9a2b2525614a991f3da4f9daab866a41bac78b02653f51852986dcae82f4
+  metadata.gz: 88098e2ec7f2e97e8ed193689fe12b7f7f631e28821869ef25955d19723df943742c8b2c0d594d0044cf068b6532e28682a09fa807412040c652b1974a7685e0
+  data.tar.gz: d7fdef313991baed60bf2c5efe719bde984a8484f007b88ad0b08ec3382b2a1ee0b207412413994361faef917d8079d64565177062c94dbf4507fcae8d13e88c

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2011 Jeremy Evans
+Copyright (c) 2008-2014 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/lib/sequel_postgresql_triggers.rb

@@ -27,15 +27,25 @@ module Sequel
       def pgt_counter_cache(main_table, main_table_id_column, counter_column, counted_table, counted_table_id_column, opts={})
         trigger_name = opts[:trigger_name] || "pgt_cc_#{main_table}__#{main_table_id_column}__#{counter_column}__#{counted_table_id_column}"
         function_name = opts[:function_name] || "pgt_cc_#{main_table}__#{main_table_id_column}__#{counter_column}__#{counted_table}__#{counted_table_id_column}"
-        pgt_trigger(counted_table, trigger_name, function_name, [:insert, :delete], <<-SQL)
+
+        table = quote_schema_table(main_table)
+        id_column = quote_identifier(counted_table_id_column)
+        main_column = quote_identifier(main_table_id_column)
+        count_column = quote_identifier(counter_column)
+
+        pgt_trigger(counted_table, trigger_name, function_name, [:insert, :update, :delete], <<-SQL)
         BEGIN
+          IF (TG_OP = 'INSERT' OR (TG_OP = 'UPDATE' AND NEW.#{id_column} <> OLD.#{id_column})) THEN
+            UPDATE #{table} SET #{count_column} = #{count_column} + 1 WHERE #{main_column} = NEW.#{id_column};
+          END IF;
+          IF (TG_OP = 'DELETE' OR (TG_OP = 'UPDATE' AND NEW.#{id_column} <> OLD.#{id_column})) THEN
+            UPDATE #{table} SET #{count_column} = #{count_column} - 1 WHERE #{main_column} = OLD.#{id_column};
+          END IF;
+
           IF (TG_OP = 'DELETE') THEN
-            UPDATE #{quote_schema_table(main_table)} SET #{quote_identifier(counter_column)} = #{quote_identifier(counter_column)} - 1 WHERE #{quote_identifier(main_table_id_column)} = OLD.#{counted_table_id_column};
             RETURN OLD;
-          ELSIF (TG_OP = 'INSERT') THEN
-            UPDATE #{quote_schema_table(main_table)} SET #{quote_identifier(counter_column)} = #{quote_identifier(counter_column)} + 1 WHERE #{quote_identifier(main_table_id_column)} = NEW.#{quote_identifier(counted_table_id_column)};
-            RETURN NEW;
           END IF;
+          RETURN NEW;
         END;
         SQL
       end
@@ -49,12 +59,13 @@ module Sequel
       def pgt_created_at(table, column, opts={})
         trigger_name = opts[:trigger_name] || "pgt_ca_#{column}"
         function_name = opts[:function_name] || "pgt_ca_#{table}__#{column}"
+        col = quote_identifier(column)
         pgt_trigger(table, trigger_name, function_name, [:insert, :update], <<-SQL)
         BEGIN
           IF (TG_OP = 'UPDATE') THEN
-            NEW.#{quote_identifier(column)} := OLD.#{quote_identifier(column)};
+            NEW.#{col} := OLD.#{col};
           ELSIF (TG_OP = 'INSERT') THEN
-            NEW.#{quote_identifier(column)} := CURRENT_TIMESTAMP;
+            NEW.#{col} := CURRENT_TIMESTAMP;
           END IF;
           RETURN NEW;
         END;
@@ -95,18 +106,29 @@ module Sequel
       def pgt_sum_cache(main_table, main_table_id_column, sum_column, summed_table, summed_table_id_column, summed_column, opts={})
         trigger_name = opts[:trigger_name] || "pgt_sc_#{main_table}__#{main_table_id_column}__#{sum_column}__#{summed_table_id_column}"
         function_name = opts[:function_name] || "pgt_sc_#{main_table}__#{main_table_id_column}__#{sum_column}__#{summed_table}__#{summed_table_id_column}__#{summed_column}"
+
+        table = quote_schema_table(main_table)
+        id_column = quote_identifier(summed_table_id_column)
+        summed_column = quote_identifier(summed_column)
+        main_column = quote_identifier(main_table_id_column)
+        sum_column = quote_identifier(sum_column)
+
         pgt_trigger(summed_table, trigger_name, function_name, [:insert, :delete, :update], <<-SQL)
         BEGIN
+          IF (TG_OP = 'UPDATE' AND NEW.#{id_column} = OLD.#{id_column}) THEN
+            UPDATE #{table} SET #{sum_column} = #{sum_column} + NEW.#{summed_column} - OLD.#{summed_column} WHERE #{main_column} = NEW.#{id_column};
+          ELSE
+            IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+              UPDATE #{table} SET #{sum_column} = #{sum_column} + NEW.#{summed_column} WHERE #{main_column} = NEW.#{id_column};
+            END IF;
+            IF (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN
+              UPDATE #{table} SET #{sum_column} = #{sum_column} - OLD.#{summed_column} WHERE #{main_column} = OLD.#{id_column};
+            END IF;
+          END IF;
           IF (TG_OP = 'DELETE') THEN
-            UPDATE #{quote_schema_table(main_table)} SET #{quote_identifier(sum_column)} = #{quote_identifier(sum_column)} - OLD.#{quote_identifier(summed_column)} WHERE #{quote_identifier(main_table_id_column)} = OLD.#{summed_table_id_column};
             RETURN OLD;
-          ELSIF (TG_OP = 'UPDATE') THEN
-            UPDATE #{quote_schema_table(main_table)} SET #{quote_identifier(sum_column)} = #{quote_identifier(sum_column)} + NEW.#{quote_identifier(summed_column)} - OLD.#{quote_identifier(summed_column)} WHERE #{quote_identifier(main_table_id_column)} = NEW.#{quote_identifier(summed_table_id_column)};
-            RETURN NEW;
-          ELSIF (TG_OP = 'INSERT') THEN
-            UPDATE #{quote_schema_table(main_table)} SET #{quote_identifier(sum_column)} = #{quote_identifier(sum_column)} + NEW.#{quote_identifier(summed_column)} WHERE #{quote_identifier(main_table_id_column)} = NEW.#{quote_identifier(summed_table_id_column)};
-            RETURN NEW;
           END IF;
+          RETURN NEW;
         END;
         SQL
       end
@@ -122,17 +144,30 @@ module Sequel
       def pgt_touch(main_table, touch_table, column, expr, opts={})
         trigger_name = opts[:trigger_name] || "pgt_t_#{main_table}__#{touch_table}"
         function_name = opts[:function_name] || "pgt_t_#{main_table}__#{touch_table}"
-        cond = proc{|source| expr.map{|k,v| "#{quote_identifier(k)} = #{source}.#{quote_identifier(v)}"}.join(" AND ")}
+        cond = lambda{|source| expr.map{|k,v| "#{quote_identifier(k)} = #{source}.#{quote_identifier(v)}"}.join(" AND ")}
+        same_id = expr.map{|k,v| "NEW.#{quote_identifier(v)} = OLD.#{quote_identifier(v)}"}.join(" AND ")
+
+        table = quote_schema_table(touch_table)
+        col = quote_identifier(column)
+        update = lambda{|source| " UPDATE #{table} SET #{col} = CURRENT_TIMESTAMP WHERE #{cond[source]} AND ((#{col} <> CURRENT_TIMESTAMP) OR (#{col} IS NULL));"}
+
         sql = <<-SQL
           BEGIN
-            IF (TG_OP = 'INSERT') THEN
-              UPDATE #{quote_schema_table(touch_table)} SET #{quote_identifier(column)} = CURRENT_TIMESTAMP WHERE #{cond['NEW']} AND ((#{quote_identifier(column)} <> CURRENT_TIMESTAMP) OR (#{quote_identifier(column)} IS NULL));
-            ELSIF (TG_OP = 'UPDATE') THEN
-              UPDATE #{quote_schema_table(touch_table)} SET #{quote_identifier(column)} = CURRENT_TIMESTAMP WHERE #{cond['NEW']} AND ((#{quote_identifier(column)} <> CURRENT_TIMESTAMP) OR (#{quote_identifier(column)} IS NULL));
-            ELSIF (TG_OP = 'DELETE') THEN
-              UPDATE #{quote_schema_table(touch_table)} SET #{quote_identifier(column)} = CURRENT_TIMESTAMP WHERE #{cond['OLD']} AND ((#{quote_identifier(column)} <> CURRENT_TIMESTAMP) OR (#{quote_identifier(column)} IS NULL));
+            IF (TG_OP = 'UPDATE' AND (#{same_id})) THEN
+              #{update['NEW']}
+            ELSE
+              IF (TG_OP = 'INSERT' OR TG_OP = 'UPDATE') THEN
+                #{update['NEW']}
+              END IF;
+              IF (TG_OP = 'DELETE' OR TG_OP = 'UPDATE') THEN
+                #{update['OLD']}
+              END IF;
             END IF;
-            RETURN NULL;
+
+            IF (TG_OP = 'DELETE') THEN
+              RETURN OLD;
+            END IF;
+            RETURN NEW;
           END;
         SQL
         pgt_trigger(main_table, trigger_name, function_name, [:insert, :delete, :update], sql, :after=>true)

data/spec/sequel_postgresql_triggers_spec.rb

@@ -40,6 +40,9 @@ describe "PostgreSQL Triggers" do
       DB[:entries] << {:id=>3, :account_id=>2}
       DB[:accounts].filter(:id=>1).get(:num_entries).should == 2
       DB[:accounts].filter(:id=>2).get(:num_entries).should == 1
+      DB[:entries].where(:id=>2).update(:account_id=>2)
+      DB[:accounts].filter(:id=>1).get(:num_entries).should == 1
+      DB[:accounts].filter(:id=>2).get(:num_entries).should == 2
       DB[:entries].filter(:id=>2).delete
       DB[:accounts].filter(:id=>1).get(:num_entries).should == 1
       DB[:accounts].filter(:id=>2).get(:num_entries).should == 1
@@ -134,6 +137,9 @@ describe "PostgreSQL Triggers" do
       DB[:entries].exclude(:id=>2).update(:amount=>Sequel.*(:amount, 2))
       DB[:accounts].filter(:id=>1).get(:balance).should == 400
       DB[:accounts].filter(:id=>2).get(:balance).should == 1000
+      DB[:entries].where(:id=>2).update(:account_id=>2)
+      DB[:accounts].filter(:id=>1).get(:balance).should == 200
+      DB[:accounts].filter(:id=>2).get(:balance).should == 1200
       DB[:entries].filter(:id=>2).delete
       DB[:accounts].filter(:id=>1).get(:balance).should == 200
       DB[:accounts].filter(:id=>2).get(:balance).should == 1000
@@ -177,15 +183,24 @@ describe "PostgreSQL Triggers" do
 
     specify "Should update the timestamp column of the related table when adding, updating or removing records" do
       DB.pgt_touch(:children, :parents, :changed_on, :id1=>:parent_id1)
-      DB[:parents] << {:id1=>1, :changed_on=>Date.today - 30}
+      d = Date.today
+      d30 = Date.today - 30
+      DB[:parents] << {:id1=>1, :changed_on=>d30}
+      DB[:parents] << {:id1=>2, :changed_on=>d30}
       DB[:children] << {:id=>1, :parent_id1=>1}
-      DB[:parents].get(:changed_on).strftime('%F').should == Date.today.strftime('%F')
-      DB[:parents].update(:changed_on=>Date.today - 30)
+      DB[:parents].order(:id1).select_map(:changed_on).map{|t| t.strftime('%F')}.should == [d.strftime('%F'), d30.strftime('%F')]
+
+      DB[:parents].update(:changed_on=>d30)
       DB[:children].update(:id=>2)
-      DB[:parents].get(:changed_on).strftime('%F').should == Date.today.strftime('%F')
-      DB[:parents].update(:changed_on=>Date.today - 30)
+      DB[:parents].order(:id1).select_map(:changed_on).map{|t| t.strftime('%F')}.should == [d.strftime('%F'), d30.strftime('%F')]
+
+      DB[:parents].update(:changed_on=>d30)
+      DB[:children].update(:parent_id1=>2)
+      DB[:parents].order(:id1).select_map(:changed_on).map{|t| t.strftime('%F')}.should == [d.strftime('%F'), d.strftime('%F')]
+
+      DB[:parents].update(:changed_on=>d30)
       DB[:children].delete
-      DB[:parents].get(:changed_on).strftime('%F').should == Date.today.strftime('%F')
+      DB[:parents].order(:id1).select_map(:changed_on).map{|t| t.strftime('%F')}.should == [d30.strftime('%F'), d.strftime('%F')]
     end
 
     specify "Should update the timestamp column of the related table when there is a composite foreign key" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_postgresql_triggers
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Database enforced timestamps, immutable columns, and counter/sum caches