hairtrigger 0.1.6 → 0.1.7

data/Gemfile

@@ -1,12 +1,13 @@
 source "http://rubygems.org"
 
-gem "activerecord", ">=2.3.0", "<3.0"
+gem "activerecord", ">=2.3.0"
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
   gem 'mysql', '>= 2.8.1'
+  gem 'mysql2', '>= 0.2.7'
   gem 'pg', '>= 0.10.1'
   gem 'sqlite3-ruby', '>= 1.3.2'
 end

data/README.rdoc

@@ -15,12 +15,14 @@ hairtrigger in environment.rb
 
 === Step 2.
 
-If you plan to use model triggers (which you should ;) you'll need to create
-lib/tasks/hair_trigger.rake with the following:
+Create lib/tasks/hair_trigger.rake with the following:
 
  $VERBOSE = nil
  Dir["#{Gem.searcher.find('hair_trigger').full_gem_path}/lib/tasks/*.rake"].each { |ext| load ext }
 
+This will give you the db:generate_trigger_migration task, and will ensure
+that hairtrigger hooks into db:schema:dump.
+
 If you are unpacking the gem in vendor/plugins, this step is not needed
 (though you'll then want to delete its Gemfile to avoid possible conflicts).
 
@@ -65,10 +67,31 @@ drop_trigger. They are a little more verbose than model triggers, and they can
 be more work since you need to figure out the up/down create/drop logic when
 you change things. A sample trigger:
 
- create_trigger.on(:users).after(:insert) do
+ create_trigger(:compatibility => 1).on(:users).after(:insert) do
    "UPDATE accounts SET user_count = user_count + 1 WHERE id = NEW.account_id;"
  end
 
+==== Manual triggers and :compatibility
+
+As bugs are fixed and features are implemented in hairtrigger, it's possible
+that the generated trigger SQL will change (this has only happened once so
+far). If you upgrade to a newer version of hairtrigger, it needs a way of
+knowing which previous version generated the original trigger. You only need
+to worry about this for manual trigger migrations, as the model ones
+automatically take care of this. For your manual triggers you can either:
+
+* pass ":compatibility => x" to your create_trigger statement, where x is
+  whatever HairTrigger::Builder.compatiblity is (1 for this version).
+* set "HairTrigger::Builder.base_compatibility = x" in an initializer, where
+  x is whatever HairTrigger::Builder.compatiblity is. This is like doing the
+  first option on every create_trigger. Note that once the compatibility
+  changes, you'll need to set :compatibility on new triggers (unless you
+  just redo all your triggers and bump the base_compatibility).
+
+If you upgrade to a newer version of hairtrigger and see that the SQL
+compatibility has changed, you'll need to set the appropriate compatibility
+on any new triggers that you create.
+
 === Chainable Methods
 
 Triggers are built by chaining several methods together, ending in a block
@@ -200,16 +223,20 @@ you want to support.
   limited to INSERT/UPDATE/DELETE/SELECT, and conditional logic should be
   handled through the :where option/method. Otherwise you'll likely run into
   trouble due to differences in syntax and supported features.
+* Manual create_trigger statements have some gotchas. See the section
+  "Manual triggers and :compatibility"
 
 == Compatibility
 
-* Rails 2.3.x
+* Rails 2.3+
 * Postgres 8.0+
 * MySQL 5.0.10+
 * SQLite 3.3.8+
 
 == Version History
 
+* 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
   has a semicolon
 * 0.1.3 Better error handling, Postgres 8.x support, updated docs

data/Rakefile

@@ -19,7 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{allows you to declare database triggers in ruby in your models, and then generate appropriate migrations as they change}
   gem.email = "jenseng@gmail.com"
   gem.authors = ["Jon Jensen"]
-  gem.add_dependency "activerecord", ">=2.3.0", "<3.0"
+  gem.add_dependency "activerecord", ">=2.3.0"
   gem.add_development_dependency "rspec", "~> 2.3.0"
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/hair_trigger.rb

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'hair_trigger/base'
 require 'hair_trigger/builder'
