hairtrigger 0.2.14 → 0.2.15

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 626460677ceaa19be59baad0532d142bb45ba072
+  data.tar.gz: d2beebf4d2531400d04fa6ed545bebb2f849598a
+SHA512:
+  metadata.gz: c3b9cfbee129c14b01d6cfa4d00b3e9ac8ea9a2fe9f20dcc1199c38e7ef8b7f92cbe2e0dd9148c0975f273b8870c80c25de28181754e888118cfd593a0617d86
+  data.tar.gz: 9213b2f59bae5879c013db5194105cbffd93e2cebcdb77f0089a2cda69a09d965da320d08f3457dc1debae8107ab958e9928726d3345f3f22d1c4f355102cd86

data/lib/hair_trigger/builder.rb

@@ -403,7 +403,7 @@ module HairTrigger
         when :sqlite, :mysql
           "DROP TRIGGER IF EXISTS #{prepared_name};\n"
         when :postgresql, :postgis
-          "DROP TRIGGER IF EXISTS #{prepared_name} ON #{options[:table]};\nDROP FUNCTION IF EXISTS #{prepared_name}();\n"
+          "DROP TRIGGER IF EXISTS #{prepared_name} ON #{adapter.quote_table_name(options[:table])};\nDROP FUNCTION IF EXISTS #{adapter.quote_table_name(prepared_name)}();\n"
         else
           raise GenerationError, "don't know how to drop #{adapter_name} triggers yet"
       end
@@ -434,7 +434,7 @@ END;
       else
         security = options[:security] if options[:security] && options[:security] != :invoker
         sql << <<-SQL
-CREATE FUNCTION #{prepared_name}()
+CREATE FUNCTION #{adapter.quote_table_name(prepared_name)}()
 RETURNS TRIGGER AS $$#{declarations}
 BEGIN
         SQL
@@ -460,11 +460,11 @@ END;
 $$ LANGUAGE plpgsql#{security ? " SECURITY #{security.to_s.upcase}" : ""};
         SQL
 
-        trigger_action = "#{prepared_name}()"
+        trigger_action = "#{adapter.quote_table_name(prepared_name)}()"
       end
 
       [sql, <<-SQL]
-CREATE TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].join(" OR ")} #{of_clause}ON "#{options[:table]}"
+CREATE TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].join(" OR ")} #{of_clause}ON #{adapter.quote_table_name(options[:table])}
 FOR EACH #{options[:for_each]}#{prepared_where && db_version >= 90000 ? " WHEN (" + prepared_where + ')': ''} EXECUTE PROCEDURE #{trigger_action};
       SQL
     end

data/lib/hair_trigger/schema_dumper.rb

@@ -23,7 +23,11 @@ module HairTrigger
         definitions = []
         builder.generate.each do |statement|
           if statement =~ /\ACREATE(.*TRIGGER| FUNCTION) ([^ \n]+)/
-            definitions << [$2, statement, $1 == ' FUNCTION' ? :function : :trigger]
+            # poor man's unquote
+            type = ($1 == ' FUNCTION' ? :function : :trigger)
+            name = $2.gsub('"', '')
+
+            definitions << [name, statement, type]
           end
         end
         {:builder => builder, :definitions => definitions}
@@ -63,23 +67,24 @@ module HairTrigger
       @adapter_name = @connection.adapter_name.downcase.to_sym
 
       return definition unless @adapter_name == :postgresql
-      begin
-        # because postgres does not preserve the original CREATE TRIGGER/
-        # FUNCTION statements, its decompiled reconstruction will not match
-        # ours. we work around it by creating our generated trigger/function,
-        # asking postgres for its definition, and then rolling back.
-        begin
-          @connection.transaction do
-            chars = ('a'..'z').to_a + ('0'..'9').to_a + ['_']
-            test_name = '_hair_trigger_test_' + (0..43).map{ chars[(rand * chars.size).to_i] }.join
-            test_name << (type == :function ? '()' : '')
-            @connection.execute(definition.sub(name, test_name))
-            definition = @connection.triggers(:only => [test_name], :simple_check => true).values.first
-            definition.sub!(test_name, name)
-            raise
-          end
-        rescue
+      # because postgres does not preserve the original CREATE TRIGGER/
+      # FUNCTION statements, its decompiled reconstruction will not match
+      # ours. we work around it by creating our generated trigger/function,
+      # asking postgres for its definition, and then rolling back.
+      @connection.transaction(requires_new: true) do
+        chars = ('a'..'z').to_a + ('0'..'9').to_a + ['_']
+        test_name = '_hair_trigger_test_' + (0..43).map{ chars[(rand * chars.size).to_i] }.join
+        # take of the parens for gsubbing, since this version might be quoted
+        name = name[0..-3] if type == :function
+        @connection.execute(definition.sub(name, test_name))
+        # now add them back
+        if type == :function
+          test_name << '()'
+          name << '()'
         end
+        definition = @connection.triggers(:only => [test_name], :simple_check => true).values.first
+        definition.sub!(test_name, name)
+        raise ActiveRecord::Rollback
       end
       definition
     end

data/lib/hair_trigger/version.rb

@@ -1,5 +1,5 @@
 module HairTrigger
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 
   def VERSION.<=>(other)
     split(/\./).map(&:to_i) <=> other.split(/\./).map(&:to_i)

data/spec/builder_spec.rb

@@ -10,6 +10,10 @@ class MockAdapter
       instance_eval("def #{key}; #{value.inspect}; end")
     end
   end
+
+  def quote_table_name(table)
+    table
+  end
 end
 
 def builder(name = nil)

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.14
-  prerelease: 
+  version: 0.2.15
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: allows you to declare database triggers in ruby in your models, and then
@@ -67,8 +60,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- Rakefile
 - README.md
+- Rakefile
+- lib/hair_trigger.rb
 - lib/hair_trigger/adapter.rb
 - lib/hair_trigger/base.rb
 - lib/hair_trigger/builder.rb
@@ -77,17 +71,16 @@ files:
 - lib/hair_trigger/railtie.rb
 - lib/hair_trigger/schema_dumper.rb
 - lib/hair_trigger/version.rb
-- lib/hair_trigger.rb
 - lib/hairtrigger.rb
 - lib/tasks/hair_trigger.rake
 - spec/adapter_spec.rb
 - spec/builder_spec.rb
-- spec/migrations/20110331212003_initial_tables.rb
-- spec/migrations/20110331212631_user_trigger.rb
-- spec/migrations/20110417185102_manual_user_trigger.rb
 - spec/migrations-pre-3.1/20110331212003_initial_tables.rb
 - spec/migrations-pre-3.1/20110331212631_user_trigger.rb
 - spec/migrations-pre-3.1/20110417185102_manual_user_trigger.rb
+- spec/migrations/20110331212003_initial_tables.rb
+- spec/migrations/20110331212631_user_trigger.rb
+- spec/migrations/20110417185102_manual_user_trigger.rb
 - spec/migrations_spec.rb
 - spec/models/group.rb
 - spec/models/user.rb
@@ -96,27 +89,26 @@ files:
 homepage: http://github.com/jenseng/hair_trigger
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: easy database triggers for active record
 test_files: []
 has_rdoc: