diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-12 15:57:26 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-26 13:44:07 -0700 |
commit | cc468d3ec81d6f1298fca91c0549584b36dafcc6 (patch) | |
tree | 02c6e8949a86127d7ad9c08aef18be9c7a966063 /activerecord/lib/active_record/connection_adapters | |
parent | 6ceffb8178b6d419d4453e1e24d4138215c35217 (diff) | |
download | rails-cc468d3ec81d6f1298fca91c0549584b36dafcc6.tar.gz rails-cc468d3ec81d6f1298fca91c0549584b36dafcc6.tar.bz2 rails-cc468d3ec81d6f1298fca91c0549584b36dafcc6.zip |
exec returns an AR::Result
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
3 files changed, 28 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index cf67185b83..0e4f68e85c 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -3,8 +3,8 @@ module ActiveRecord module DatabaseStatements # Returns an array of record hashes with the column names as keys and # column values as values. - def select_all(sql, name = nil) - select(sql, name) + def select_all(sql, name = nil, bind_values = []) + select(sql, name, bind_values) end # Returns a record hash with the column names as keys and column values @@ -260,7 +260,7 @@ module ActiveRecord protected # Returns an array of record hashes with the column names as keys and # column values as values. - def select(sql, name = nil) + def select(sql, name = nil, bind_values = []) end undef_method :select diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index bcbef526bd..a36a182a9e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -12,6 +12,7 @@ require 'active_record/connection_adapters/abstract/connection_pool' require 'active_record/connection_adapters/abstract/connection_specification' require 'active_record/connection_adapters/abstract/query_cache' require 'active_record/connection_adapters/abstract/database_limits' +require 'active_record/result' module ActiveRecord module ConnectionAdapters # :nodoc: diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 69bf2c0dcd..75bf579764 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -50,6 +50,7 @@ module ActiveRecord def initialize(connection, logger, config) super(connection, logger) + @statements = {} @config = config end @@ -131,6 +132,27 @@ module ActiveRecord # DATABASE STATEMENTS ====================================== + def exec(sql, name = nil, bind_values = []) + log(sql, name) do + + # Don't cache statements without bind values + if bind_values.empty? + stmt = @connection.prepare(sql) + cols = stmt.columns + else + cache = @statements[sql] ||= { + :stmt => @connection.prepare(sql) + } + stmt = cache[:stmt] + cols = cache[:cols] ||= stmt.columns + stmt.reset! + stmt.bind_params bind_values.map { |col, val| val } + end + + ActiveRecord::Result.new(cols, stmt.to_a) + end + end + def execute(sql, name = nil) #:nodoc: log(sql, name) { @connection.execute(sql) } end @@ -280,8 +302,8 @@ module ActiveRecord end protected - def select(sql, name = nil) #:nodoc: - execute(sql, name).map do |row| + def select(sql, name = nil, bind_values = []) #:nodoc: + exec(sql, name, bind_values).map do |row| record = {} row.each do |key, value| record[key.sub(/^"?\w+"?\./, '')] = value if key.is_a?(String) |