+require 'hair_trigger/migrator'
 require 'hair_trigger/migration'
 require 'hair_trigger/adapter'
 require 'hair_trigger/schema_dumper'
@@ -140,7 +141,7 @@ module HairTrigger
       migration_name = "#{migration_base_name}#{name_version}"
       migration_version = ActiveRecord::Base.timestamped_migrations ?
         Time.now.getutc.strftime("%Y%m%d%H%M%S") :
-        Dir.glob(migration_path + '/*rb').map{ |f| f.gsub(/.*\/(\d+)_.*/, '\1').to_i}.inject(0){ |curr, i| i > curr ? i : curr }
+        Dir.glob(migration_path + '/*rb').map{ |f| f.gsub(/.*\/(\d+)_.*/, '\1').to_i}.inject(0){ |curr, i| i > curr ? i : curr } + 1
       file_name = migration_path + '/' + migration_version + "_" + migration_name.underscore + ".rb"
       File.open(file_name, "w"){ |f| f.write <<-MIGRATION }
 # This migration was auto-generated via `rake db:generate_trigger_migration'.
@@ -175,12 +176,17 @@ end
     def migration_path
       @migration_path ||= 'db/migrate'
     end
+
+    def adapter_name_for(adapter)
+      adapter.adapter_name.downcase.sub(/\d$/, '').to_sym
+    end
   end
 end
 
 ActiveRecord::Base.send :extend, HairTrigger::Base
 ActiveRecord::Migration.send :extend, HairTrigger::Migration
 ActiveRecord::MigrationProxy.send :delegate, :trigger_builders, :to=>:migration
+ActiveRecord::Migrator.send :extend, HairTrigger::Migrator
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval { include HairTrigger::Adapter }
 ActiveRecord::SchemaDumper.class_eval { include HairTrigger::SchemaDumper }
 ActiveRecord::Schema.send :extend, HairTrigger::Schema

data/lib/hair_trigger/adapter.rb

@@ -15,7 +15,8 @@ module HairTrigger
     def triggers(options = {})
       triggers = {}
       name_clause = options[:only] ? "IN ('" + options[:only].join("', '") + "')" : nil
-      case self.adapter_name.downcase.to_sym
+      adapter_name = HairTrigger.adapter_name_for(self)
+      case adapter_name
         when :sqlite
           select_rows("SELECT name, sql FROM sqlite_master WHERE type = 'trigger' #{name_clause ? " AND name " + name_clause : ""}").each do |(name, definition)|
             triggers[name] = definition + ";\n"

data/lib/hair_trigger/builder.rb

@@ -195,7 +195,8 @@ module HairTrigger
           str << "#{indent}end"
         else
           str = "#{indent}create_trigger(#{prepared_name.inspect}"
-          str << ", :generated => true, :compatibility => #{@compatibility}" if always_generated || options[:generated]
+          str << ", :generated => true" if always_generated || options[:generated]
+          str << ", :compatibility => #{@compatibility}"
           str << ").\n#{indent}    " + chained_calls_to_ruby(".\n#{indent}    ")
           if @triggers
             str << " do |t|\n"
@@ -270,7 +271,7 @@ module HairTrigger
     end
 
     def adapter_name
-      @adapter_name ||= adapter.adapter_name.downcase.to_sym
+      @adapter_name ||= HairTrigger.adapter_name_for(adapter)
     end
 
     def adapter
@@ -387,8 +388,7 @@ BEGIN
     end
 
     class << self
-      attr_writer :tab_spacing
-      attr_writer :show_warnings
+      attr_writer :tab_spacing, :show_warnings, :base_compatibility
 
       def tab_spacing
         @tab_spacing ||= 4
@@ -399,6 +399,10 @@ BEGIN
         @show_warnings
       end
 
+      def base_compatibility
+        @base_compatibility ||= 0
+      end
+
       def compatibility
         @compatibility ||= begin
           gem_version = (File.read(File.dirname(__FILE__) + '/../../VERSION').chomp rescue '0.1.3').split(/\./).map(&:to_i)

data/lib/hair_trigger/migration.rb

@@ -4,17 +4,20 @@ module HairTrigger
 
     def method_missing_with_trigger_building(method, *arguments, &block)
       if extract_trigger_builders
-        if method.to_sym == :create_trigger && (extract_all_triggers || arguments[1].delete(:generated))
+        extract_this_trigger = extract_all_triggers
+        trigger = if method.to_sym == :create_trigger
+          arguments.unshift({}) if arguments.empty?
           arguments.unshift(nil) if arguments.first.is_a?(Hash)
-          arguments[1][:compatibility] ||= 0
-          trigger = ::HairTrigger::Builder.new(*arguments)
-          (@trigger_builders ||= []) << trigger
-          trigger
-        elsif method.to_sym == :drop_trigger && (extract_all_triggers || arguments[2] && arguments[2].delete(:generated))
-          trigger = ::HairTrigger::Builder.new(arguments[0], {:table => arguments[1], :drop => true})
-          (@trigger_builders ||= []) << trigger
-          trigger
+          extract_this_trigger ||= arguments[1].delete(:generated)
+          arguments[1][:compatibility] ||= HairTrigger::Builder.base_compatibility
+          ::HairTrigger::Builder.new(*arguments)
+        elsif method.to_sym == :drop_trigger
+          extract_this_trigger ||= arguments[2].delete(:generated) if arguments[2]
+          ::HairTrigger::Builder.new(arguments[0], {:table => arguments[1], :drop => true})
         end
+        (@trigger_builders ||= []) << trigger if trigger && extract_this_trigger
+        trigger
+
         # normally we would fall through to the connection for everything
         # else, but we don't want to do that since we are not actually
         # running the migration

data/lib/hair_trigger/migrator.rb

@@ -0,0 +1,14 @@
+module HairTrigger
+  module Migrator
+    def proper_table_name_with_hash_awareness(name)
+      name.is_a?(Hash) ? name : proper_table_name_without_hash_awareness(name)
+    end
+    def self.extended(base)
+      base.class_eval do
+        class << self
+          alias_method_chain :proper_table_name, :hash_awareness
+        end
+      end
+    end
+  end
+end

data/spec/migrations/20110331212003_initial_tables.rb

@@ -7,6 +7,7 @@ class InitialTables < ActiveRecord::Migration
 
     create_table "groups" do |t|
       t.integer  "bob_count", :default => 0
+      t.integer  "updated_joe_count", :default => 0
     end
   end
 

data/spec/migrations/20110417185102_manual_user_trigger.rb

@@ -0,0 +1,10 @@
+class ManualUserTrigger < ActiveRecord::Migration
+  def self.up
+    create_trigger(:compatibility => 1).
+        on("users").
+        after(:update).
+        where("NEW.name = 'joe'") do
+      "UPDATE groups SET updated_joe_count = updated_joe_count + 1"
+    end
+  end
+end

data/spec/schema_dumper_spec.rb

@@ -1,7 +1,9 @@
 require 'active_record'
+require 'logger'
 require 'active_record/connection_adapters/postgresql_adapter'
 require 'active_record/connection_adapters/mysql_adapter'
 require 'active_record/connection_adapters/sqlite3_adapter'
+require 'mysql2'
 require 'rspec'
 require 'hair_trigger'
 
@@ -25,7 +27,7 @@ def initialize_db(adapter)
   reset_tmp
   config = {:database => 'hairtrigger_schema_test', :username => 'hairtrigger', :adapter => adapter.to_s, :host => 'localhost'}
   case adapter
-    when :mysql
+    when :mysql, :mysql2
       ret = `echo "drop database if exists hairtrigger_schema_test; create database hairtrigger_schema_test;" | mysql hairtrigger_schema_test -u hairtrigger`
       raise "error creating database: #{ret}" unless $?.exitstatus == 0
     when :sqlite3
@@ -36,13 +38,16 @@ def initialize_db(adapter)
       raise "error creating database: #{ret}" unless $?.exitstatus == 0
       config[:min_messages] = :error
   end
+  # Arel has an issue in that it keeps using original connection for quoting,
+  # etc. (which breaks stuff) unless you do this:
+  Arel::Visitors::ENGINE_VISITORS.delete(ActiveRecord::Base) if defined?(Arel)
   ActiveRecord::Base.establish_connection(config)
   ActiveRecord::Base.logger = Logger.new('/dev/null')
   ActiveRecord::Migrator.migrate(HairTrigger.migration_path)
 end
 
 describe "schema" do
-  [:mysql, :postgresql, :sqlite3].each do |adapter|
+  [:mysql, :mysql2, :postgresql, :sqlite3].each do |adapter|
     it "should correctly dump #{adapter}" do
       ActiveRecord::Migration.verbose = false
       initialize_db(adapter)
@@ -55,6 +60,7 @@ describe "schema" do
       io.rewind
       schema_rb = io.read
       schema_rb.should match(/create_trigger\("users_after_insert_row_when_new_name_bob__tr", :generated => true, :compatibility => 1\)/)
+      schema_rb.should match(/create_trigger\("users_after_update_row_when_new_name_joe__tr", :compatibility => 1\)/)
 
       # schema dump w/ schema.rb
       ActiveRecord::SchemaDumper.previous_schema = schema_rb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hairtrigger
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,20 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -06:00
+date: 2011-04-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: activerecord
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
@@ -37,12 +33,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id001
-  name: activerecord
-  prerelease: false
-  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -53,12 +49,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id002
-  name: rspec
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: bundler
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -69,12 +65,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
-  name: bundler
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jeweler
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -85,12 +81,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id004
-  name: jeweler
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rcov
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,12 +95,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rcov
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: mysql
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,12 +111,28 @@ dependencies:
         - 8
         - 1
         version: 2.8.1
-  version_requirements: *id006
-  name: mysql
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: mysql2
   type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: pg
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -131,12 +143,12 @@ dependencies:
         - 10
         - 1
         version: 0.10.1
-  version_requirements: *id007
-  name: pg
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: sqlite3-ruby
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,21 +159,14 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  version_requirements: *id008
-  name: sqlite3-ruby
-  prerelease: false
-  type: :development
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: activerecord
+  type: :runtime
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
@@ -170,12 +175,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id009
-  name: activerecord
-  prerelease: false
-  type: :runtime
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -186,10 +191,7 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id010
-  name: rspec
-  prerelease: false
-  type: :development
+  requirement: *id011
 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: []
@@ -213,6 +215,7 @@ files:
 - lib/hair_trigger/base.rb
 - lib/hair_trigger/builder.rb
 - lib/hair_trigger/migration.rb
+- lib/hair_trigger/migrator.rb
 - lib/hair_trigger/schema.rb
 - lib/hair_trigger/schema_dumper.rb
 - lib/tasks/hair_trigger.rake
@@ -220,6 +223,7 @@ files:
 - spec/builder_spec.rb
 - spec/migrations/20110331212003_initial_tables.rb
 - spec/migrations/20110331212631_user_trigger.rb
+- spec/migrations/20110417185102_manual_user_trigger.rb
 - spec/models/group.rb
 - spec/models/user.rb
 - spec/schema_dumper_spec.rb
@@ -253,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: easy database triggers for active record
@@ -261,6 +265,7 @@ test_files:
 - spec/builder_spec.rb
 - spec/migrations/20110331212003_initial_tables.rb
 - spec/migrations/20110331212631_user_trigger.rb
+- spec/migrations/20110417185102_manual_user_trigger.rb
 - spec/models/group.rb
 - spec/models/user.rb
 - spec/schema_dumper_spec.rb