diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-11 06:41:49 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-11 06:41:49 -0700 |
commit | 68239487bfbb467d1f7e7e33f493257e041a90a8 (patch) | |
tree | d02ef3d3edf2f1a8bb1b813dd2205b2ef0e7b683 /activerecord/lib/active_record/connection_adapters | |
parent | 536f316cd3586e63675e6aba440763b4f0deee9c (diff) | |
parent | a6d9e16e41906ce656993781d2579c4a848a83a1 (diff) | |
download | rails-68239487bfbb467d1f7e7e33f493257e041a90a8.tar.gz rails-68239487bfbb467d1f7e7e33f493257e041a90a8.tar.bz2 rails-68239487bfbb467d1f7e7e33f493257e041a90a8.zip |
Merge pull request #10172 from senny/10098_backport
Backport: Correctly parse bigint defaults in PostgreSQL
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-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 |