hairtrigger 0.1.11 → 0.1.12

data/README.rdoc

@@ -152,6 +152,29 @@ For MySQL, this will just create a single trigger with conditional logic
 distinct triggers. This same notation is also used within trigger migrations.
 MySQL does not currently support nested trigger groups.
 
+=== Database-specific trigger bodies
+
+Although HairTrigger aims to be totally db-agnostic, at times you do need a
+little more control over the body of the trigger. You can tailor it for
+specific databases by returning a hash rather than a string. Make sure to set
+a :default value if you aren't explicitly specifying all of them.
+
+For example, MySQL generally performs poorly with subselects in UPDATE
+statements, and it has its own proprietary syntax for multi-table UPDATEs. So
+you might do something like the following:
+
+  trigger.after(:insert) do
+    {:default => <<-DEFAULT_SQL, :mysql => <<-MYSQL}
+
+    UPDATE users SET item_count = item_count + 1
+    WHERE id IN (SELECT user_id FROM buckets WHERE id = NEW.bucket_id)
+    DEFAULT_SQL
+
+    UPDATE users, buckets SET item_count = item_count + 1
+    WHERE users.id = user_id AND buckets.id = NEW.bucket_id
+    MYSQL
+  end
+
 == rake db:schema:dump
 
 HairTrigger hooks into rake db:schema:dump (and rake tasks that call it) to
@@ -228,14 +251,17 @@ you want to support.
 
 == Compatibility
 
-* Rails 2.3+
+* Rails 2.3 - Rails 3.0.x
 * Postgres 8.0+
 * MySQL 5.0.10+
 * SQLite 3.3.8+
 
 == Version History
 
-* 0.1.9 mysql fixes for inferred root@localhost
+* 0.1.12 DB-specific trigger body support, bugfixes
+* 0.1.11 Safer migration loading, some speedups
+* 0.1.10 Sped up migration evaluation
+* 0.1.9 MySQL fixes for inferred root@localhost
 * 0.1.7 Rails 3 support, fixed a couple manual create_trigger bugs
 * 0.1.6 rake db:schema:dump support, respect non-timestamped migrations
 * 0.1.4 Compatibility tracking, fixed Postgres return bug, ensure last action

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/hair_trigger/adapter.rb

@@ -5,11 +5,11 @@ module HairTrigger
         options = name
         name = nil
       end
-      ::HairTrigger::Builder.new(name, options.merge(:execute => true))
+      ::HairTrigger::Builder.new(name, options.merge(:execute => true, :adapter => self))
     end
 
     def drop_trigger(name, table, options = {})
-      ::HairTrigger::Builder.new(name, options.merge(:execute => true, :drop => true, :table => table)){}
+      ::HairTrigger::Builder.new(name, options.merge(:execute => true, :drop => true, :table => table, :adapter => self)).all{}
     end
 
     def triggers(options = {})

data/lib/hair_trigger/builder.rb

@@ -98,6 +98,10 @@ module HairTrigger
       options[:events] = events.map{ |e| e.to_s.upcase }
     end
 
+    def raw_actions
+      @raw_actions ||= prepared_actions.is_a?(Hash) ? prepared_actions[adapter_name] || prepared_actions[:default] : prepared_actions
+    end
+
     def prepared_name
       @prepared_name ||= options[:name] ||= infer_name
     end
@@ -141,7 +145,11 @@ module HairTrigger
     def prepare!
       @triggers.each(&:prepare!) if @triggers
       @prepared_where = options[:where] = interpolate(options[:where]) if options[:where]
-      @prepared_actions = interpolate(@actions).rstrip if @actions
+      if @actions
+        @prepared_actions = @actions.is_a?(Hash) ?
+          @actions.inject({}){ |hash, (key, value)| hash[key] = interpolate(value).rstrip; hash } :
+          interpolate(@actions).rstrip
+      end
     end
 
     def validate!(direction = :down)
@@ -166,7 +174,7 @@ module HairTrigger
       if options[:drop]
         generate_drop_trigger
       else
-        raise GenerationError, "no actions specified" if @triggers && create_grouped_trigger? ? @triggers.any?{ |t| t.prepared_actions.nil? } : prepared_actions.nil?
+        raise GenerationError, "no actions specified" if @triggers && create_grouped_trigger? ? @triggers.any?{ |t| t.raw_actions.nil? } : raw_actions.nil?
         raise GenerationError, "need to specify the event(s) (:insert, :update, :delete)" if !options[:events] || options[:events].empty?
         raise GenerationError, "need to specify the timing (:before/:after)" unless options[:timing]
 
