schema_plus 2.0.0.pre12 → 2.0.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6212de06ef0629d376189de1d623b4ad52969b56
-  data.tar.gz: e7440ee39d1624b786e39da1245312f7ca61497f
+  metadata.gz: 097dc1df079f835526329efab67628e6b5c80998
+  data.tar.gz: 7953ae4520025b892c725a0821246c734ef685ce
 SHA512:
-  metadata.gz: 58105ec47fdea7b6460c2a5f1dad67f5e0fa16f0fc615d6a9e42def7cc83600b2ce334c76f043cb667d13f9defa27cdfdff94bf277399b99611ad30a5f98c45e
-  data.tar.gz: 88d0d8a42cfc9a95697816490acb3471e8ebdaa7f14dd956e18306ee67df90f4ec3d387696e488d669d2e1fa84415c8dd6bedcb9cf8725f26d50d6b32021fbed
+  metadata.gz: 19cfecf2e4ad25081836fd1fcb976cb111a4c0163254d65e29b4325e4a366c482423bc7657aa97b3c3d6588e6086cccdf910341dc610ca4fa8961b5456aca664
+  data.tar.gz: c1d32ccfff88705ace650204505aec9887930e0ed0df7e8f623be1e04c2d6c5142f6709b2f1eb5fb9537bed9c89abe32f6d11864b072833dfdcdd768a132ae65

data/.travis.yml

@@ -15,7 +15,7 @@ gemfile:
 - gemfiles/activerecord-4.2.1/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
-  postgresql: '9.3'
+  postgresql: '9.4'
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis

data/README.md

@@ -35,13 +35,15 @@ 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 (prelease)
-> which is under development in the master branch, and which supports Rails >= 4.2.  For info about the stable 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
+> ## This is the README for schema_plus 2.0.0.pre13
+> 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
 
 ---
 
 
-The `schema_plus` gem is a wrapper that pulls in a common collection of gems from the SchemaPlus family.   But you can feel free to mix and match to get just the gems you want.
+The `schema_plus` gem is a wrapper that pulls in a common collection of gems from the SchemaPlus family.   But you can feel free to ignore this gem and mix and match to get just the gems you want.
 
 Note: Prior to version 2.0, `schema_plus` was a single monolothic gem that implemented in itself all the features that are now included by the wrapper.
 

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

@@ -82,7 +82,7 @@ module SchemaPlus::ForeignKeys
           val_or_array = -> val { val.is_a?(Array) ? "[#{val.map(&:inspect).join(', ')}]" : val.inspect }
 
           dump << ", column: #{val_or_array.call self.column}" unless column
-          dump << ", primary_key: #{val_or_array.call self.column}" if custom_primary_key?
+          dump << ", primary_key: #{val_or_array.call self.primary_key}" if custom_primary_key?
           dump << ", name: #{name.inspect}" if name
           dump << ", on_update: #{on_update.inspect}" if on_update
           dump << ", on_delete: #{on_delete.inspect}" if on_delete

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

@@ -18,6 +18,17 @@ module SchemaPlus::ForeignKeys
           rename_foreign_keys(oldname, newname)
         end
 
+        def copy_table(*args, &block)
+          fk_override = { :auto_create => false, :auto_index => false }
+          save = Hash[fk_override.keys.collect{|key| [key, SchemaPlus::ForeignKeys.config.send(key)]}]
+          begin
+            SchemaPlus::ForeignKeys.config.update_attributes(fk_override)
+            super
+          ensure
+            SchemaPlus::ForeignKeys.config.update_attributes(save)
+          end
+        end
+
         def add_foreign_key(table_name, to_table, options = {})
           raise NotImplementedError, "Sqlite3 does not support altering a table to add foreign key constraints (table #{table_name.inspect} to #{to_table.inspect})"
         end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre12"
+  VERSION = "2.0.0.pre13"
 end

data/spec/schema_plus_foreign_keys/migration_spec.rb

@@ -567,78 +567,96 @@ describe ActiveRecord::Migration do
   end
 
 
-  context "when column is changed", :sqlite3 => :skip do
+  context "when column is changed" do
 
     before(:each) do
       @model = Comment
     end
 
-    it "should create foreign key" do
-      change_column :user, :string, :foreign_key => { :references => [:users, :login] }
-      expect(@model).to reference(:users, :login).on(:user)
-    end
-
-    context "and initially references to users table" do
+    context "with foreign keys", :sqlite3 => :skip do
 
-      before(:each) do
-        recreate_table @model do |t|
-          t.integer :user_id
-        end
+      it "should create foreign key" do
+        change_column :user, :string, :foreign_key => { :references => [:users, :login] }
+        expect(@model).to reference(:users, :login).on(:user)
       end
 
-      it "should have foreign key" do
-        expect(@model).to reference(:users)
-      end
+      context "and initially references to users table" do
 
