From 75dc9fbac76a2da78b8d21e1ede16fea38d16564 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 11 Apr 2011 14:12:31 -0700 Subject: cache table exists queries in prepared statement cache --- .../lib/active_record/connection_adapters/postgresql_adapter.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index d76b03e80a..015d5eb646 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -637,11 +637,14 @@ module ActiveRecord def table_exists?(name) schema, table = extract_schema_and_table(name.to_s) - query(<<-SQL, 'SCHEMA').first[0].to_i > 0 + binds = [[nil, table.gsub(/(^"|"$)/,'')]] + binds << [nil, schema] if schema + + exec_query(<<-SQL, 'SCHEMA', binds).rows.first[0].to_i > 0 SELECT COUNT(*) FROM pg_tables - WHERE tablename = '#{table.gsub(/(^"|"$)/,'')}' - #{schema ? "AND schemaname = '#{schema}'" : ''} + WHERE tablename = $1 + #{schema ? "AND schemaname = $2" : ''} SQL end -- cgit v1.2.3