store_base_sti_class_for_3_0 0.0.2 → 0.1.0

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "activerecord", "~> 3.0.3"
+gem "activerecord", "~> 3.0.5"
 gem "mysql2"
 
 group :development do

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.8)
+    activesupport (3.0.6)
+    arel (2.0.9)
     builder (2.1.2)
     git (1.2.5)
     i18n (0.5.0)
@@ -22,13 +22,13 @@ GEM
     mysql2 (0.2.6)
     rake (0.8.7)
     rcov (0.9.9)
-    tzinfo (0.3.24)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.3)
+  activerecord (~> 3.0.5)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   mysql2

data/README.rdoc

@@ -52,9 +52,9 @@ When changing this behavior you will have write a migration to update all of you
 
 == Notes
 
-The gem has been extracted out of https://github.com/pkmiec/rails/tree/store_base_sti_class_for_3_0_4 patch. It allows the functionality to be used in applications that include Rails as a gem.
+The gem has been originally extracted out of https://github.com/pkmiec/rails/tree/store_base_sti_class_for_3_0_4 patch. It allows the functionality to be used in applications that include Rails as a gem.
 
-I've tested this gem with Rails 3.0.3 and Rails 3.0.4. Please let me know if it works with earlier version of Rails 3.0.
+Currently, it works with Rails ~= 3.0.5.
 
 This gem will not work with Rails 3.1 as much of its ActiveRecord internals have been replaced with Arel. Similar but different changes need to be applied to Rails 3.1. Those changes will come.
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/store_base_sti_class_for_3_0.rb

@@ -123,18 +123,6 @@ module ActiveRecord
         end
       end
 
-      # Some databases impose a limit on the number of ids in a list (in Oracle its 1000)
-      # Make several smaller queries if necessary or make one query if the adapter supports it
-      def associated_records(ids)
-        # rails 3.0.4 introduced ids_in_list_limit
-        max_ids_in_a_list = (connection.respond_to?(:ids_in_list_limit) ? connection.ids_in_list_limit : nil) || ids.size
-        records = []
-        ids.each_slice(max_ids_in_a_list) do |some_ids|
-          records += yield(some_ids)
-        end
-        records
-      end
-
     end
   end
 end
@@ -150,7 +138,7 @@ module ActiveRecord
         
         case
           when @reflection.options[:finder_sql]
-            @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
+            @finder_sql = interpolate_and_sanitize_sql(@reflection.options[:finder_sql])
 
           when @reflection.options[:as]
             @finder_sql =
@@ -464,7 +452,7 @@ module ActiveRecord
 
             [through_reflection, reflection].each do |ref|
               if ref && ref.options[:conditions]
-                @join << interpolate_sql(sanitize_sql(ref.options[:conditions], aliased_table_name))
+                @join << interpolate_and_sanitize_sql(ref.options[:conditions], aliased_table_name)
               end
             end
 

data/store_base_sti_class_for_3_0.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{store_base_sti_class_for_3_0}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Kmiec"]
-  s.date = %q{2011-02-21}
+  s.date = %q{2011-04-18}
   s.description = %q{
     ActiveRecord has always stored the base class in polymorphic _type columns when using STI. This can have non-trivial
     performance implications in certain cases. This gem adds 'store_base_sti_class' configuration options which controls
@@ -55,20 +55,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.5"])
       s.add_runtime_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.5"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.5"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/test/models.rb

@@ -32,6 +32,16 @@ class Tag < ActiveRecord::Base
   
   has_many :polytaggings, :as => :polytag, :class_name => 'Tagging'
   has_many :polytagged_posts, :through => :polytaggings, :source => :taggable, :source_type => 'Post'
+
+  has_many :authors, :class_name => "Author", :finder_sql => proc {
+    <<-SQL
+      SELECT authors.* FROM authors
+        INNER JOIN posts p ON authors.id = p.author_id
+        INNER JOIN taggings tgs ON tgs.taggable_id = p.id AND tgs.taggable_type = "Post"
+        WHERE tgs.tag_id = #{self.id}
+    SQL
+  }
+
 end
 
 class SpecialTag < Tag

data/test/test_store_base_sti_class_for_3_0.rb

@@ -130,4 +130,13 @@ class TestStoreBaseStiNameFor30 < ActiveRecord::TestCase
     assert_equal post, tagging.taggable
   end
 
+  def test_finder_sql_is_supported
+    author       = Author.create!(:name => 'Bob')
+    post         = Post.create!(:title => 'Budget Forecasts Bigger 2011 Deficit', :author => author)
+    special_tag  = Tag.create!(:name => 'SpecialGeneral')
+    post.taggings.create(:tag => special_tag)
+
+    assert_equal [author], special_tag.authors
+  end
+
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Paul Kmiec
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
+date: 2011-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 13
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 5
+        version: 3.0.5
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false