hairtrigger 0.2.12 → 0.2.13

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Jon Jensen
+Copyright (c) 2011-2015 Jon Jensen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -325,4 +325,4 @@ existing trigger if you wish to redefine it.
 
 ## Copyright
 
-Copyright (c) 2011-2014 Jon Jensen. See LICENSE.txt for further details.
+Copyright (c) 2011-2015 Jon Jensen. See LICENSE.txt for further details.

data/lib/hair_trigger.rb

@@ -157,21 +157,35 @@ end
     end
 
     def infer_migration_name(migration_names, create_triggers, drop_triggers)
-      migration_base_name = if create_triggers.size > 0
-        ("create trigger#{create_triggers.size > 1 ? 's' : ''} " +
-         create_triggers.map{ |t| [t.options[:table], t.options[:events].join(" ")].join(" ") }.join(" and ")
-        ).downcase.gsub(/[^a-z0-9_]/, '_').gsub(/_+/, '_').camelize
+      if create_triggers.size > 0
+        migration_base_name = "create trigger#{create_triggers.size > 1 ? 's' : ''} "
+        name_parts = create_triggers.map { |t| [t.options[:table], t.options[:events].join(" ")].join(" ") }.uniq
+        part_limit = 4
       else
-        ("drop trigger#{drop_triggers.size > 1 ? 's' : ''} " +
-         drop_triggers.map{ |t| t.options[:table] }.join(" and ")
-        ).downcase.gsub(/[^a-z0-9_]/, '_').gsub(/_+/, '_').camelize
+        migration_base_name = "drop trigger#{drop_triggers.size > 1 ? 's' : ''} "
+        name_parts = drop_triggers.map { |t| t.options[:table] }
+        part_limit = 6
       end
 
+      # don't let migration names get too ridiculous
+      if name_parts.size > part_limit
+        migration_base_name << " multiple tables"
+      else
+        migration_base_name << name_parts.join(" OR ")
+      end
+
+      migration_base_name = migration_base_name.
+        downcase.
+        gsub(/[^a-z0-9_]/, '_').
+        gsub(/_+/, '_').
+        camelize
+
       name_version = nil
       while migration_names.include?("#{migration_base_name}#{name_version}")
         name_version = name_version.to_i + 1
       end
-      migration_name = "#{migration_base_name}#{name_version}"
+
+      "#{migration_base_name}#{name_version}"
     end
 
     def infer_migration_version(migration_name)

data/lib/hair_trigger/adapter.rb

@@ -29,14 +29,14 @@ module HairTrigger
       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"
+            triggers[name] = quote_table_name_in_trigger(definition) + ";\n"
           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 != implicit_mysql_definer ? "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
@@ -52,7 +52,7 @@ FOR EACH ROW
               )
             )
           SQL
-          function_conditions = 
+
           sql = <<-SQL
             SELECT tgname::varchar, pg_get_triggerdef(oid, true)
             FROM pg_trigger
@@ -68,12 +68,31 @@ FOR EACH ROW
               #{name_clause ? " AND (proname || '()')::varchar " + name_clause : ""}
           SQL
           select_rows(sql).each do |(name, definition)|
-            triggers[name] = definition
+            triggers[name] = quote_table_name_in_trigger(definition)
           end
         else
           raise "don't know how to retrieve #{adapter_name} triggers yet"
       end
       triggers
     end
+
+    # a bit hacky, but we need to ensure the table name is always quoted
+    # on the way out, not just for reserved words. this is because we
+    # always quote on the way in, so we need them to match exactly
+    # when diffing
+    def quote_table_name_in_trigger(definition)
+      pattern = /
+        (
+          CREATE\sTRIGGER\s+
+          \S+\s+
+          (BEFORE|AFTER|INSTEAD\s+OF)\s+
+          (INSERT|UPDATE|DELETE|TRUNCATE)\s+
+          (OR\s+(INSERT|UPDATE|DELETE|TRUNCATE)\s+)*
+          (ON\s+)
+        )
+        (\w+) # quote if not already quoted
+      /ixm
+      definition.sub(pattern, '\\1"\\7"')
+    end
   end
 end

data/lib/hair_trigger/builder.rb

@@ -411,7 +411,7 @@ module HairTrigger
 
     def generate_trigger_sqlite
       <<-SQL
-CREATE TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].first} #{of_clause}ON #{options[:table]}
+CREATE TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].first} #{of_clause}ON "#{options[:table]}"
 FOR EACH #{options[:for_each]}#{prepared_where ? " WHEN " + prepared_where : ''}
 BEGIN
 #{normalize(raw_actions, 1).rstrip}
@@ -464,7 +464,7 @@ $$ LANGUAGE plpgsql#{security ? " SECURITY #{security.to_s.upcase}" : ""};
       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 "#{options[:table]}"
 FOR EACH #{options[:for_each]}#{prepared_where && db_version >= 90000 ? " WHEN (" + prepared_where + ')': ''} EXECUTE PROCEDURE #{trigger_action};
       SQL
     end
@@ -472,7 +472,7 @@ FOR EACH #{options[:for_each]}#{prepared_where && db_version >= 90000 ? " WHEN (
     def generate_trigger_mysql
       security = options[:security] if options[:security] && options[:security] != :definer
       sql = <<-SQL
-CREATE #{security ? "DEFINER = #{security} " : ""}TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].first} ON #{options[:table]}
+CREATE #{security ? "DEFINER = #{security} " : ""}TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].first} ON `#{options[:table]}`
 FOR EACH #{options[:for_each]}
 BEGIN
       SQL

data/lib/hair_trigger/version.rb

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

data/spec/adapter_spec.rb

@@ -31,6 +31,18 @@ describe "adapter" do
 
         expect(db_triggers).to eq(triggers)
       end
+
+      it "quotes table names" do
+        conn.execute <<-SQL
+          CREATE TRIGGER foos_tr AFTER DELETE ON users
+          FOR EACH ROW
+          BEGIN
+            UPDATE groups SET bob_count = bob_count - 1;
+          END
+        SQL
+
+        expect(conn.triggers["foos_tr"]).to match(/CREATE TRIGGER foos_tr AFTER DELETE ON `users`/)
+      end
     end
 
     context "mysql" do
@@ -42,6 +54,42 @@ describe "adapter" do
       let(:adapter) { :mysql2 }
       it_behaves_like "mysql"
     end
+
+    context "postgresql" do
+      let(:adapter) { :postgresql }
+
+      it "quotes table names" do
+        conn.execute <<-SQL
+          CREATE FUNCTION foos_tr()
+          RETURNS TRIGGER AS $$
+          BEGIN
+            UPDATE groups SET bob_count = bob_count - 1;
+          END;
+          $$ LANGUAGE plpgsql;
+
+          CREATE TRIGGER foos_tr AFTER DELETE ON users
+          FOR EACH ROW EXECUTE PROCEDURE foos_tr();
+        SQL
+
+        expect(conn.triggers["foos_tr"]).to match(/CREATE TRIGGER foos_tr AFTER DELETE ON "users"/)
+      end
+    end
+
+    context "sqlite3" do
+      let(:adapter) { :sqlite3 }
+
+      it "quotes table names" do
+        conn.execute <<-SQL
+          CREATE TRIGGER foos_tr AFTER DELETE ON users
+          FOR EACH ROW
+          BEGIN
+            UPDATE groups SET bob_count = bob_count - 1;
+          END;
+        SQL
+
+        expect(conn.triggers["foos_tr"]).to match(/CREATE TRIGGER foos_tr AFTER DELETE ON "users"/)
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: easy database triggers for active record