schema_plus 0.4.0 → 0.4.1

data/README.rdoc

@@ -176,6 +176,7 @@ take advantage of auto-creation of foreign keys, you can re-enable it:
 == History
 
 * Recent Release notes:
+    * 0.4.1 - bug fix: don't attempt foreign key creation for t.belongs_to ... :polymorphic => true
     * 0.4.0 - add :force for create_view (suggested by greglazarev[https://github.com/greglazarev]).  cleanups by betelgeuse[https://github.com/betelgeuse]
     * 0.3.4 - bug fix: regression causing :default => false to be ignored
     * 0.3.3 - bug fix: properly handle boolean defaults in mysql

data/gemfiles/Gemfile.rails-2.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.4)
+    schema_plus (0.4.0)
       rails
       valuable
 
@@ -19,7 +19,7 @@ GEM
       activesupport (= 2.3.14)
     activesupport (2.3.14)
     diff-lcs (1.1.3)
-    multi_json (1.1.0)
+    multi_json (1.3.5)
     mysql (2.8.1)
     mysql2 (0.2.18)
     pg (0.13.2)
@@ -32,22 +32,22 @@ GEM
       activesupport (= 2.3.14)
       rake (>= 0.8.3)
     rake (0.8.7)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.1)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
     simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
-    valuable (0.9.3)
+    sqlite3 (1.3.6)
+    valuable (0.9.5)
 
 PLATFORMS
   ruby

data/gemfiles/Gemfile.rails-3.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.4)
+    schema_plus (0.4.0)
       rails
       valuable
 
@@ -41,14 +41,14 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    json (1.6.5)
+    json (1.7.3)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.5)
     mysql (2.8.1)
     mysql2 (0.2.18)
     pg (0.13.2)
@@ -75,27 +75,27 @@ GEM
     rake (0.8.7)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.1)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
     simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    valuable (0.9.3)
+    tzinfo (0.3.33)
+    valuable (0.9.5)
 
 PLATFORMS
   ruby

data/gemfiles/Gemfile.rails-3.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.4)
+    schema_plus (0.4.0)
       rails
       valuable
 
@@ -42,13 +42,13 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.5)
+    json (1.7.3)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.5)
     mysql (2.8.1)
     mysql2 (0.3.11)
     pg (0.13.2)
@@ -80,32 +80,32 @@ GEM
     rake (0.8.7)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.1)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
     simplecov-html (0.5.3)
-    sprockets (2.0.3)
+    sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    valuable (0.9.3)
+    tzinfo (0.3.33)
+    valuable (0.9.5)
 
 PLATFORMS
   ruby

data/gemfiles/Gemfile.rails-3.2.lock

@@ -1,38 +1,38 @@
 PATH
   remote: /Users/ronen/github/schema_plus
   specs:
-    schema_plus (0.3.4)
+    schema_plus (0.4.0)
       rails
       valuable
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -42,13 +42,13 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.6.5)
+    json (1.7.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.5)
     mysql (2.8.1)
     mysql2 (0.3.11)
     pg (0.13.2)
@@ -60,17 +60,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -78,32 +78,32 @@ GEM
     rake (0.8.7)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.1)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-gem-adapter (1.0.1)
       simplecov
     simplecov-html (0.5.3)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
-    valuable (0.9.3)
+    tzinfo (0.3.33)
+    valuable (0.9.5)
 
 PLATFORMS
   ruby

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

@@ -53,8 +53,8 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
   # creation was disabled at initialization in the global Config.
   #
   # SchemaPlus likewise by default automatically creates foreign key constraints for
-  # columns defined via <tt>t.references</tt>, unless the
-  # <tt>:polymorphic</tt> option is true
+  # columns defined via <tt>t.references</tt>.   However, SchemaPlus does not create
+  # foreign key constraints if the <tt>:polymorphic</tt> option is true
   #
   # Finally, the configuration for foreign keys can be overriden on a per-table
   # basis by passing Config options to Migration::ClassMethods#create_table, such as
@@ -75,6 +75,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
         alias_method_chain :initialize, :schema_plus
         alias_method_chain :column, :schema_plus
         alias_method_chain :references, :schema_plus
+        alias_method_chain :belongs_to, :schema_plus
         alias_method_chain :primary_key, :schema_plus
         alias_method_chain :to_sql, :schema_plus
       end
@@ -90,13 +91,24 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
       column(name, :primary_key, options)
     end
 
-    def references_with_schema_plus(*args)
+    # need detect :polymorphic at this level, because rails strips it out
+    # before calling #column (twice, once for _id and once for _type)
+    def references_with_schema_plus(*args) #:nodoc:
       options = args.extract_options!
       options[:references] = nil if options[:polymorphic]
       args << options
       references_without_schema_plus(*args)
     end
 
+    # need detect :polymorphic at this level, because rails strips it out
+    # before calling #column (twice, once for _id and once for _type)
+    def belongs_to_with_schema_plus(*args) #:nodoc:
+      options = args.extract_options!
+      options[:references] = nil if options[:polymorphic]
+      args << options
+      belongs_to_without_schema_plus(*args)
+    end
+
     def column_with_schema_plus(name, type, options = {}) #:nodoc:
       column_without_schema_plus(name, type, options)
       schema_plus_handle_column_options(self.name, name, options, :config => schema_plus_config)

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/migration_spec.rb

@@ -33,6 +33,11 @@ describe ActiveRecord::Migration do
       @model.should reference(:users, :id).on(:user_id)
     end
 
+    it "should not create foreign key using t.belongs_to with :polymorphic => true" do
+      create_table(@model,  :user => {:METHOD => :belongs_to, :polymorphic => true})
+      @model.should_not reference(:users, :id).on(:user_id)
+    end
+
     it "should create foreign key using t.references" do
       create_table(@model,  :user => {:METHOD => :references})
       @model.should reference(:users, :id).on(:user_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70249441590660 !ruby/object:Gem::Requirement
+  requirement: &70097168546520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249441590660
+  version_requirements: *70097168546520
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &70249441590200 !ruby/object:Gem::Requirement
+  requirement: &70097168546100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249441590200
+  version_requirements: *70097168546100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70249441589680 !ruby/object:Gem::Requirement
+  requirement: &70097168545600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70249441589680
+  version_requirements: *70097168545600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70249441589180 !ruby/object:Gem::Requirement
+  requirement: &70097168071980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249441589180
+  version_requirements: *70097168071980
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70249441588700 !ruby/object:Gem::Requirement
+  requirement: &70097168069640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249441588700
+  version_requirements: *70097168069640
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70249441588240 !ruby/object:Gem::Requirement
+  requirement: &70097168068180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249441588240
+  version_requirements: *70097168068180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70249441587820 !ruby/object:Gem::Requirement
+  requirement: &70097168067300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249441587820
+  version_requirements: *70097168067300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70249441587360 !ruby/object:Gem::Requirement
+  requirement: &70097168066460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249441587360
+  version_requirements: *70097168066460
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70249441586940 !ruby/object:Gem::Requirement
+  requirement: &70097168065260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249441586940
+  version_requirements: *70097168065260
 description: ! 'SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
   for schema definition and querying, including: enhanced and more DRY index capabilities,
   support and automation for foreign key constraints, and support for views.'
@@ -236,3 +236,4 @@ test_files:
 - spec/support/matchers/reference.rb
 - spec/support/reference.rb
 - spec/views_spec.rb
+has_rdoc: