hairtrigger 0.2.13 → 0.2.14

data/lib/hair_trigger/schema_dumper.rb

@@ -1,5 +1,6 @@
 module HairTrigger
   module SchemaDumper
+
     def trailer_with_triggers(stream)
       orig_show_warnings = Builder.show_warnings
       Builder.show_warnings = false # we already show them when running the migration
@@ -10,13 +11,15 @@ module HairTrigger
     end
 
     def triggers(stream)
-      @connection = ActiveRecord::Base.connection
       @adapter_name = @connection.adapter_name.downcase.to_sym
 
-      db_triggers = @connection.triggers; nil
+      all_triggers = @connection.triggers
       db_trigger_warnings = {}
+      migration_trigger_builders = []
+
+      db_triggers = whitelist_triggers(all_triggers)
 
-      migration_triggers = HairTrigger.current_migrations(:in_rake_task => true, :previous_schema => self.class.previous_schema).map do |(name, builder)|
+      migration_triggers = HairTrigger.current_migrations(:in_rake_task => true, :previous_schema => self.class.previous_schema).map do |(_, builder)|
         definitions = []
         builder.generate.each do |statement|
           if statement =~ /\ACREATE(.*TRIGGER| FUNCTION) ([^ \n]+)/
@@ -30,12 +33,13 @@ module HairTrigger
         next unless migration[:definitions].all? do |(name, definition, type)|
           db_triggers[name] && (db_trigger_warnings[name] = true) && db_triggers[name] == normalize_trigger(name, definition, type)
         end
-        migration[:definitions].each do |(name, trigger, type)|
+
+        migration[:definitions].each do |(name, _, _)|
           db_triggers.delete(name)
           db_trigger_warnings.delete(name)
         end
 
-        stream.print migration[:builder].to_ruby('  ', false) + "\n\n"
+        migration_trigger_builders << migration[:builder]
       end
 
       db_triggers.to_a.sort_by{ |t| (t.first + 'a').sub(/\(/, '_') }.each do |(name, definition)|
@@ -51,10 +55,11 @@ module HairTrigger
           stream.print "  execute(#{definition.inspect})\n\n"
         end
       end
+
+      migration_trigger_builders.each { |builder| stream.print builder.to_ruby('  ', false) + "\n\n" }
     end
 
     def normalize_trigger(name, definition, type)
-      @connection = ActiveRecord::Base.connection
       @adapter_name = @connection.adapter_name.downcase.to_sym
 
       return definition unless @adapter_name == :postgresql
@@ -79,6 +84,12 @@ module HairTrigger
       definition
     end
 
+    def whitelist_triggers(triggers)
+      triggers.reject do |name, source|
+        ActiveRecord::SchemaDumper.ignore_tables.any? { |ignored_table_name| source =~ /ON\s+#{@connection.quote_table_name(ignored_table_name)}\s/ }
+      end
+    end
+
     def self.included(base)
       base.class_eval do
         alias_method_chain :trailer, :triggers

data/lib/hair_trigger/version.rb

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

data/spec/schema_dumper_spec.rb

@@ -44,6 +44,26 @@ describe "schema dumping" do
         schema_rb.should match(/bob_count \+ 1/)
         schema_rb.should_not match(/bob_count \+ 2/)
       end
+
+      it 'should take in consideration active record schema dumper ignore_tables option with regexp' do
+        ActiveRecord::SchemaDumper.ignore_tables = [/users/]
+
+        dump_schema.should_not match(/create_trigger/)
+      end
+
+      it 'should take in consideration active record schema dumper ignore_tables option with string' do
+        ActiveRecord::SchemaDumper.ignore_tables = ['users']
+
+        dump_schema.should_not match(/create_trigger/)
+      end
+
+      it 'should take in consideration active record schema dumper ignore_tables option with partial string' do
+        ActiveRecord::SchemaDumper.ignore_tables = ['user']
+
+        dump_schema.should match(/create_trigger/)
+      end
+
+
     end
 
     context "with schema.rb" do
@@ -79,6 +99,26 @@ describe "schema dumping" do
         schema_rb.should match(/bob_count \+ 1/)
         schema_rb.should_not match(/bob_count \+ 2/)
       end
+
+      it 'should take in consideration active record schema dumper ignore_tables option with regexp' do
+        ActiveRecord::SchemaDumper.ignore_tables = [/users/]
+
+        dump_schema.should_not match(/create_trigger/)
+      end
+
+      it 'should take in consideration active record schema dumper ignore_tables option with string' do
+        ActiveRecord::SchemaDumper.ignore_tables = ['users']
+
+        dump_schema.should_not match(/create_trigger/)
+      end
+
+      it 'should take in consideration active record schema dumper ignore_tables option with partial string' do
+        ActiveRecord::SchemaDumper.ignore_tables = ['user']
+
+        dump_schema.should match(/create_trigger/)
+      end
+
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord