foreigner 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68267917004a48382056d76a3a0057f170089d0
-  data.tar.gz: fa071b2e0de7ff5aa27f50598a2633c12e75d744
+  metadata.gz: 6267757603fa3cc7daf2d7c9fb0cd5c3c0b5de57
+  data.tar.gz: 59ba0f7366cbfbbc9c315c6a4f3141c7ccefd887
 SHA512:
-  metadata.gz: 1ff99f300a776fbc3868614a116c375f63ce89e2cf4735890a9a01dd70085a3b9815118ac6a64005f3a1561ca9772e828441e49b7c9854b936dedd99bd8a10ac
-  data.tar.gz: ae4c8dbc8af8d9ab0b67b5bfa6b3592acb58229a1d27b4a420233e57dce7c5de6f33e5ba725ba79af9fbb5f626fef080c53e0eb72cd7bfc01010a8ed966dc497
+  metadata.gz: 0692abaca90f8bf9afe7a1b034062741d1cb6288816f7491aac15e566392121338dab6814bd94adf3dabb0a1acd0262d1f62af938cc34030947be52ca26f3736
+  data.tar.gz: 17fd7783a3127006a0a2284f4c82ea4960fd81115c6a56c9fff3a2159952cf18b8aac1f7f8da1842e8f514308f87b38c6b0acc2e3e5b4dac7421e25fab3da8b6

data/README.md

@@ -22,7 +22,7 @@ Foreigner adds two methods to migrations.
 * `add_foreign_key(from_table, to_table, options)`
 * `remove_foreign_key(from_table, options)`
 
-(Options are documented in `connection_adapters/abstract/schema_definitions.rb`):
+(Options are documented in `connection_adapters/abstract/schema_statements.rb`):
 
 For example, given the following model:
 ```ruby

data/lib/foreigner/adapter.rb

@@ -20,6 +20,15 @@ module Foreigner
       def configured_name
         @configured_name ||= ActiveRecord::Base.connection_pool.spec.config[:adapter]
       end
+
+      def safe_include(adapter_class_name, foreigner_module)
+        ActiveRecord::ConnectionAdapters.const_get(adapter_class_name).class_eval do
+          unless ancestors.include? foreigner_module
+            include foreigner_module
+          end
+        end
+      rescue
+      end
     end
   end
 end

data/lib/foreigner/connection_adapters/abstract/schema_statements.rb

@@ -32,12 +32,12 @@ module Foreigner
       #   foreign_key_exists?(:suppliers, :companies)
       #
       #   # Check a foreign key with a custom name exists
-      #   foreign_key_exists?(:suppliers, name: "fk_company_id"
+      #   foreign_key_exists?(:suppliers, name: "fk_company_id")
       #
       #   # Check a foreign key on a column
-      #   foreign_key_exists?(:suppliers, column: "company_id"
+      #   foreign_key_exists?(:suppliers, column: "company_id")
       #
-      def foreign_key_exists?(table_name, column_name, options = {})
+      def foreign_key_exists?(table_name, options)
       end
 
       # Adds a new foreign key to the +from_table+, referencing the primary key of +to_table+

data/lib/foreigner/connection_adapters/mysql2_adapter.rb

@@ -40,11 +40,5 @@ module Foreigner
   end
 end
 
-[:Mysql2Adapter, :JdbcAdapter].each do |adapter|
-  begin
-    ActiveRecord::ConnectionAdapters.const_get(adapter).class_eval do
-      include Foreigner::ConnectionAdapters::Mysql2Adapter
-    end
-  rescue
-  end
-end
+Foreigner::Adapter.safe_include :JdbcAdapter, Foreigner::ConnectionAdapters::Mysql2Adapter
+Foreigner::Adapter.safe_include :Mysql2Adapter, Foreigner::ConnectionAdapters::Mysql2Adapter

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -34,11 +34,5 @@ module Foreigner
   end
 end
 
-[:PostgreSQLAdapter, :JdbcAdapter].each do |adapter|
-  begin
-    ActiveRecord::ConnectionAdapters.const_get(adapter).class_eval do
-      include Foreigner::ConnectionAdapters::PostgreSQLAdapter
-    end
-  rescue
-  end
-end
+Foreigner::Adapter.safe_include :JdbcAdapter, Foreigner::ConnectionAdapters::PostgreSQLAdapter
+Foreigner::Adapter.safe_include :PostgreSQLAdapter, Foreigner::ConnectionAdapters::PostgreSQLAdapter

data/lib/foreigner/connection_adapters/sql2003.rb

@@ -31,16 +31,26 @@ module Foreigner
         primary_key = options[:primary_key] || "id"
         dependency = dependency_sql(options[:dependent])
 
+        proper_name = proper_table_name(to_table)
+
         sql =
           "ADD CONSTRAINT #{quote_column_name(foreign_key_name)} " +
           "FOREIGN KEY (#{quote_column_name(column)}) " +
-          "REFERENCES #{quote_table_name(ActiveRecord::Migrator.proper_table_name(to_table))}(#{primary_key})"
+          "REFERENCES #{quote_table_name(proper_name)}(#{primary_key})"
         sql << " #{dependency}" if dependency.present?
         sql << " #{options[:options]}" if options[:options]
 
         sql
       end
 
+      def proper_table_name(to_table)
+        if ActiveRecord::Migration.instance_methods(false).include? :proper_table_name
+          ActiveRecord::Migration.new.proper_table_name(to_table)
+        else
+          ActiveRecord::Migrator.proper_table_name(to_table)
+        end
+      end
+
       def remove_foreign_key(table, options)
         execute "ALTER TABLE #{quote_table_name(table)} #{remove_foreign_key_sql(table, options)}"
       end
@@ -77,4 +87,4 @@ module Foreigner
         end
     end
   end
-end
+end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreigner
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
 description: Adds helpers to migrations and dumps foreign keys to schema.rb
 email: developer@matthewhiggins.com
 executables: []
@@ -45,8 +31,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- lib/foreigner.rb
 - lib/foreigner/adapter.rb
 - lib/foreigner/connection_adapters/abstract/foreign_key_definition.rb
 - lib/foreigner/connection_adapters/abstract/schema_definitions.rb
@@ -62,7 +49,6 @@ files:
 - lib/foreigner/migration/command_recorder.rb
 - lib/foreigner/railtie.rb
 - lib/foreigner/schema_dumper.rb
-- lib/foreigner.rb
 - test/foreigner/adapter_test.rb
 - test/foreigner/connection_adapters/abstract/schema_statements_test.rb
 - test/foreigner/connection_adapters/abstract/table_definition_test.rb
@@ -82,17 +68,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: foreigner
-rubygems_version: 2.0.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Foreign Keys for Rails