schema_plus_foreign_keys 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ffa8e1095bb42bec9a1caf9c6a90048964a771
-  data.tar.gz: d184941dfb77d130e6420bad3018466e984104c5
+  metadata.gz: 161f26b7a83ca42ce9fa30a6132447bbf1ca000e
+  data.tar.gz: 1393641fbdd4843d42558e12cf97d4792a9b3d18
 SHA512:
-  metadata.gz: dcac94e7194fda6a55479f573be6250191f2f1d47ed5e7c6e29c6f4c3772348fe297b8b07349a2c7abaa3c58fb294c1a6e1e232c65dbfbbd84079c71e53173d2
-  data.tar.gz: ec5104854ab13660508d486d661216e0d56bbeda754c65108eeb3b0d37be8a0ebcd46af8f216b5e68e5949dd7243eb96fb5d0db827746aa231db5af48e2d7f73
+  metadata.gz: 9b0d962d24372f0fa68a9dd6775cb930d929a3dea94a438fc689a52628b1e0d5c24eefe1aefab160137d0355ac230cf15742e27cbce8186658a96e352ad59d35
+  data.tar.gz: 2db8b15e9be4c76bdef4b356882d00abce638585fc613c258ab8d77706ddf9d41dfdf4b455b23b5e738607687e25f13498e44a606a215a807d5a9bf3abd593d6

data/.travis.yml

@@ -5,7 +5,7 @@
 ---
 sudo: false
 rvm:
-- 2.1.5
+- 2.1.8
 gemfile:
 - gemfiles/activerecord-4.2.0/Gemfile.mysql2
 - gemfiles/activerecord-4.2.0/Gemfile.postgresql
@@ -13,6 +13,9 @@ gemfile:
 - gemfiles/activerecord-4.2.1/Gemfile.mysql2
 - gemfiles/activerecord-4.2.1/Gemfile.postgresql
 - gemfiles/activerecord-4.2.1/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.6/Gemfile.mysql2
+- gemfiles/activerecord-4.2.6/Gemfile.postgresql
+- gemfiles/activerecord-4.2.6/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -102,7 +102,7 @@ constraint, they normally default to whatever the DBMS's default behavior is.
 But you can also configure a global default (e.g. in a Rails initializer):
 
 ```ruby
-SchemaPlus::ForeignKey.setup do |config|
+SchemaPlus::ForeignKeys.setup do |config|
     config.on_update = :cascade   # default is nil, meaning use default dbms behavior
     config.on_delete = :nullify   # default is nil, meaning use default dbms behavior
 end
@@ -142,13 +142,15 @@ SchemaPlus::ForeignKeys is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.1.5** with activerecord **4.2.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.8** with activerecord **4.2.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.8** with activerecord **4.2.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.8** with activerecord **4.2.6**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## History
 
+* 0.1.3 - Support aciverecord 4.2.6.  Thanks to [@btsuhako](https://github.com/SchemaPlus/schema_plus_foreign_keys/issues?q=is%3Apr+is%3Aopen+author%3Abtsuhako) and [@dholdren](https://github.com/SchemaPlus/schema_plus_foreign_keys/issues?q=is%3Apr+is%3Aopen+author%3Adholdren)
 * 0.1.2 - Handle very long names
 * 0.1.1 - Cleanup; use (new) core Migration::RenameTable stack rather than monkey patching.
 * 0.1.0 - Initial release, brought over from schema_plus 1.x via 2.0.0.pre*

data/gemfiles/activerecord-4.2.0/Gemfile.mysql2

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "mysql2"
+  gem 'mysql2', '~> 0.3.13'
 end
 
 platform :jruby do
   gem 'activerecord-jdbcmysql-adapter'
-end
+end

data/gemfiles/activerecord-4.2.1/Gemfile.mysql2

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "mysql2"
+  gem 'mysql2', '~> 0.3.13'
 end
 
 platform :jruby do
   gem 'activerecord-jdbcmysql-adapter'
-end
+end

data/gemfiles/activerecord-4.2.6/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "4.2.6"

data/gemfiles/activerecord-4.2.6/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2", '>= 0.3.18', '< 0.5'
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-4.2.6/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-4.2.6/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/table_definition.rb

@@ -67,7 +67,7 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
 
     attr_accessor :schema_plus_foreign_keys_config #:nodoc:
 
-    if ActiveRecord.version == Gem::Version.new("4.2.0")
+    if Gem::Requirement.new('= 4.2.0').satisfied_by?(::ActiveRecord.version)
       def foreign_keys
         @foreign_keys ||= []
       end
@@ -75,10 +75,14 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
       def foreign_keys_for_table(*)
         foreign_keys
       end
-    else
+    elsif Gem::Requirement.new('< 4.2.6').satisfied_by?(::ActiveRecord.version)
       def foreign_keys_for_table(table)
         foreign_keys[table] ||= []
       end
+    else
+      def foreign_keys_for_table(*)
+        foreign_keys
+      end
     end
 
     def foreign_key(*args) # (column_names, to_table, primary_key=nil, options=nil)

data/lib/schema_plus/foreign_keys/middleware/sql.rb

@@ -3,14 +3,15 @@ module SchemaPlus::ForeignKeys
     module Sql
       module Table
         def after(env)
-          foreign_keys = case ::ActiveRecord.version
-                         when Gem::Version.new("4.2.0") then env.table_definition.foreign_keys
-                         else env.table_definition.foreign_keys.values.tap { |v| v.flatten! }
+          foreign_keys = if env.table_definition.foreign_keys.is_a? Array
+                           env.table_definition.foreign_keys
+                         else
+                           env.table_definition.foreign_keys.values.tap { |v| v.flatten! }
                          end
 
           # create foreign key constraints inline in table definition
           env.sql.body = ([env.sql.body] + foreign_keys.map(&:to_sql)).join(', ')
- 
+
           # prevents AR >= 4.2.1 from emitting add_foreign_key after the table
           env.table_definition.foreign_keys.clear
         end

data/lib/schema_plus/foreign_keys/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module ForeignKeys
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/schema_dev.yml

@@ -1,8 +1,9 @@
 ruby:
-    - 2.1.5
+    - 2.1.8
 activerecord:
     - 4.2.0
     - 4.2.1
+    - 4.2.6
 db:
     - mysql2
     - sqlite3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -160,6 +160,10 @@ files:
 - gemfiles/activerecord-4.2.1/Gemfile.mysql2
 - gemfiles/activerecord-4.2.1/Gemfile.postgresql
 - gemfiles/activerecord-4.2.1/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.6/Gemfile.base
+- gemfiles/activerecord-4.2.6/Gemfile.mysql2
+- gemfiles/activerecord-4.2.6/Gemfile.postgresql
+- gemfiles/activerecord-4.2.6/Gemfile.sqlite3
 - lib/schema_plus/foreign_keys.rb
 - lib/schema_plus/foreign_keys/active_record/base.rb
 - lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract_adapter.rb