activerecord 3.0.6.rc1 → 3.0.6.rc2

data/lib/active_record/associations/association_proxy.rb

@@ -102,7 +102,7 @@ module ActiveRecord
       # Returns the SQL string that corresponds to the <tt>:conditions</tt>
       # option of the macro, if given, or +nil+ otherwise.
       def conditions
-        @conditions ||= @reflection.options[:conditions] && interpolate_and_sanitize_sql(@reflection.options[:conditions])
+        @conditions ||= interpolate_sanitized_sql(@reflection.sanitized_conditions) if @reflection.sanitized_conditions
       end
       alias :sql_conditions :conditions
 
@@ -161,6 +161,10 @@ module ActiveRecord
           @reflection.options[:dependent]
         end
 
+        def interpolate_sanitized_sql(sql, record = nil, sanitize_klass = @reflection.klass)
+          @owner.send(:interpolate_sanitized_sql, sql, record, sanitize_klass)
+        end
+
         def interpolate_and_sanitize_sql(sql, record = nil, sanitize_klass = @reflection.klass)
           @owner.send(:interpolate_and_sanitize_sql, sql, record, sanitize_klass)
         end

data/lib/active_record/base.rb

@@ -1732,7 +1732,10 @@ MSG
 
       def interpolate_and_sanitize_sql(sql, record = nil, sanitize_klass = self.class)
         sanitized = sanitize_klass.send(:sanitize_sql, sql)
+        interpolate_sanitized_sql(sanitized, record, sanitize_klass)
+      end
 
+      def interpolate_sanitized_sql(sanitized, record = nil, sanitize_klass = self.class)
         if sanitized =~ /\#\{.*\}/
           ActiveSupport::Deprecation.warn(
             'String-based interpolation of association conditions is deprecated. Please use a ' \
@@ -1740,8 +1743,8 @@ MSG
             'should be changed to has_many :older_friends, :conditions => proc { "age > #{age}" }.'
           )
           instance_eval("%@#{sanitized.gsub('@', '\@')}@", __FILE__, __LINE__)
-        elsif sql.respond_to?(:to_proc)
-          sanitize_klass.send(:sanitize_sql, instance_exec(record, &sql))
+        elsif sanitized.respond_to?(:to_proc)
+          sanitize_klass.send(:sanitize_sql, instance_exec(record, &sanitized))
         else
           sanitized
         end

data/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 0
     TINY  = 6
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 15424071
+  hash: 15424065
   prerelease: 6
   segments: 
   - 3
   - 0
   - 6
   - rc
-  - 1
-  version: 3.0.6.rc1
+  - 2
+  version: 3.0.6.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,14 +28,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424071
+        hash: 15424065
         segments: 
         - 3
         - 0
         - 6
         - rc
-        - 1
-        version: 3.0.6.rc1
+        - 2
+        version: 3.0.6.rc2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,14 +46,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424071
+        hash: 15424065
         segments: 
         - 3
         - 0
         - 6
         - rc
-        - 1
-        version: 3.0.6.rc1
+        - 2
+        version: 3.0.6.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency