foreigner 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68267917004a48382056d76a3a0057f170089d0
-  data.tar.gz: fa071b2e0de7ff5aa27f50598a2633c12e75d744
+  metadata.gz: b450dcadd1e5c2ea9a317d290889057748b97d24
+  data.tar.gz: 576ad25ce8af650e1bc7277eb533f68219341bc7
 SHA512:
-  metadata.gz: 1ff99f300a776fbc3868614a116c375f63ce89e2cf4735890a9a01dd70085a3b9815118ac6a64005f3a1561ca9772e828441e49b7c9854b936dedd99bd8a10ac
-  data.tar.gz: ae4c8dbc8af8d9ab0b67b5bfa6b3592acb58229a1d27b4a420233e57dce7c5de6f33e5ba725ba79af9fbb5f626fef080c53e0eb72cd7bfc01010a8ed966dc497
+  metadata.gz: e31834038d39f1bc66234f0d7893889802c5793624e74d2b0dd076aa1e2fb2d2fbfbe968f4a0a94defd71616b75e90331ee9ccc3a53cb7df77f8b9c4758575a9
+  data.tar.gz: e1b7c552f65517cafa9ec2e2864dae07be605d4c6295f62964459f52b03ed34769fbe1820e4717cc42f2e46ba5969a68923d8bf60b578cccc6e19fd5a84e71d6

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreigner
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: foreigner
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Foreign Keys for Rails