schema_plus 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5b988ea47657ad4e1be912509f3d17c4c4e329
-  data.tar.gz: e4fcc4ac3d1ca3003e4a9c7fc1c0a48e687dd197
+  metadata.gz: 8356e7e431dc435c954901447ddeee24dfff4b7a
+  data.tar.gz: 4a9789ee8e6cdf5845cd6181558b267a8d368064
 SHA512:
-  metadata.gz: 4ea4f3e69dd6fd4705146b05123e7ec245414ef77de85382a5ada63bebfce065088d4447ea9f411b82444d33c94d7a9ce6ad96a76061816a7a851023a9672e8f
-  data.tar.gz: 9251ec18b5b5f416627162c4adecff472c22c82ac23076461d7b8d045f40744f246827da14580c17d5957efb45218a7b235d71ffbcc1092e1b7486a4547cc3f2
+  metadata.gz: 13e4f154b793d5c47054eacbffa293b27e2369ddc77cababec864521c67764f7867ef7be006476cbf3dc621f6ea3c2ccffd8cccd1e5254c1116653b2942bc498
+  data.tar.gz: acc74c44573cf7b6044cff3f3e25655d771109ec2e397a14dab887622aebea27b3b0bd8ae9ea47f4205e3b480f44a5db22b28df33e1d60fcfbc216dcddb75966

data/README.md

@@ -297,6 +297,10 @@ of foreign key constraints, you can re-enable it:
 
 * *nothing currently waiting to be released*
 
+### 1.4.1
+
+* Bug fixes `migration.add_references` with `polymophic: true` (issue #145 and others)
+
 ### 1.4.0
 
 * Supports jruby & mysql, thanks to [@rzenha](https://github.com/razenha)

data/gemfiles/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => File.expand_path('..', __FILE__)
+
+gem "byebug" if RUBY_VERSION > "2"

data/gemfiles/rails-3.2/Gemfile.base

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../../..', __FILE__)
 gem "rails", "~> 3.2.0"

data/gemfiles/rails-4.0/Gemfile.base

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../../..', __FILE__)
 gem "rails", "~> 4.0.0"

data/gemfiles/rails-4.1/Gemfile.base

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../../..', __FILE__)
 gem "rails", "~> 4.1.0.beta1"

data/gemfiles/rails-edge/Gemfile.base

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../../..', __FILE__)
 gem "rails", "~> 4.0.0"

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

@@ -83,6 +83,7 @@ module SchemaPlus
         # are specified simultaneously.
         #
         def add_index(table_name, column_name, options = {})
+          options = {} if options.nil?  # some callers explicitly pass options=nil
           column_name, options = [], column_name if column_name.is_a?(Hash)
           column_names = Array(column_name).compact
           if column_names.empty?

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

@@ -4,10 +4,16 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def self.included(base) #:nodoc:
       base.class_eval do
         alias_method_chain :create_table, :schema_plus
+        alias_method_chain :add_reference, :schema_plus unless ::ActiveRecord::VERSION::MAJOR.to_i < 4
         include AddIndex
       end
     end
 
+    def add_reference_with_schema_plus(table_name, ref_name, options = {}) #:nodoc:
+      options[:references] = nil if options[:polymorphic]
+      add_reference_without_schema_plus(table_name, ref_name, options)
+    end
+
     ##
     # :method: create_table
     #
@@ -76,7 +82,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       # an error.)
       #
       def add_index_with_schema_plus(table, columns, options={})
-        options.delete(:if_exists)
+        options.delete(:if_exists) if options # some callers explcitly pass options=nil
         add_index_without_schema_plus(table, columns, options)
       rescue => e
         SchemaStatements.add_index_exception_handler(self, table, columns, options, e)

data/lib/schema_plus/active_record/migration/command_recorder.rb

@@ -27,8 +27,9 @@ module SchemaPlus
         # should track it down separately and submit a patch/fix to rails
         #
         def add_reference_with_schema_plus(table_name, ref_name, options = {}) #:nodoc:
+          options[:references] = nil if options[:polymorphic]
           # which is the worse hack...?
-          if RUBY_VERSION >= "2.0.0"
+          if RUBY_VERSION >= "2.0.0" and self.delegate.respond_to? :add_reference_sql
             # .. rebinding a method from a different module?  (can't do this in ruby 1.9.3)
             ::ActiveRecord::ConnectionAdapters::SchemaStatements.instance_method(:add_reference).bind(self).call(table_name, ref_name, options)
           else

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/connections/mysql/connection.rb

@@ -14,4 +14,4 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus

data/spec/connections/mysql2/connection.rb

@@ -14,4 +14,4 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus

data/spec/connections/postgresql/connection.rb

@@ -13,4 +13,4 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus

data/spec/connections/sqlite3/connection.rb

@@ -11,5 +11,5 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection :schema_plus
 ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"

data/spec/migration_spec.rb

@@ -599,6 +599,44 @@ describe ActiveRecord::Migration do
 
     end
 
+    context "when add reference" do
+
+      before(:each) do
+        @model = Comment
+      end
+
+      it "should create foreign key" do
+        add_reference(:post) do
+          @model.should reference(:posts, :id).on(:post_id)
+        end
+      end
+
+      it "should not create a foreign_key if polymorphic" do
+        add_reference(:post, :polymorphic => true) do
+          @model.should_not reference(:posts, :id).on(:post_id)
+        end
+      end
+
+      it "should create a two-column index if polymophic and index requested" do
+        add_reference(:post, :polymorphic => true, :index => true) do
+          @model.should have_index.on([:post_id, :post_type])
+        end
+      end
+
+
+      protected
+      def add_reference(column_name, *args)
+        table = @model.table_name
+        ActiveRecord::Migration.suppress_messages do
+          ActiveRecord::Migration.add_reference(table, column_name, *args)
+          @model.reset_column_information
+          yield if block_given?
+          ActiveRecord::Migration.remove_column(table, "#{column_name}_id")
+        end
+      end
+
+    end unless ::ActiveRecord::VERSION::MAJOR.to_i < 4
+
     context "when column is changed" do
 
       before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,6 +126,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.base
 - gemfiles/rails-3.2/Gemfile.base
 - gemfiles/rails-3.2/Gemfile.mysql
 - gemfiles/rails-3.2/Gemfile.mysql2