ghost_adapter 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea565989a793b275a4124e34beded6b11890dfd5685cdd4416d2cd7467001705
-  data.tar.gz: 6be8ceeac7032ddcd3659c987cc8f26d126b80de97ffa6b402b0b18389da5d10
+  metadata.gz: b98dc5855519562f982afa2e73b0022a1189c56d2b462eea08070fc4b67b80b1
+  data.tar.gz: b00a22d2fb5c2e72f8d863a51e66ade75e79511c04cf0f70afebc3aa5fa5d890
 SHA512:
-  metadata.gz: d953252f832533164a43886b1e70f42deff950a11ba2fb8849e5fa78a8a81a165f4de56ab19005f48dcece9919e474fa2ba8d2a233af816fa6efc1af1785bc70
-  data.tar.gz: 2adfa6264b65830d33204f88246507cca0d635e853464799501be16944c30faf8e8373a2f836ad4be44ece0e1f9510cc1cd19ea875f504353b852b91572c4ae7
+  metadata.gz: 58bfcb9d8dc770ed0568d2113370fc76978dadf7e13ce54e7fe8515f994328d0b1e38c214a428d4aa9d43e41c34b7b042212e59c7efd6eb84769a6e3fd7d4316
+  data.tar.gz: e4d18d03186582228664f3c47626fdaec83b65ef50dc96bdf056feaf2a20e7e51089be036b73740d3f68ac48e979508f398abf9ecb731c510f3721f5247fefa7

data/README.md

@@ -62,6 +62,16 @@ If you have used the rails generator, you can set the variable to a falsey value
 - "truthy" values: `[1, t, true, y, yes]`
 - "falsey" values: `[0, f, false, n, no]`
 
+### Running tests
+
+To run the tests for all versions, run this script:
+
+``` shell
+bin/test_all_versions
+```
+
+Make sure to use the appropriate Ruby version! ActiveRecord <6.0 is not compatible with Ruby 3, so specs for those versions will only run successfully in a Ruby 2 environment.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/wetransfer/ghost_adapter. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](./CODE_OF_CONDUCT.md).

data/lib/active_record/connection_adapters/mysql2_ghost_adapter.rb

@@ -18,9 +18,9 @@ module ActiveRecord
       end
 
       client = Mysql2::Client.new(config)
-      if GhostAdapter::Internal.ghost_migration_enabeld?
-        dry_run = ENV['DRY_RUN'] == '1'
-        GhostAdapter::VersionChecker.validate_executable! unless ENV['SKIP_GHOST_VERSION_CHECK'] == '1'
+      if GhostAdapter::Internal.ghost_migration_enabled?
+        dry_run = ENV.fetch('DRY_RUN', nil) == '1'
+        GhostAdapter::VersionChecker.validate_executable! unless ENV.fetch('SKIP_GHOST_VERSION_CHECK', nil) == '1'
         ConnectionAdapters::Mysql2GhostAdapter.new(client, logger, nil, config, dry_run: dry_run)
       else
         ConnectionAdapters::Mysql2Adapter.new(client, logger, nil, config)
@@ -42,16 +42,29 @@ module ActiveRecord
         @dry_run = dry_run
       end
 
-      def execute(sql, name = nil)
-        # Only ALTER TABLE statements are automatically skipped by gh-ost
-        # We need to manually skip CREATE TABLE, DROP TABLE, and
-        # INSERT/DELETE (to schema migrations) for dry runs
-        return if dry_run && should_skip_for_dry_run?(sql)
-
-        if (table, query = parse_sql(sql))
-          GhostAdapter::Migrator.execute(table, query, database, dry_run)
-        else
-          super(sql, name)
+      if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('7.0')
+        def execute(sql, name = nil, async: false)
+          # Only ALTER TABLE statements are automatically skipped by gh-ost
+          # We need to manually skip CREATE TABLE, DROP TABLE, and
+          # INSERT/DELETE (to schema migrations) for dry runs
+          return if dry_run && should_skip_for_dry_run?(sql)
+
+          if (table, query = parse_sql(sql))
+            GhostAdapter::Migrator.execute(table, query, database, dry_run)
+          else
+            super(sql, name, async: async)
+          end
+        end
+      else
+        def execute(sql, name = nil)
+          # See comment above -- some tables need to be skipped manually for dry runs
+          return if dry_run && should_skip_for_dry_run?(sql)
+
+          if (table, query = parse_sql(sql))
+            GhostAdapter::Migrator.execute(table, query, database, dry_run)
+          else
+            super(sql, name)
+          end
         end
       end
 
@@ -80,7 +93,7 @@ module ActiveRecord
         end
       else
         def add_index(table_name, column_name, options = {})
-          index_name, index_type, index_columns, _index_options = add_index_options(table_name, column_name, options)
+          index_name, index_type, index_columns, _index_options = add_index_options(table_name, column_name, **options)
 
           sql = build_add_index_sql(
             table_name, index_columns, index_name,
@@ -103,7 +116,7 @@ module ActiveRecord
       attr_reader :database, :dry_run
 
       ALTER_TABLE_PATTERN = /\AALTER\s+TABLE\W*(?<table_name>\w+)\W*(?<query>.*)$/i.freeze
-      QUERY_ALLOWABLE_CHARS = /[^0-9a-z_\s():'"{},]/i.freeze
+      QUERY_ALLOWABLE_CHARS = /[^0-9a-z_\s():'"{},`]/i.freeze
       CREATE_TABLE_PATTERN = /\Acreate\stable/i.freeze
       DROP_TABLE_PATTERN = /\Acreate\stable/i.freeze
       INSERT_SCHEMA_MIGRATION_PATTERN = /\Ainsert\sinto\s`schema_migrations`/i.freeze

data/lib/ghost_adapter/version.rb

@@ -1,3 +1,3 @@
 module GhostAdapter
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/ghost_adapter.rb

@@ -5,7 +5,7 @@ require 'active_record/connection_adapters/mysql2_ghost_adapter'
 
 require 'ghost_adapter/config'
 
-require 'ghost_adapter/railtie' if defined? ::Rails::Railtie
+require 'ghost_adapter/railtie' if defined? Rails::Railtie
 
 module GhostAdapter
   def self.config
@@ -43,8 +43,8 @@ module GhostAdapter
       @@ghost_migration_enabled = true # rubocop:disable Style/ClassVars
     end
 
-    def self.ghost_migration_enabeld?
-      env_val = ENV['GHOST_MIGRATE']&.downcase
+    def self.ghost_migration_enabled?
+      env_val = ENV.fetch('GHOST_MIGRATE', 'false').downcase
       return false if %w[0 n no f false].include?(env_val)
 
       !!@@ghost_migration_enabled || %w[1 y yes t true].include?(env_val)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghost_adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Austin C Roos
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -182,7 +182,7 @@ metadata:
   homepage_uri: https://github.com/wetransfer/ghost_adapter
   source_code_uri: https://github.com/wetransfer/ghost_adapter
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -197,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Run ActiveRecord migrations through gh-ost
 test_files: []