hairtrigger 0.2.25 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0537ad012af8bad34a62b81241c8517ac38fabeae279954e3e27ecc86e89cc9a
-  data.tar.gz: fe75190bc7fb5b8d2956929f5e72d2b48b0dbc81b5bdd27eac6fd48ccedf81cb
+  metadata.gz: adffb212907d4617f9ed63b3bbed32f0f4c8e7113e50284eb560a2e9ac0f24cb
+  data.tar.gz: a437870c199e11d4264e496ac45ff6d6f61593e80b9082bc8bf320de33bd0b84
 SHA512:
-  metadata.gz: f8df4419131442b648d2ed1a8315281e5d289638a228cf112882faacbcc27ebf5ca136474d1bf34d2b84e920187b23ec42365de67d1856112aa2449413571b52
-  data.tar.gz: 97193387286d4ed659612eca3d4d4a3266965f259a95c15494a627e494904d7a48c3b40a705455400aa5fb65bb90219a1485fd5494d8f006b472e8ac690eca6e
+  metadata.gz: cf089ae92b9427a39243f6c096c44eab7ea4d41e7e6bec757781ba2d9b5ebef09683b2528e8ce39c2c28b15919149b82461bd2edcef4d662161a28a52c24671f
+  data.tar.gz: 83c64e0d188cfc45a6ffb701e6f5ee56350d4b636eaaa106405d545731563cc3751e792eecd6eefc1f4d534fdfd31369099e8a9875cec63082ce91d6d753118a

data/README.md

@@ -202,6 +202,15 @@ you need to actually implement `up`/`down` methods in your migration
 (rather than `change`) so that it does the right thing when
 rolling back.
 
+The `drop_trigger` currently only supports the `drop_trigger(name, table, options = {})`
+format. You will need to determine what the resulting trigger name is (e.g. `SHOW TRIGGERS`
+query) and use that name in the `drop_triggers` call. Your `down` migration method
+might contain something like:
+
+```ruby
+drop_trigger(:users_after_insert_row_tr, :transactions)
+```
+
 #### Manual triggers and :compatibility
 
 As bugs are fixed and features are implemented in HairTrigger, it's possible

data/lib/hair_trigger/adapter.rb

@@ -31,7 +31,7 @@ module HairTrigger
           select_rows("SELECT name, sql FROM sqlite_master WHERE type = 'trigger' #{name_clause ? " AND name " + name_clause : ""}").each do |(name, definition)|
             triggers[name] = quote_table_name_in_trigger(definition) + ";\n"
           end
-        when :mysql
+        when :mysql, :trilogy
           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)
@@ -48,7 +48,7 @@ FOR EACH ROW
               SELECT tgfoid
               FROM pg_trigger
               WHERE NOT tgisinternal AND tgconstrrelid = 0 AND tgrelid IN (
-                SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
+                SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '#{HairTrigger.pg_schema}')
               )
             )
           SQL
@@ -57,9 +57,9 @@ FOR EACH ROW
             SELECT tgname::varchar, pg_get_triggerdef(oid, true)
             FROM pg_trigger
             WHERE NOT tgisinternal AND tgconstrrelid = 0 AND tgrelid IN (
-              SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
+              SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '#{HairTrigger.pg_schema}')
             )
-            
+
             #{name_clause ? " AND tgname::varchar " + name_clause : ""}
             UNION
             SELECT proname || '()', pg_get_functiondef(oid)

data/lib/hair_trigger/builder.rb

@@ -162,7 +162,7 @@ module HairTrigger
     chainable_methods :name, :on, :for_each, :before, :after, :where, :security, :timing, :events, :all, :nowrap, :of, :declare
 
     def create_grouped_trigger?
-      adapter_name == :mysql
+      adapter_name == :mysql || adapter_name == :trilogy
     end
 
     def prepare!
