diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-24 08:37:24 -0600 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-24 08:38:02 -0600 |
commit | 3ae76f553f03b6233e7ec1520debac09bf13612e (patch) | |
tree | 72832d36814658381833da38ba6e3bfa91ee5375 /activerecord/lib | |
parent | 44cff3045c5d98fb368e86949dd0973ee768c409 (diff) | |
parent | 871f45347778856feedf4b99c599e8acabc87ab6 (diff) | |
download | rails-3ae76f553f03b6233e7ec1520debac09bf13612e.tar.gz rails-3ae76f553f03b6233e7ec1520debac09bf13612e.tar.bz2 rails-3ae76f553f03b6233e7ec1520debac09bf13612e.zip |
Merge pull request #21697 from gdeglin/fix_returning_disabled_default_values_bug
Fix a bug with returning_disabled when using the postgresql adapter
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
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 9de79a614c..25dfda9ef8 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -761,7 +761,7 @@ module ActiveRecord end def extract_table_ref_from_insert_sql(sql) # :nodoc: - sql[/into\s+([^\(]*).*values\s*\(/im] + sql[/into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im] $1.strip if $1 end |