schema_plus 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8e4b864566ead9c19844204623de10e2ab44df
-  data.tar.gz: 71de29b1196886aa34275654f2a17d7b350585c2
+  metadata.gz: 58bc995f73389eafe9656f43ae965eab34002187
+  data.tar.gz: fd1b1b12ff5357065ab3b7a256fac090e86cae75
 SHA512:
-  metadata.gz: f65586a99e11078912f78c57778a2f4f133e7b6107b992eaf1753a9b7a59bd2fd0d48ede133f5aee0b48fd2e24ea7b4d1476467bfca482c22efc54ed1d10fc74
-  data.tar.gz: 5571cc83bf774b15bccafc15550af99d4cf1ed3e80dada6d3200f757a460b496171cea0cd40b3f85d6a1445c3a0d4ad5d5c03d025ee0dcf6de9416ad304b1e8b
+  metadata.gz: 8705f479301f9506afc99e71eed8219d758461b19d301b07d22499d51af0dfda33eac4d324c99f8903802aaa61b99ccd6379ba98eaad19bbc6c737720dfb3675
+  data.tar.gz: bb3ae470aa2a9527f6ad61f7572ad484ed1ea23e526fe67fd525d17c72c2172a284ae2d4aeb1588107f1bfc5f95dc4f7c7574171e0025b2a77421602212d9750

data/.travis.yml

@@ -30,6 +30,9 @@ after_script: bundle exec rake drop_databases
 script: bundle exec rake travis
 matrix:
   exclude:
+  - rvm: jruby
+    gemfile: gemfiles/rails-3.2/Gemfile.postgresql
+    env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
   - rvm: jruby
     gemfile: gemfiles/rails-3.2/Gemfile.sqlite3
     env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Change Log
 
+## 1.8.9
+
+* Bug fix: Disable auto_create when sqlite3 implicitly copies a table (#213)
+
 ## 1.8.8
 
 * Bug fix: Postgres index creation was ignoring option `algorithm: :concurrently` (#209)

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

@@ -31,6 +31,7 @@ module SchemaPlus
             alias_method_chain :indexes, :schema_plus
             alias_method_chain :rename_table, :schema_plus
             alias_method_chain :tables, :schema_plus
+            alias_method_chain :copy_table, :schema_plus
           end
 
           if ::ActiveRecord::VERSION::MAJOR.to_i < 4
@@ -72,6 +73,17 @@ module SchemaPlus
           indexes
         end
 
+        def copy_table_with_schema_plus(*args, &block)
+          fk_override = { :auto_create => false, :auto_index => false }
+          save = Hash[fk_override.keys.collect{|key| [key, SchemaPlus.config.foreign_keys.send(key)]}]
+          begin
+            SchemaPlus.config.foreign_keys.update_attributes(fk_override)
+            copy_table_without_schema_plus(*args, &block)
+          ensure
+            SchemaPlus.config.foreign_keys.update_attributes(save)
+          end
+        end
+
         def rename_table_with_schema_plus(oldname, newname) #:nodoc:
           rename_table_without_schema_plus(oldname, newname)
           rename_indexes_and_foreign_keys(oldname, newname)

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.8.8"
+  VERSION = "1.8.9"
 end

data/schema_dev.yml

@@ -34,3 +34,6 @@ exclude:
   -
     ruby: jruby
     db: sqlite3
+  -
+    ruby: jruby
+    db: postgresql

data/spec/migration_spec.rb

@@ -685,78 +685,96 @@ describe ActiveRecord::Migration do
   end
 
 
-  context "when column is changed", :sqlite3 => :skip do
+  context "when changing a column" 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
+
+    context "without foreign keys" do
 
-      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
+      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
@@ -770,6 +788,7 @@ describe ActiveRecord::Migration do
 
   end
 
+
   context "when column is removed", :sqlite3 => :skip do
     before(:each) do
       @model = Comment

metadata

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