diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-11 13:10:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-11 13:10:20 -0700 |
| commit | 5df072d64bf24213c1eb99b3762b4fd597e28903 (patch) | |
| tree | 82ba73318e72624d91f248bfb01a475c3cfbe4b2 /activerecord/lib | |
| parent | 9ba94c8fc4e7d5577e87aca07f92c9f51f08bdba (diff) | |
| download | rails-5df072d64bf24213c1eb99b3762b4fd597e28903.tar.gz rails-5df072d64bf24213c1eb99b3762b4fd597e28903.tar.bz2 rails-5df072d64bf24213c1eb99b3762b4fd597e28903.zip | |
last insert id can never be called, so remove that code path
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 14 |
1 files changed, 3 insertions, 11 deletions
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 |