aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-05-18 09:34:50 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-05-18 09:34:50 -0700
commit3a5a378056ceed24c37c8834d65c1985aae56879 (patch)
tree76bb8a2854625a312e190848d1afffa2b5587694
parent66afefdd79dbde92a64c3678f9ba748948080566 (diff)
parent0cd38a4af1d6220d4a6d49b1fa901e646e28351c (diff)
downloadrails-3a5a378056ceed24c37c8834d65c1985aae56879.tar.gz
rails-3a5a378056ceed24c37c8834d65c1985aae56879.tar.bz2
rails-3a5a378056ceed24c37c8834d65c1985aae56879.zip
Merge pull request #1129 from amatsuda/pgsql_schema_query_format
on.upcase!
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 4c3fcfc70e..0a460bc086 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -821,7 +821,7 @@ module ActiveRecord
result = exec_query(<<-end_sql, 'SCHEMA').rows.first
SELECT attr.attname, seq.relname
FROM pg_class seq
- INNER JOIN pg_depend dep on seq.oid = dep.objid
+ INNER JOIN pg_depend dep ON seq.oid = dep.objid
INNER JOIN pg_attribute attr ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
WHERE seq.relkind = 'S'