-      it "should drop foreign key if it is no longer valid" do
-        change_column :user_id, :integer, :foreign_key => { :references => :members }
-        expect(@model).not_to reference(:users)
-      end
+        before(:each) do
+          recreate_table @model do |t|
+            t.integer :user_id
+          end
+        end
 
-      it "should drop foreign key if requested to do so" do
-        change_column :user_id, :integer, :foreign_key => { :references => nil }
-        expect(@model).not_to reference(:users)
-      end
+        it "should have foreign key" do
+          expect(@model).to reference(:users)
+        end
 
-      it "should remove auto-created index if foreign key is removed" do
-        expect(@model).to have_index.on(:user_id)  # sanity check that index was auto-created
-        change_column :user_id, :integer, :foreign_key => { :references => nil }
-        expect(@model).not_to have_index.on(:user_id)
-      end
+        it "should drop foreign key if it is no longer valid" do
+          change_column :user_id, :integer, :foreign_key => { :references => :members }
+          expect(@model).not_to reference(:users)
+        end
 
-      it "should reference pointed table afterwards if new one is created" do
-        change_column :user_id, :integer, :foreign_key => { :references => :members }
-        expect(@model).to reference(:members)
-      end
+        it "should drop foreign key if requested to do so" do
+          change_column :user_id, :integer, :foreign_key => { :references => nil }
+          expect(@model).not_to reference(:users)
+        end
 
-      it "should maintain foreign key if it's unaffected by change" do
-        change_column :user_id, :integer, :default => 0
-        expect(@model).to reference(:users)
-      end
+        it "should remove auto-created index if foreign key is removed" do
+          expect(@model).to have_index.on(:user_id)  # sanity check that index was auto-created
+          change_column :user_id, :integer, :foreign_key => { :references => nil }
+          expect(@model).not_to have_index.on(:user_id)
+        end
 
-      it "should maintain foreign key if it's unaffected by change, even if auto_index is off" do
-        with_fk_config(:auto_create => false) do
+        it "should reference pointed table afterwards if new one is created" do
+          change_column :user_id, :integer, :foreign_key => { :references => :members }
+          expect(@model).to reference(:members)
+        end
+
+        it "should maintain foreign key if it's unaffected by change" do
           change_column :user_id, :integer, :default => 0
           expect(@model).to reference(:users)
         end
+
+        it "should maintain foreign key if it's unaffected by change, even if auto_index is off" do
+          with_fk_config(:auto_create => false) do
+            change_column :user_id, :integer, :default => 0
+            expect(@model).to reference(:users)
+          end
+        end
+
       end
 
-    end
+      context "if column defined without foreign key but with index" do
+        before(:each) do
+          recreate_table @model do |t|
+            t.integer :user_id, :foreign_key => false, :index => true
+          end
+        end
 
-    context "if column defined without foreign key but with index" do
-      before(:each) do
-        recreate_table @model do |t|
-          t.integer :user_id, :foreign_key => false, :index => true
+        it "should create the index" do
+          expect(@model).to have_index.on(:user_id)
         end
-      end
 
-      it "should create the index" do
-        expect(@model).to have_index.on(:user_id)
+        it "adding foreign key should not fail due to attempt to auto-create existing index" do
+          expect { change_column :user_id, :integer, :foreign_key => true }.to_not raise_error
+        end
       end
+    end
 
-      it "adding foreign key should not fail due to attempt to auto-create existing index" do
-        expect { change_column :user_id, :integer, :foreign_key => true }.to_not raise_error
+    context "without foreign keys" do
+
+      it "doesn't auto-add foreign keys" do
+        recreate_table @model do |t|
+          t.integer :user_id, :foreign_key => false
+          t.string :other_column
+        end
+        with_fk_auto_create do
+          change_column :other_column, :text
+        end
+        expect(@model).to_not reference(:users)
       end
+
     end
 
     protected

data/spec/schema_plus_foreign_keys/schema_dumper_spec.rb

@@ -14,7 +14,7 @@ describe "Schema dump" do
         create_table :users, :force => true do |t|
           t.string :login
           t.datetime :deleted_at
-          t.integer :first_post_id
+          t.integer :first_post_id, index: { unique: true }
         end
 
         create_table :posts, :force => true do |t|
@@ -59,6 +59,13 @@ describe "Schema dump" do
     end
   end
 
+  it "should respect foreign key's primary key" do
+    with_foreign_key Post, :user_id, :users, :first_post_id do
+      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*primary_key: "first_post_id"})
+    end
+  end
+
+
   it "should include foreign_key exactly once" do
     with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
       expect(dump_posts.scan(/foreign_key.*yippee"/).length).to eq 1
@@ -212,7 +219,7 @@ describe "Schema dump" do
           t.column column.name, column.type
         end
         columnsets.each do |columns, referenced_table_name, referenced_columns, options|
-          t.foreign_key columns, referenced_table_name, (options||{}).merge(column: referenced_columns)
+          t.foreign_key columns, referenced_table_name, (options||{}).merge(primary_key: referenced_columns)
         end
       end
     end

metadata

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