From d568fb61373074e015083ad39e0dc8168e81733b Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 9 Aug 2006 03:25:39 +0000 Subject: PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema. Closes #5280. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_record/connection_adapters/postgresql_adapter.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 94584a5ea4..d2a65fec3f 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -315,8 +315,9 @@ module ActiveRecord AND def.adsrc ~* 'nextval' end_sql end - # check for existence of . in sequence name as in public.foo_sequence. if it does not exist, join the current namespace - result.last['.'] ? [result.first, result.last] : [result.first, "#{result[1]}.#{result[2]}"] + # check for existence of . in sequence name as in public.foo_sequence. if it does not exist, return unqualified sequence + # We cannot qualify unqualified sequences, as rails doesn't qualify any table access, using the search path + [result.first, result.last] rescue nil end -- cgit v1.2.3