activerecord-creating_foreign_keys 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d793ee206e5cd56d2a8ce657cdfe3c10cbc8849a
-  data.tar.gz: 7e03014b0adac230210fcb8daea1833ecaf908ae
+  metadata.gz: c06fff634cc068ec8449ca21f37777916c634d13
+  data.tar.gz: 95170d1add06402710fd566787f429c910d98849
 SHA512:
-  metadata.gz: ddf9ef6336460563a25d8990b5b7fe26c30e4c046bd1d7c1a3fb7e920510fc44bfbc0f9e10b05ad54e90e25d501c2919dcf595e4cc680719b1c09ffe979b7e9c
-  data.tar.gz: c815f7517ec76a3b113af81dc482feb2ea7b6f8f5b3cdd70b576dc61d924f6b9a1c23bb0ca502023c47c286b553fd38e36ea807f1f30ff53c8451cb6169f4114
+  metadata.gz: 3ee9f77469c020933dc6d49d46be31e83f2686cd9d64174ab55fbfd97aea4034eb3b40becd76a02cdd0fbbb3a7d67bb508491ebbb1798aeb7085100dc56cd392
+  data.tar.gz: 770f36fe2067350aa19e3f27200a1d030cd977ec23449c422f368a191fac2c46dfbf81ee559059db0843984230d32e079cc18fe24b5f78b31f108fa28ca50459

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/activerecord-creating_foreign_keys.svg)](https://badge.fury.io/rb/activerecord-creating_foreign_keys)
 [![Build Status](https://travis-ci.com/hamuyuuki/activerecord-creating_foreign_keys.svg?branch=master)](https://travis-ci.com/hamuyuuki/activerecord-creating_foreign_keys)
 [![Maintainability](https://api.codeclimate.com/v1/badges/3cac3284bb083ea1f9cd/maintainability)](https://codeclimate.com/github/hamuyuuki/activerecord-creating_foreign_keys/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/3cac3284bb083ea1f9cd/test_coverage)](https://codeclimate.com/github/hamuyuuki/activerecord-creating_foreign_keys/test_coverage)

data/lib/active_record/connection_adapters/mysql2/creating_foreign_keys/connection_specification/resolver.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Mysql2
+      module CreatingForeignKeys
+        module ConnectionSpecification
+          module Resolver
+            def spec(config)
+              connection_specification = super(config)
+
+              if connection_specification.config[:adapter] == "mysql2"
+                require "active_record/connection_adapters/mysql2/creating_foreign_keys/schema_creation"
+                require "active_record/connection_adapters/mysql2/creating_foreign_keys/schema_statements"
+
+                ActiveRecord::ConnectionAdapters::Mysql2Adapter::SchemaCreation.prepend(ActiveRecord::ConnectionAdapters::Mysql2::CreatingForeignKeys::SchemaCreation)
+                ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(ActiveRecord::ConnectionAdapters::Mysql2::CreatingForeignKeys::SchemaStatements)
+              end
+
+              connection_specification
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/mysql2/creating_foreign_keys/schema_creation.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Mysql2
+      module CreatingForeignKeys
+        module SchemaCreation
+          private
+            def visit_TableDefinition(o)
+              return super(o) if o.foreign_keys.empty?
+
+              name = o.name
+              create_sql = +"CREATE#{' TEMPORARY' if o.temporary} TABLE #{quote_table_name(name)} "
+
+              statements = o.columns.map { |c| accept c }
+              statements.concat(o.indexes.map { |column_name, options| index_in_create(name, column_name, options) })
+              statements.concat(o.foreign_keys.map { |to_table, options| foreign_key_in_create(o.name, to_table, options) })
+
+              create_sql << "(#{statements.join(', ')}) " if statements.present?
+              create_sql << "#{o.options}"
+              create_sql << " AS #{@conn.to_sql(o.as)}" if o.as
+              create_sql
+            end
+
+            def visit_ForeignKeyDefinition(o)
+              sql = +<<-SQL.strip_heredoc
+                CONSTRAINT #{quote_column_name(o.name)}
+                FOREIGN KEY (#{quote_column_name(o.column)})
+                  REFERENCES #{quote_table_name(o.to_table)} (#{quote_column_name(o.primary_key)})
+              SQL
+              sql << " #{action_sql('DELETE', o.on_delete)}" if o.on_delete
+              sql << " #{action_sql('UPDATE', o.on_update)}" if o.on_update
+              sql
+            end
+
+            def foreign_key_in_create(from_table, to_table, options)
+              options = @conn.foreign_key_options(from_table, to_table, options)
+              accept ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(from_table, to_table, options)
+            end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/mysql2/creating_foreign_keys/schema_statements.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Mysql2
+      module CreatingForeignKeys
+        module SchemaStatements
+          def create_table(table_name, options = {})
+            td = create_table_definition table_name, options[:temporary], options[:options], options[:as]
+
+            if options[:id] != false && !options[:as]
+              pk = options.fetch(:primary_key) do
+                Base.get_primary_key table_name.to_s.singularize
+              end
+
+              td.primary_key pk, options.fetch(:id, :primary_key), options
+            end
+
+            yield td if block_given?
+
+            if options[:force] && table_exists?(table_name)
+              drop_table(table_name, options)
+            end
+
+            result = execute schema_creation.accept td
+
+            unless supports_indexes_in_create?
+              td.indexes.each_pair do |column_name, index_options|
+                add_index(table_name, column_name, index_options)
+              end
+            end
+
+            result
+          end
+
+          def foreign_key_options(from_table, to_table, options) # :nodoc:
+            options = options.dup
+            options[:column] ||= foreign_key_column_for(to_table)
+            options[:name]   ||= foreign_key_name(from_table, options)
+            options
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/creating_foreign_keys.rb

@@ -3,11 +3,7 @@
 require "active_support/lazy_load_hooks"
 
 ActiveSupport.on_load(:active_record) do
-  require "active_record/creating_foreign_keys/schema_creation"
-  require "active_record/creating_foreign_keys/schema_statements"
-  # TODO: Should research the not `require` way
-  require "active_record/connection_adapters/abstract_mysql_adapter"
+  require "active_record/connection_adapters/mysql2/creating_foreign_keys/connection_specification/resolver"
 
-  ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::SchemaCreation.prepend(ActiveRecord::CreatingForeignKeys::SchemaCreation)
-  ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecord::CreatingForeignKeys::SchemaStatements)
+  ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.prepend(ActiveRecord::ConnectionAdapters::Mysql2::CreatingForeignKeys::ConnectionSpecification::Resolver)
 end

data/lib/active_record/creating_foreign_keys/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module CreatingForeignKeys
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/test/creating_foreign_keys_test.rb

@@ -38,7 +38,7 @@ class CreatingForeignKeysTest < ActiveSupport::TestCase
 
       # FIXME: this seems bad. we should probably have a better way to indicate
       # the query was cached
-      return if 'CACHE' == values[:name]
+      return if "CACHE" == values[:name]
 
       self.class.log_all << sql
       self.class.log << sql unless ignore =~ sql
@@ -46,7 +46,7 @@ class CreatingForeignKeysTest < ActiveSupport::TestCase
   end
 
   # ref: https://github.com/rails/rails/blob/4-2-stable/activerecord/test/cases/test_case.rb#L122
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+  ActiveSupport::Notifications.subscribe("sql.active_record", SQLCounter.new)
 
   # ref: https://github.com/rails/rails/blob/4-2-stable/activerecord/test/cases/test_case.rb#L49L61
   def assert_queries(num = 1, options = {})
@@ -63,6 +63,12 @@ class CreatingForeignKeysTest < ActiveSupport::TestCase
     x
   end
 
+  # ref: https://github.com/rails/rails/blob/4-2-stable/activerecord/test/cases/migration/references_foreign_key_test.rb#L7L10
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table(:testing_parents, force: true)
+  end
+
   # ref: https://github.com/rails/rails/blob/4-2-stable/activerecord/test/cases/migration/references_foreign_key_test.rb#L12L15
   #      https://github.com/rails/rails/blob/4-2-stable/activerecord/test/cases/test_case.rb#L8L10
   teardown do
@@ -71,13 +77,8 @@ class CreatingForeignKeysTest < ActiveSupport::TestCase
     SQLCounter.clear_log
   end
 
-  # ref: https://github.com/rails/rails/blob/4-2-stable/activerecord/test/cases/migration/references_foreign_key_test.rb#L7L10
-  #      https://github.com/rails/rails/pull/20009/files#diff-753b84de930c3ef1f329af181b7fd7b21957e5c022765ca81748cda3002eb58dR35-R42
+  # ref: https://github.com/rails/rails/pull/20009/files#diff-753b84de930c3ef1f329af181b7fd7b21957e5c022765ca81748cda3002eb58dR35-R42
   test "foreign keys can be created in one query with MySQL" do
-    ActiveRecord::Base.establish_connection :mysql
-    @connection = ActiveRecord::Base.connection
-    @connection.create_table(:testing_parents, force: true)
-
     assert_queries(1) do
       @connection.create_table :testings do |t|
         t.references :testing_parent, foreign_key: true

data/test/dummy/config/database.yml

@@ -1,16 +1,6 @@
-default: &default
-  database: test
-
 test:
-  <<: *default
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
-  database: db/test.sqlite3
-
-mysql:
-  <<: *default
   adapter: mysql2
+  database: test
   encoding: utf8
-  username: root
   host: <%= ENV["CI"] ? "127.0.0.1" : "mysql" %>
+  username: root

data/test/dummy/config/environments/test.rb

@@ -26,11 +26,6 @@ Rails.application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random
 

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-creating_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - hamuyuuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.2.11
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-description: "`activerecord-creating_foreign_keys` creates FOREIGN KEY Constraints
+description: "`activerecord-creating_foreign_keys` defines FOREIGN KEY Constraints
   in a CREATE TABLE Statement."
 email:
 - 13702378+hamuyuuki@users.noreply.github.com
@@ -133,9 +161,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/active_record/connection_adapters/mysql2/creating_foreign_keys/connection_specification/resolver.rb
+- lib/active_record/connection_adapters/mysql2/creating_foreign_keys/schema_creation.rb
+- lib/active_record/connection_adapters/mysql2/creating_foreign_keys/schema_statements.rb
 - lib/active_record/creating_foreign_keys.rb
-- lib/active_record/creating_foreign_keys/schema_creation.rb
-- lib/active_record/creating_foreign_keys/schema_statements.rb
 - lib/active_record/creating_foreign_keys/version.rb
 - test/creating_foreign_keys_test.rb
 - test/dummy/README.rdoc
@@ -196,7 +225,7 @@ rubyforge_project:
 rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
-summary: Create FOREIGN KEY Constraints in a CREATE TABLE Statement
+summary: Define FOREIGN KEY Constraints in a CREATE TABLE Statement
 test_files:
 - test/test_helper.rb
 - test/creating_foreign_keys_test.rb

data/lib/active_record/creating_foreign_keys/schema_creation.rb

@@ -1,36 +0,0 @@
-
-module ActiveRecord
-  module CreatingForeignKeys
-    module SchemaCreation
-      def visit_TableDefinition(o)
-        name = o.name
-        create_sql = "CREATE#{' TEMPORARY' if o.temporary} TABLE #{quote_table_name(name)} "
-
-        statements = o.columns.map { |c| accept c }
-        statements.concat(o.indexes.map { |column_name, options| index_in_create(name, column_name, options) })
-        statements.concat(o.foreign_keys.map { |to_table, options| foreign_key_in_create(o.name, to_table, options) })
-
-        create_sql << "(#{statements.join(', ')}) " if statements.present?
-        create_sql << "#{o.options}"
-        create_sql << " AS #{@conn.to_sql(o.as)}" if o.as
-        create_sql
-      end
-
-      def visit_ForeignKeyDefinition(o)
-        sql = <<-SQL.strip_heredoc
-          CONSTRAINT #{quote_column_name(o.name)}
-          FOREIGN KEY (#{quote_column_name(o.column)})
-            REFERENCES #{quote_table_name(o.to_table)} (#{quote_column_name(o.primary_key)})
-        SQL
-        sql << " #{action_sql('DELETE', o.on_delete)}" if o.on_delete
-        sql << " #{action_sql('UPDATE', o.on_update)}" if o.on_update
-        sql
-      end
-
-      def foreign_key_in_create(from_table, to_table, options)
-        options = @conn.foreign_key_options(from_table, to_table, options)
-        accept ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(from_table, to_table, options)
-      end
-    end
-  end
-end

data/lib/active_record/creating_foreign_keys/schema_statements.rb

@@ -1,41 +0,0 @@
-
-module ActiveRecord
-  module CreatingForeignKeys
-    module SchemaStatements
-      def create_table(table_name, options = {})
-        td = create_table_definition table_name, options[:temporary], options[:options], options[:as]
-
-        if options[:id] != false && !options[:as]
-          pk = options.fetch(:primary_key) do
-            Base.get_primary_key table_name.to_s.singularize
-          end
-
-          td.primary_key pk, options.fetch(:id, :primary_key), options
-        end
-
-        yield td if block_given?
-
-        if options[:force] && table_exists?(table_name)
-          drop_table(table_name, options)
-        end
-
-        result = execute schema_creation.accept td
-
-        unless supports_indexes_in_create?
-          td.indexes.each_pair do |column_name, index_options|
-            add_index(table_name, column_name, index_options)
-          end
-        end
-
-        result
-      end
-
-      def foreign_key_options(from_table, to_table, options) # :nodoc:
-        options = options.dup
-        options[:column] ||= foreign_key_column_for(to_table)
-        options[:name]   ||= foreign_key_name(from_table, options)
-        options
-      end
-    end
-  end
-end