schema_plus 2.0.0.pre14 → 2.0.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc664ffb3d969d674d13187eb4a24ed787385c6
-  data.tar.gz: 0a0b00cd17a6bad153bf9a002f3360ab5410d8e3
+  metadata.gz: 33f3e9b7a9b9bd74e21216f8f7c309556a660709
+  data.tar.gz: 00277e248e33a72fbfd052aa2124704f11a25b1b
 SHA512:
-  metadata.gz: e49e502c04c11581a525c83fe450e01fb8c59c198c91d43e857574ef99d523d093b49ad5e2d4b715124e037c8db09a679e46d5b24af55eb44b0620611618d4cc
-  data.tar.gz: 9976e6e8f318dd66b732882128922d5bb6c51dccaf530a4eb04a86135265645ab3f9acaa5184ceb1426149546b261dbb290ff633788a019a0b2f8fdfc57cbd5f
+  metadata.gz: 853671712bd6a18f8ca52dade7785d7a0450f6e4e5cd3e66f63c24e548a545f9e6feb1d308d75d79202e0d7c8ecc16971e50528d04b3c4995d6a1b687c10dd21
+  data.tar.gz: 3561d6d3cdd731354254895c81a9b800e1848164a8d47b85549c8e2a56fe56ad64518c8a091d4e1124bfa39273318a034147020fca80ceac6dba4724435d8fce

data/README.md

@@ -35,7 +35,7 @@ See detailed documentation in each gem's README.
 [![Dependency Status](https://gemnasium.com/lomba/schema_plus.svg)](https://gemnasium.com/SchemaPlus/schema_plus)
 
 
-> ## This is the README for schema_plus 2.0.0.pre14
+> ## This is the README for schema_plus 2.0.0.pre15
 > which supports Rails >= 4.2.0.  This prerelease is completely usable. It's still officially a prerelease rather than formal release because some features have yet to be migrated into their own gems.
 >  
 > For info about the 1.x releases which support Rails 3.1, 4.0, 4.1, and 4.2.0, see the [schema_plus 1.x](https://github.com/SchemaPlus/schema_plus/tree/1.x) branch

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

@@ -67,9 +67,19 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
 
     attr_accessor :schema_plus_config #:nodoc:
 
-    def foreign_keys
-      @foreign_keys ||= []
-    end if ActiveRecord.version == Gem::Version.new("4.2.0")
+    if ActiveRecord.version == Gem::Version.new("4.2.0")
+      def foreign_keys
+        @foreign_keys ||= []
+      end
+
+      def foreign_keys_for_table(*)
+        foreign_keys
+      end
+    else
+      def foreign_keys_for_table(table)
+        foreign_keys[table] ||= []
+      end
+    end
 
     def foreign_key(*args) # (column_names, to_table, primary_key=nil, options=nil)
       options = args.extract_options!
@@ -90,10 +100,7 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
       options.merge!(:column => column_names)
       options.reverse_merge!(:name => ForeignKeyDefinition.default_name(self.name, column_names))
       fk = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(self.name, AbstractAdapter.proper_table_name(to_table), options)
-      case ::ActiveRecord.version
-      when Gem::Version.new("4.2.0") then foreign_keys << fk
-      else foreign_keys[fk.to_table] = fk
-      end
+      foreign_keys_for_table(fk.to_table) << fk
       self
     end
 

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

@@ -5,7 +5,7 @@ module SchemaPlus::ForeignKeys
         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
+                         else env.table_definition.foreign_keys.values.tap { |v| v.flatten! }
                          end
 
           # create foreign key constraints inline in table definition

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre14"
+  VERSION = "2.0.0.pre15"
 end

data/spec/schema_plus_foreign_keys/migration_spec.rb

@@ -100,6 +100,14 @@ describe ActiveRecord::Migration do
       expect(@model).to reference(:users, :id).with_name("wugga")
     end
 
+    it "should allow multiple foreign keys to be made" do
+      recreate_table(@model) do |t|
+        t.integer :updater_id, :references => :users
+      end
+      expect(@model).to reference(:users, :id).on(:user_id)
+      expect(@model).to reference(:users, :id).on(:updater_id)
+    end
+
     it "should suppress foreign key" do
       recreate_table(@model) do |t|
         t.integer :member_id, :foreign_key => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre14
+  version: 2.0.0.pre15
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord