From 397c8ee2a9bd3e5a0113b8aaa8ccf6500a70ea77 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 3 Jul 2005 08:32:12 +0000 Subject: [PATCH] r1608@asus: jeremy | 2005-07-03 00:13:57 -0700 quoter required for column quoting git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1626 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 69c19cb1fb..e620b662fa 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1384,18 +1384,20 @@ module ActiveRecord #:nodoc: end def quoted_column_names(attributes = attributes_with_quotes) - attributes.keys.collect { |column_name| connection.quote_column_name(column_name) } - end - - def quote_columns(column_quoter, hash) - hash.inject({}) do |list, pair| - list[column_quoter.quote_column_name(pair.first)] = pair.last - list + attributes.keys.collect do |column_name| + self.class.connection.quote_column_name(column_name) end end - def quoted_comma_pair_list(column_quoter, hash) - comma_pair_list(quote_columns(column_quoter, hash)) + def quote_columns(quoter, hash) + hash.inject({}) do |quoted, (name, value)| + quoted[quoter.quote_column_name(name)] = value + quoted + end + end + + def quoted_comma_pair_list(quoter, hash) + comma_pair_list(quote_columns(quoter, hash)) end def object_from_yaml(string)