@@ -224,7 +224,7 @@ module HairTrigger
         [case adapter_name
           when :sqlite
             generate_trigger_sqlite
-          when :mysql
+          when :mysql, :trilogy
             generate_trigger_mysql
           when :postgresql, :postgis
             generate_trigger_postgresql
@@ -407,7 +407,7 @@ module HairTrigger
 
     def generate_drop_trigger
       case adapter_name
-        when :sqlite, :mysql
+        when :sqlite, :mysql, :trilogy
           "DROP TRIGGER IF EXISTS #{prepared_name};\n"
         when :postgresql, :postgis
           "DROP TRIGGER IF EXISTS #{prepared_name} ON #{adapter.quote_table_name(options[:table])};\nDROP FUNCTION IF EXISTS #{adapter.quote_table_name(prepared_name)}();\n"

data/lib/hair_trigger/version.rb

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

data/lib/hair_trigger.rb

@@ -13,7 +13,7 @@ module HairTrigger
   autoload :MigrationReader, 'hair_trigger/migration_reader'
 
   class << self
-    attr_writer :model_path, :schema_rb_path, :migration_path
+    attr_writer :model_path, :schema_rb_path, :migration_path, :pg_schema
 
     def current_triggers
       # see what the models say there should be
@@ -39,19 +39,14 @@ module HairTrigger
     end
 
     def migrator
-      version = ActiveRecord::VERSION::STRING
-      if version >= "6.0."
+      if ActiveRecord::VERSION::STRING >= "7.1."
+        connection = ActiveRecord::Tasks::DatabaseTasks.migration_connection
+        schema_migration = connection.schema_migration
+        migrations = ActiveRecord::MigrationContext.new(migration_path, schema_migration).migrations
+        ActiveRecord::Migrator.new(:up, migrations, schema_migration, ActiveRecord::InternalMetadata.new(connection))
+      else
         migrations = ActiveRecord::MigrationContext.new(migration_path, ActiveRecord::SchemaMigration).migrations
-      elsif version >= "5.2."
-        migrations = ActiveRecord::MigrationContext.new(migration_path).migrations
-      else # version >= "4.0."
-        migrations = ActiveRecord::Migrator.migrations(migration_path)
-      end
-
-      if version >= "6.0."
         ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration)
-      else
-        ActiveRecord::Migrator.new(:up, migrations)
       end
     end
 
@@ -82,7 +77,7 @@ module HairTrigger
       if previous_schema = (options.has_key?(:previous_schema) ? options[:previous_schema] : File.exist?(schema_rb_path) && File.read(schema_rb_path))
         base_triggers = MigrationReader.get_triggers(previous_schema, options)
         unless base_triggers.empty?
-          version = (previous_schema =~ /ActiveRecord::Schema\.define\(.*?(\d+)\)/) && $1.to_i
+          version = (previous_schema =~ /ActiveRecord::Schema(\[\d\.\d\])?\.define\(version\: (.*)\)/) && $2.to_i
           migrations.unshift [OpenStruct.new({:version => version}), base_triggers]
         end
       end
@@ -200,8 +195,16 @@ end
       "#{migration_base_name}#{name_version}"
     end
 
+    def timestamped_migrations
+      if ActiveRecord::VERSION::STRING >= "7.0."
+        ActiveRecord.timestamped_migrations
+      else
+        ActiveRecord::Base.timestamped_migrations
+      end
+    end
+
     def infer_migration_version(migration_name)
-      ActiveRecord::Base.timestamped_migrations ?
+      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}.
@@ -220,6 +223,10 @@ end
       @migration_path ||= 'db/migrate'
     end
 
+    def pg_schema
+      @pg_schema ||= 'public'
+    end
+
     def adapter_name_for(adapter)
       adapter.adapter_name.downcase.sub(/\d$/, '').to_sym
     end

data/lib/tasks/hair_trigger.rake

@@ -11,13 +11,46 @@ namespace :db do
   namespace :schema do
     desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
     task :dump => :environment do
+      next unless ActiveRecord::Base.schema_format == :ruby
+
       require 'active_record/schema_dumper'
-      filename = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
-      ActiveRecord::SchemaDumper.previous_schema = File.exist?(filename) ? File.read(filename) : nil
-      File.open(filename, "w") do |file|
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+
+      databases = ActiveRecord::Tasks::DatabaseTasks.setup_initial_database_yaml
+
+      ActiveRecord::Tasks::DatabaseTasks.for_each(databases) do |name|
+        db_config = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: name)
+        connection_pool = ActiveRecord::Base.establish_connection(db_config)
+
+        filename = dump_filename(db_config.name)
+        ActiveRecord::SchemaDumper.previous_schema = File.exist?(filename) ? File.read(filename) : nil
+
+        File.open(filename, "w") do |file|
+          ActiveRecord::SchemaDumper.dump(connection_pool.connection, file)
+        end
       end
+
       Rake::Task["db:schema:dump"].reenable
     end
+
+    def schema_file_type(format)
+      case format
+        when :ruby
+          "schema.rb"
+        when :sql
+          "structure.sql"
+      end
+    end
+
+    # code adopted from activerecord/lib/active_record/tasks/database_tasks.rb#L441
+    def dump_filename(db_config_name)
+      format = ActiveRecord::Base.schema_format
+      filename = if ActiveRecord::Base.configurations.primary?(db_config_name)
+                   schema_file_type(format)
+                 else
+                   "#{db_config_name}_#{schema_file_type(format)}"
+                 end
+
+      ENV["SCHEMA"] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, filename)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hairtrigger
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 1.1.0
 platform: ruby
 authors:
 - Jon Jensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -83,7 +83,7 @@ homepage: http://github.com/jenseng/hair_trigger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,15 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: easy database triggers for active record
 test_files: []