aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index a76308b63e..fbf4aa398f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -104,6 +104,7 @@ module ActiveRecord
end
def execute(sql, name = nil)
+ #log(sql, name, @connection) { |connection| connection.execute(sql) }
log(sql, name) { @connection.execute(sql) }
end
@@ -127,7 +128,9 @@ module ActiveRecord
execute(sql, name).map do |row|
record = {}
row.each_key do |key|
- record[key.sub(/\w+\./, '')] = row[key] unless key.is_a?(Fixnum)
+ if key.is_a?(String)
+ record[key.sub(/^\w+\./, '')] = row[key]
+ end
end
record
end