kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

r1607@asus: jeremy | 2005-07-02 23:36:52 -0700

Browse source 
Rollback MysqlAdapter#select speedup; fix add_limit_offset


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2005-07-03 08:32:07 +00:00
parent 018e12da31
commit b02776c232
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
View file

@ -174,11 +174,11 @@ module ActiveRecord
end
def add_limit_offset!(sql, options)
unless options[:limit].blank?
unless options[:offset].blank?
sql << " LIMIT #{options[:offset]}, #{options[:limit]}"
else
if options[:limit]
if options[:offset].blank?
sql << " LIMIT #{options[:limit]}"
else
sql << " LIMIT #{options[:offset]}, #{options[:limit]}"
end
end
end
@ -206,9 +206,9 @@ module ActiveRecord
@connection.query_with_result = true
result = execute(sql, name)
rows = []
#all_fields_initialized = result.fetch_fields.inject({}) { |all_fields, f| all_fields[f.name] = nil; all_fields }
#result.each_hash { |row| rows << all_fields_initialized.dup.update(row) }
result.each_hash { |row| rows << row }
all_fields_initialized = result.fetch_fields.inject({}) { |all_fields, f| all_fields[f.name] = nil; all_fields }
result.each_hash { |row| rows << all_fields_initialized.merge(row) }
#result.each_hash { |row| rows << row }
result.free
rows
end

2
activerecord/lib/active_record/locking.rb
View file

@ -34,7 +34,7 @@ module ActiveRecord
affected_rows = connection.update(<<-end_sql, "#{self.class.name} Update with optimistic locking")
UPDATE #{self.class.table_name}
SET #{quoted_comma_pair_list(attributes_with_quotes(false))}
SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))}
WHERE #{self.class.primary_key} = #{quote(id)} AND lock_version = #{quote(previous_value)}
end_sql