ar-extensions 0.9.1 → 0.9.2

data/ChangeLog

@@ -1,3 +1,7 @@
+2009-07-22 zdennis <zach.dennis@gmail.com>
+
+* Forgot to push past commit of fixing #sanitize_sql method signatures to supported passing in a table_name. This satisfies the change to the ActiveRecord API in Rails commit 489abfd3b23f3c4b3de86aeb3bde3970771c001b on April 20th.
+
 2009-04-17  blythedunham  <blythedunham@gmail.com>
 
 * Added MySQL support for save, create, replace options - :ignore, :on_duplicate_key_update, :keywords, :reload, :keywords, :pre_sql, :post_sql

data/lib/ar-extensions/finders.rb

@@ -1,10 +1,6 @@
 require 'active_record/version'
 
-
-
-
 module ActiveRecord::ConnectionAdapters::Quoting
-
   alias :quote_before_arext :quote
   def quote( value, column=nil ) # :nodoc:
     if value.is_a?( Regexp )
@@ -23,26 +19,26 @@ class ActiveRecord::Base
     private
     
     alias :sanitize_sql_orig :sanitize_sql
-    def sanitize_sql( arg ) # :nodoc:
+    def sanitize_sql(arg, table_name = quoted_table_name) # :nodoc:
       return if arg.blank? # don't process arguments like [], {}, "" or nil
       if arg.respond_to?( :to_sql )
-        arg = sanitize_sql_by_way_of_duck_typing( arg )
-      elsif arg.is_a?( Hash )
-        arg = sanitize_sql_from_hash( arg ) 
+        arg = sanitize_sql_by_way_of_duck_typing(arg)
+      elsif arg.is_a?(Hash)
+        arg = sanitize_sql_from_hash(arg, table_name) 
       elsif arg.is_a?( Array ) and arg.size == 2 and arg.first.is_a?( String ) and arg.last.is_a?( Hash )
-        arg = sanitize_sql_from_string_and_hash( arg ) 
+        arg = sanitize_sql_from_string_and_hash(arg, table_name)
       end
-      sanitize_sql_orig( arg )
+      sanitize_sql_orig(arg)
     end
     
-    def sanitize_sql_by_way_of_duck_typing( arg ) #: nodoc:
+    def sanitize_sql_by_way_of_duck_typing(arg) #: nodoc:
       arg.to_sql( caller )
     end
 
-    def sanitize_sql_from_string_and_hash( arr ) # :nodoc:
+    def sanitize_sql_from_string_and_hash(arr, table_name = quoted_table_name) # :nodoc:
       return arr if arr.first =~ /\:[\w]+/
       return arr if arr.last.empty? # skip empty hash conditions, ie: :conditions => ["", {}]
-      arr2 = sanitize_sql_from_hash( arr.last )
+      arr2 = sanitize_sql_from_hash( arr.last, table_name )
       if arr2.empty?
         conditions = arr.first
       else
@@ -52,7 +48,7 @@ class ActiveRecord::Base
       conditions
     end
     
-    def sanitize_sql_from_hash( hsh ) #:nodoc:
+    def sanitize_sql_from_hash(hsh, table_name = quoted_table_name) #:nodoc:
       conditions, values = [], []
       hsh = expand_hash_conditions_for_aggregates(hsh) # introduced in Rails 2.0.2
 
@@ -61,7 +57,7 @@ class ActiveRecord::Base
           conditions << sanitize_sql_by_way_of_duck_typing( val ) 
           next
         elsif val.is_a?(Hash) # don't mess with ActiveRecord hash nested hash functionality
-          conditions << sanitize_sql_hash_for_conditions(key => val)
+          conditions << sanitize_sql_hash_for_conditions({key => val}, table_name)
         else
           sql = nil
           result = ActiveRecord::Extensions.process( key, val, self )
@@ -74,8 +70,6 @@ class ActiveRecord::Base
             if attr.include?('.')
               table_name, attr = attr.split('.', 2)
               table_name = connection.quote_table_name(table_name)
-            else
-              table_name = quoted_table_name
             end
             # ActiveRecord in 2.3.1 changed the method signature for
             # the method attribute_condition

data/lib/ar-extensions/version.rb

@@ -2,7 +2,7 @@
 module ActiveRecord # :nodoc:
   module Extensions # :nodoc: 
     module VERSION  
-      MAJOR, MINOR, REVISION = %W( 0 9 1 )
+      MAJOR, MINOR, REVISION = %W( 0 9 2 )
       STRING = [ MAJOR, MINOR, REVISION ].join( '.' )
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ar-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Zach Dennis