hairtrigger 0.2.7 → 0.2.8

data/lib/hair_trigger.rb

@@ -201,6 +201,10 @@ end
 end
 
 ActiveRecord::Base.send :extend, HairTrigger::Base
-ActiveRecord::Migrator.send :extend, HairTrigger::Migrator
+if ActiveRecord::VERSION::STRING < "4.1."
+  ActiveRecord::Migrator.send :extend, HairTrigger::Migrator
+else
+  ActiveRecord::Migration.send :include, HairTrigger::Migrator
+end
 ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval { include HairTrigger::Adapter }
 ActiveRecord::SchemaDumper.class_eval { include HairTrigger::SchemaDumper }

data/lib/hair_trigger/adapter.rb

@@ -12,6 +12,16 @@ module HairTrigger
       ::HairTrigger::Builder.new(name, options.merge(:execute => true, :drop => true, :table => table, :adapter => self)).all{}
     end
 
+    def normalize_mysql_definer(definer)
+      user, host = definer.split('@')
+      host = @config[:host] || 'localhost' if host == '%'
+      "'#{user}'@'#{host}'" # SHOW TRIGGERS doesn't quote them, but we need quotes for creating a trigger
+    end
+
+    def implicit_mysql_definer
+      "'#{@config[:username] || 'root'}'@'#{@config[:host] || 'localhost'}'"
+    end
+
     def triggers(options = {})
       triggers = {}
       name_clause = options[:only] ? "IN ('" + options[:only].join("', '") + "')" : nil
@@ -23,9 +33,10 @@ module HairTrigger
           end
         when :mysql
           select_rows("SHOW TRIGGERS").each do |(name, event, table, actions, timing, created, sql_mode, definer)|
+            definer = normalize_mysql_definer(definer)
             next if options[:only] && !options[:only].include?(name)
             triggers[name.strip] = <<-SQL
-CREATE #{definer != "#{@config[:username] || 'root'}@#{@config[:host] || 'localhost'}" ? "DEFINER = #{definer} " : ""}TRIGGER #{name} #{timing} #{event} ON #{table}
+CREATE #{definer != implicit_mysql_definer ? "DEFINER = #{definer} " : ""}TRIGGER #{name} #{timing} #{event} ON #{table}
 FOR EACH ROW
 #{actions}
             SQL

data/lib/hair_trigger/migrator.rb

@@ -1,11 +1,22 @@
 module HairTrigger
   module Migrator
-    def proper_table_name_with_hash_awareness(name)
-      name.is_a?(Hash) ? name : proper_table_name_without_hash_awareness(name)
+    def proper_table_name_with_hash_awareness(*args)
+      name = args.first
+      return name if name.is_a?(Hash)
+      proper_table_name_without_hash_awareness(*args)
     end
-    def self.extended(base)
-      base.class_eval do
-        class << self
+
+    class << self
+      def extended(base)
+        base.class_eval do
+          class << self
+            alias_method_chain :proper_table_name, :hash_awareness
+          end
+        end
+      end
+
+      def included(base)
+        base.instance_eval do
           alias_method_chain :proper_table_name, :hash_awareness
         end
       end

data/lib/hair_trigger/version.rb

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

data/spec/adapter_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+# for this spec to work, you need to have postgres and mysql installed (in
+# addition to the gems), and you should make sure that you have set up
+# appropriate users and permissions. see database.yml for more info
+
+describe "adapter" do
+  include_context "hairtrigger utils"
+
+  describe ".triggers" do
+    before do
+      reset_tmp(:migration_glob => "*initial_tables*")
+      initialize_db
+      migrate_db
+    end
+
+    shared_examples_for "mysql" do
+      # have to stub SHOW TRIGGERS to get back a '%' host, since GRANTs
+      # and such get a little dicey for testing (local vs travis, etc.)
+      it "matches the generated trigger with a '%' grant" do
+        conn.instance_variable_get(:@config)[:host] = "somehost" # wheeeee!
+        implicit_definer = "'root'@'somehost'"
+        show_triggers_definer = "root@%"
+
+        builder = trigger.on(:users).before(:insert){ "UPDATE foos SET bar = 1" }
+        triggers = builder.generate.select{|t|t !~ /\ADROP/}
+        expect(conn).to receive(:implicit_mysql_definer).and_return(implicit_definer)
+        expect(conn).to receive(:select_rows).with("SHOW TRIGGERS").and_return([
+          ['users_before_insert_row_tr', 'INSERT', 'users', "BEGIN\n    UPDATE foos SET bar = 1;\nEND", 'BEFORE', 'NULL', 'STRICT_ALL_TABLES', show_triggers_definer]
+        ])
+
+        expect(db_triggers).to eq(triggers)
+      end
+    end
+
+    context "mysql" do
+      let(:adapter) { :mysql }
+      it_behaves_like "mysql"
+    end
+
+    context "mysql2" do
+      let(:adapter) { :mysql2 }
+      it_behaves_like "mysql"
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -72,8 +72,16 @@ shared_context "hairtrigger utils" do
     io.read
   end
 
+  def trigger(*args)
+    HairTrigger::Builder.new(*args)
+  end
+
+  def conn
+    ActiveRecord::Base.connection
+  end
+
   def db_triggers
-    ActiveRecord::Base.connection.triggers.values
+    conn.triggers.values
   end
 
   def replace_file_contents(path, source, replacement)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,7 @@ files:
 - 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