@@ -255,7 +263,7 @@ module HairTrigger
     end
 
     def actions_to_ruby(indent = '')
-      if prepared_actions =~ /\n/
+      if prepared_actions.is_a?(String) && prepared_actions =~ /\n/
         "#{indent}<<-SQL_ACTIONS\n#{prepared_actions}\n#{indent}SQL_ACTIONS"
       else
         indent + prepared_actions.inspect
@@ -271,7 +279,9 @@ module HairTrigger
         raise DeclarationError, "trigger group did not define any triggers" if @triggers.empty?
       else
         @actions = block.call
-        @actions.sub!(/(\s*)\z/, ';\1') if @actions && !(@actions =~ /;\s*\z/)
+        (@actions.is_a?(Hash) ? @actions.values : [@actions]).each do |actions|
+          actions.sub!(/(\s*)\z/, ';\1') if actions && actions !~ /;\s*\z/
+        end
       end
       # only the top-most block actually executes
       Array(generate).each{ |action| adapter.execute(action)} if options[:execute] && !@trigger_group
@@ -312,7 +322,7 @@ module HairTrigger
 CREATE TRIGGER #{prepared_name} #{options[:timing]} #{options[:events]} ON #{options[:table]}
 FOR EACH #{options[:for_each]}#{prepared_where ? " WHEN " + prepared_where : ''}
 BEGIN
-#{normalize(prepared_actions, 1).rstrip}
+#{normalize(raw_actions, 1).rstrip}
 END;
       SQL
     end
@@ -328,13 +338,13 @@ BEGIN
       SQL
       if prepared_where && db_version < 90000
         sql << normalize("IF #{prepared_where} THEN", 1)
-        sql << normalize(prepared_actions, 2)
+        sql << normalize(raw_actions, 2)
         sql << normalize("END IF;", 1)
       else
-        sql << normalize(prepared_actions, 1)
+        sql << normalize(raw_actions, 1)
       end
       # if no return is specified at the end, be sure we set a sane one
-      unless prepared_actions =~ /return [^;]+;\s*\z/i
+      unless raw_actions =~ /return [^;]+;\s*\z/i
         if options[:timing] == "AFTER" || options[:for_each] == 'STATEMENT'
           sql << normalize("RETURN NULL;", 1)
         elsif options[:events].include?('DELETE')
@@ -363,10 +373,10 @@ BEGIN
       (@triggers ? @triggers : [self]).each do |trigger|
         if trigger.prepared_where
           sql << normalize("IF #{trigger.prepared_where} THEN", 1)
-          sql << normalize(trigger.prepared_actions, 2)
+          sql << normalize(trigger.raw_actions, 2)
           sql << normalize("END IF;", 1)
         else
-          sql << normalize(trigger.prepared_actions, 1)
+          sql << normalize(trigger.raw_actions, 1)
         end
       end
       sql << "END\n";

data/spec/builder_spec.rb

@@ -1,5 +1,6 @@
 require 'rspec'
-require 'hair_trigger/builder'
+require 'active_record'
+require 'hair_trigger'
 
 HairTrigger::Builder.show_warnings = false
 
@@ -29,7 +30,7 @@ describe "builder" do
     it "should tack on a semicolon if none is provided" do
       @adapter = MockAdapter.new("mysql")
       builder.on(:foos).after(:update){ "FOO " }.generate.
-      grep(/FOO;/).size.should eql(1)
+        grep(/FOO;/).size.should eql(1)
     end
   end
 
@@ -37,16 +38,44 @@ describe "builder" do
     it "should view identical triggers as identical" do
       @adapter = MockAdapter.new("mysql")
       builder.on(:foos).after(:update){ "FOO" }.
-      should eql(builder.on(:foos).after(:update){ "FOO" })
+        should eql(builder.on(:foos).after(:update){ "FOO" })
     end
 
     it "should view incompatible triggers as different" do
       @adapter = MockAdapter.new("mysql")
       HairTrigger::Builder.new(nil, :adapter => @adapter, :compatibility => 0).on(:foos).after(:update){ "FOO" }.
