From 5df072d64bf24213c1eb99b3762b4fd597e28903 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 11 Apr 2011 13:10:20 -0700 Subject: last insert id can never be called, so remove that code path --- .../connection_adapters/postgresql_adapter.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 392eadb9d5..c179be828e 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -441,18 +441,10 @@ module ActiveRecord end if pk - id = select_value("#{sql} RETURNING #{quote_column_name(pk)}") - return id + select_value("#{sql} RETURNING #{quote_column_name(pk)}") + else + super end - - super - - return unless pk - - # If a pk is given, fallback to default sequence name. - # Don't fetch last insert id for a table without a pk. - sequence_name ||= "#{table}_#{pk}_seq" - last_insert_id(sequence_name) end alias :create :insert -- cgit v1.2.3