Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5007

Show
Ignore:
Timestamp:
09/04/06 23:41:13 (2 years ago)
Author:
nzkoz
Message:

Rename quote to quote_value so the name can be used in AR models. #3628 [Koz]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activerecord/CHANGELOG

    r4992 r5007  
    11*SVN* 
     2 
     3* Rename AR::Base#quote so people can use that name in their models. #3628 [Koz] 
    24 
    35* Add deprecation warning for inferred foreign key. #6029 [Josh Susser] 

  • trunk/activerecord/lib/active_record/associations.rb

    r4992 r5007  
    14581458                          aliased_join_table_name, polymorphic_foreign_key, 
    14591459                          parent.aliased_table_name, parent.primary_key, 
    1460                           aliased_join_table_name, polymorphic_foreign_type, klass.quote(parent.active_record.base_class.name)] + 
     1460                          aliased_join_table_name, polymorphic_foreign_type, klass.quote_value(parent.active_record.base_class.name)] + 
    14611461                        " LEFT OUTER JOIN %s ON %s.%s = %s.%s " % [table_name_and_alias, 
    14621462                          aliased_table_name, primary_key, aliased_join_table_name, options[:foreign_key] || reflection.klass.to_s.classify.foreign_key 
    …… 
    14731473                            aliased_join_table_name, options[:foreign_key] || primary_key, 
    14741474                            aliased_table_name, "#{source_reflection.options[:as]}_type",  
    1475                             klass.quote(source_reflection.active_record.base_class.name) 
     1475                            klass.quote_value(source_reflection.active_record.base_class.name) 
    14761476                          ] 
    14771477                        else 
    …… 
    15021502                        parent.aliased_table_name, parent.primary_key, 
    15031503                        aliased_table_name, "#{reflection.options[:as]}_type", 
    1504                         klass.quote(parent.active_record.base_class.name) 
     1504                        klass.quote_value(parent.active_record.base_class.name) 
    15051505                      ] 
    15061506                    when reflection.macro == :has_one && reflection.options[:as] 
    …… 
    15101510                        parent.aliased_table_name, parent.primary_key, 
    15111511                        aliased_table_name, "#{reflection.options[:as]}_type", 
    1512                         klass.quote(reflection.active_record.base_class.name) 
     1512                        klass.quote_value(reflection.active_record.base_class.name) 
    15131513                      ] 
    15141514                    else 
    …… 
    15311531                aliased_table_name,  
    15321532                reflection.active_record.connection.quote_column_name(reflection.active_record.inheritance_column),  
    1533                 klass.quote(klass.name.demodulize)] unless klass.descends_from_active_record? 
     1533                klass.quote_value(klass.name.demodulize)] unless klass.descends_from_active_record? 
    15341534              join << "AND #{interpolate_sql(sanitize_sql(reflection.options[:conditions]))} " if reflection.options[:conditions] 
    15351535              join 

  • trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

    r4680 r5007  
    119119                else 
    120120                  if record.attributes.has_key?(column.name) 
    121                     value = @owner.send(:quote, record[column.name], column) 
     121                    value = @owner.send(:quote_value, record[column.name], column) 
    122122                    attributes[column.name] = value unless value.nil? 
    123123                  end 

  • trunk/activerecord/lib/active_record/associations/has_many_association.rb

    r4618 r5007  
    185185              @finder_sql =  
    186186                "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " +  
    187                 "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}" 
     187                "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}" 
    188188              @finder_sql << " AND (#{conditions})" if conditions 
    189189             

  • trunk/activerecord/lib/active_record/associations/has_many_through_association.rb

    r4893 r5007  
    128128          if as = reflection.options[:as] 
    129129            { "#{as}_id" => @owner.quoted_id, 
    130               "#{as}_type" => reflection.klass.quote( 
     130              "#{as}_type" => reflection.klass.quote_value( 
    131131                @owner.class.base_class.name.to_s, 
    132132                reflection.klass.columns_hash["#{as}_type"]) } 
    …… 
    165165              polymorphic_join = "AND %s.%s = %s" % [ 
    166166                @reflection.table_name, "#{@reflection.source_reflection.options[:as]}_type", 
    167                 @owner.class.quote(@reflection.through_reflection.klass.name) 
     167                @owner.class.quote_value(@reflection.through_reflection.klass.name) 
    168168              ] 
    169169            end 

  • trunk/activerecord/lib/active_record/associations/has_one_association.rb

    r3897 r5007  
    7070              @finder_sql =  
    7171                "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " +  
    72                 "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}"           
     72                "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"           
    7373            else 
    7474              @finder_sql = "#{@reflection.table_name}.#{@reflection.primary_key_name} = #{@owner.quoted_id}" 

  • trunk/activerecord/lib/active_record/base.rb

    r4819 r5007  
    524524      # that needs to list both the number of posts and comments. 
    525525      def increment_counter(counter_name, id) 
    526         update_all "#{counter_name} = #{counter_name} + 1", "#{primary_key} = #{quote(id)}" 
     526        update_all "#{counter_name} = #{counter_name} + 1", "#{primary_key} = #{quote_value(id)}" 
    527527      end 
    528528 
    529529      # Works like increment_counter, but decrements instead. 
    530530      def decrement_counter(counter_name, id) 
    531         update_all "#{counter_name} = #{counter_name} - 1", "#{primary_key} = #{quote(id)}" 
     531        update_all "#{counter_name} = #{counter_name} - 1", "#{primary_key} = #{quote_value(id)}" 
    532532      end 
    533533 
    …… 
    819819      end 
    820820 
     821 
     822      def quote_value(value, column = nil) #:nodoc: 
     823        connection.quote(value,column) 
     824      end 
     825 
    821826      def quote(value, column = nil) #:nodoc: 
    822         connection.quote(value,column) 
    823       end 
     827        connection.quote(value, column) 
     828      end 
     829      deprecate :quote 
    824830 
    825831      # Used to sanitize objects before they're used in an SELECT SQL-statement. Delegates to <tt>connection.quote</tt>. 
    …… 
    10111017        def find_one(id, options) 
    10121018          conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions] 
    1013           options.update :conditions => "#{table_name}.#{primary_key} = #{quote(id,columns_hash[primary_key])}#{conditions}" 
     1019          options.update :conditions => "#{table_name}.#{primary_key} = #{quote_value(id,columns_hash[primary_key])}#{conditions}" 
    10141020 
    10151021          # Use find_every(options).first since the primary key condition 
    …… 
    10251031        def find_some(ids, options) 
    10261032          conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions] 
    1027           ids_list   = ids.map { |id| quote(id,columns_hash[primary_key]) }.join(',') 
     1033          ids_list   = ids.map { |id| quote_value(id,columns_hash[primary_key]) }.join(',') 
    10281034          options.update :conditions => "#{table_name}.#{primary_key} IN (#{ids_list})#{conditions}" 
    10291035 
    …… 
    13861392        def sanitize_sql_hash(hash) 
    13871393          hash.collect { |attrib, value| 
    1388             "#{table_name}.#{connection.quote_column_name(attrib)} = #{quote(value)}" 
     1394            "#{table_name}.#{connection.quote_column_name(attrib)} = #{quote_value(value)}" 
    13891395          }.join(" AND ") 
    13901396        end 
    …… 
    15041510 
    15051511      def quoted_id #:nodoc: 
    1506         quote(id, column_for_attribute(self.class.primary_key)) 
     1512        quote_value(id, column_for_attribute(self.class.primary_key)) 
    15071513      end 
    15081514 
    …… 
    17681774          "UPDATE #{self.class.table_name} " + 
    17691775          "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " + 
    1770           "WHERE #{self.class.primary_key} = #{quote(id)}", 
     1776          "WHERE #{self.class.primary_key} = #{quote_value(id)}", 
    17711777          "#{self.class.name} Update" 
    17721778        ) 
    …… 
    19841990        attributes.inject({}) do |quoted, (name, value)| 
    19851991          if column = column_for_attribute(name) 
    1986             quoted[name] = quote(value, column) unless !include_primary_key && column.primary 
     1992            quoted[name] = quote_value(value, column) unless !include_primary_key && column.primary 
    19871993          end 
    19881994          quoted 
    …… 
    19911997 
    19921998      # Quote strings appropriately for SQL statements. 
     1999      def quote_value(value, column = nil) 
     2000        self.class.connection.quote(value, column) 
     2001      end 
     2002 
     2003      # Deprecated, use quote_value 
    19932004      def quote(value, column = nil) 
    19942005        self.class.connection.quote(value, column) 
    19952006      end 
    1996  
     2007      deprecate :quote 
     2008       
     2009       
    19972010      # Interpolate custom sql string in instance context. 
    19982011      # Optional record argument is meant for custom insert_sql. 

  • trunk/activerecord/lib/active_record/locking/optimistic.rb

    r4958 r5007  
    6767          UPDATE #{self.class.table_name} 
    6868          SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} 
    69           WHERE #{self.class.primary_key} = #{quote(id)} 
    70           AND #{self.class.quoted_locking_column} = #{quote(previous_value)} 
     69          WHERE #{self.class.primary_key} = #{quote_value(id)} 
     70          AND #{self.class.quoted_locking_column} = #{quote_value(previous_value)} 
    7171        end_sql 
    7272