-      should_not eql(builder.on(:foos).after(:update){ "FOO" })
+        should_not eql(builder.on(:foos).after(:update){ "FOO" })
     end
   end
 
+  context "adapter-specific actions" do
+    before(:each) do
+      @adapter = MockAdapter.new("mysql")
+    end
+
+    it "should generate the appropriate trigger for the adapter" do
+      sql = builder.on(:foos).after(:update).where('BAR'){
+        {:default => "DEFAULT", :mysql => "MYSQL"}
+      }.generate
+
+      sql.grep(/DEFAULT/).size.should eql(0)
+      sql.grep(/MYSQL/).size.should eql(1)
+
+      sql = builder.on(:foos).after(:update).where('BAR'){
+        {:default => "DEFAULT", :postgres => "POSTGRES"}
+      }.generate
+
+      sql.grep(/POSTGRES/).size.should eql(0)
+      sql.grep(/DEFAULT/).size.should eql(1)
+    end
+
+    it "should complain if no actions are provided for this adapter" do
+      lambda {
+        builder.on(:foos).after(:update).where('BAR'){ {:postgres => "POSTGRES"} }.generate
+      }.should raise_error
+    end
+  end
+  
   context "mysql" do
     before(:each) do
       @adapter = MockAdapter.new("mysql")
@@ -156,7 +185,7 @@ describe "builder" do
 
     it "should allow truncate with for_each statement" do
       builder.on(:foos).after(:truncate).for_each(:statement){ "FOO" }.generate.
-      grep(/TRUNCATE.*FOR EACH STATEMENT/m).size.should eql(1)
+        grep(/TRUNCATE.*FOR EACH STATEMENT/m).size.should eql(1)
     end
 
     it "should reject truncate with for_each row" do
@@ -167,7 +196,7 @@ describe "builder" do
 
     it "should add a return statement if none is provided" do
       builder.on(:foos).after(:update){ "FOO" }.generate.
-      grep(/RETURN NULL;/).size.should eql(1)
+        grep(/RETURN NULL;/).size.should eql(1)
     end
 
     context "legacy" do

data/spec/schema_dumper_spec.rb

@@ -73,7 +73,7 @@ describe "schema" do
       # edit our model trigger, generate and apply a new migration
       user_model = File.read(HairTrigger.model_path + '/user.rb')
       File.open(HairTrigger.model_path + '/user.rb', 'w') { |f|
-        f.write user_model.sub('UPDATE groups SET bob_count = bob_count + 1', 'UPDATE groups SET bob_count = bob_count + 2')
+        f.write user_model.sub('"UPDATE groups SET bob_count = bob_count + 1"', '{:default => "UPDATE groups SET bob_count = bob_count + 2"}')
       }
       migration = HairTrigger.generate_migration
       ActiveRecord::Migrator.migrate(HairTrigger.migration_path)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hairtrigger
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -06:00
+date: 2011-11-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: activerecord
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,12 +46,12 @@ dependencies:
         - 0
         - 6
         version: 2.0.6
-  name: ruby_parser
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+  name: ruby_parser
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,12 +62,12 @@ dependencies:
         - 2
         - 5
         version: 1.2.5
+  prerelease: false
+  type: :runtime
+  requirement: *id003
   name: ruby2ruby
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +78,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,12 +94,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +110,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  name: jeweler
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,12 +124,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id007
+  name: rcov
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +140,12 @@ dependencies:
         - 8
         - 1
         version: 2.8.1
-  name: mysql
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id008
+  name: mysql
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -165,12 +163,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  name: mysql2
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: *id009
+  name: mysql2
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -181,12 +179,12 @@ dependencies:
         - 10
         - 1
         version: 0.10.1
-  name: pg
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: *id010
+  name: pg
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -197,12 +195,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  name: sqlite3-ruby
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: *id011
+  name: sqlite3-ruby
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -213,12 +211,12 @@ dependencies:
         - 10
         - 4
         version: 0.10.4
+  prerelease: false
+  type: :development
+  requirement: *id012
   name: ruby-debug
-  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -229,12 +227,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+  prerelease: false
+  type: :runtime
+  requirement: *id013
   name: activerecord
-  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -245,8 +243,10 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+  prerelease: false
+  type: :development
+  requirement: *id014
   name: rspec
-  version_requirements: *id014
 description: allows you to declare database triggers in ruby in your models, and then generate appropriate migrations as they change
 email: jenseng@gmail.com
 executables: []