aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-03-28 15:27:37 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-03-28 15:27:37 -0700
commite1a5007207b8bd9e91711428acc3104f4c8e8fb8 (patch)
tree4e2b71fe8d81e991046587fcd7fd69a3675175b0 /activerecord/lib/active_record/connection_adapters
parentfb215110401c70cfc7013c6e2ad5753fa4e374e9 (diff)
downloadrails-e1a5007207b8bd9e91711428acc3104f4c8e8fb8.tar.gz
rails-e1a5007207b8bd9e91711428acc3104f4c8e8fb8.tar.bz2
rails-e1a5007207b8bd9e91711428acc3104f4c8e8fb8.zip
sql logger ignores schema statements
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index ae61d6ce94..32229a8410 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -222,7 +222,7 @@ module ActiveRecord
# SCHEMA STATEMENTS ========================================
- def tables(name = nil) #:nodoc:
+ def tables(name = 'SCHEMA') #:nodoc:
sql = <<-SQL
SELECT name
FROM sqlite_master
@@ -350,7 +350,7 @@ module ActiveRecord
end
def table_structure(table_name)
- structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})").to_hash
+ structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", 'SCHEMA').to_hash
raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
structure
end