diff options
| author | Erik Peterson <erik@subwindow.com> | 2013-04-04 21:06:52 -0400 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-04-11 10:11:18 +0200 |
| commit | a6d9e16e41906ce656993781d2579c4a848a83a1 (patch) | |
| tree | d02ef3d3edf2f1a8bb1b813dd2205b2ef0e7b683 /activerecord/lib/active_record | |
| parent | 536f316cd3586e63675e6aba440763b4f0deee9c (diff) | |
| download | rails-a6d9e16e41906ce656993781d2579c4a848a83a1.tar.gz rails-a6d9e16e41906ce656993781d2579c4a848a83a1.tar.bz2 rails-a6d9e16e41906ce656993781d2579c4a848a83a1.zip | |
Correctly parse bigint defaults in PostgreSQL, Backpost #10098.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
activerecord/test/cases/schema_dumper_test.rb
Diffstat (limited to 'activerecord/lib/active_record')
| -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 cbbb195458..04de08e876 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -142,7 +142,7 @@ module ActiveRecord when NilClass nil # Numeric types - when /\A\(?(-?\d+(\.\d*)?\)?)\z/ + when /\A\(?(-?\d+(\.\d*)?\)?(::bigint)?)\z/ $1 # Character types when /\A\(?'(.*)'::.*\b(?:character varying|bpchar|text)\z/m |