diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-05 14:42:03 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-05 14:42:03 -0300 |
| commit | d25e0c6f6a2764fb2605dc216e5c4b26a74f7e97 (patch) | |
| tree | 75bf9fcc5dba32c7dc0d15708dafabe9e32b963b /activerecord/lib/active_record | |
| parent | 877dfcbb6437acfd56c7ead4f9998b5b0bf82c0e (diff) | |
| parent | 661365e7ce445955996c9024b76cea84e4f31a02 (diff) | |
| download | rails-d25e0c6f6a2764fb2605dc216e5c4b26a74f7e97.tar.gz rails-d25e0c6f6a2764fb2605dc216e5c4b26a74f7e97.tar.bz2 rails-d25e0c6f6a2764fb2605dc216e5c4b26a74f7e97.zip | |
Merge pull request #10098 from subwindow/postgres_dump_bigint_default
Correctly parse bigint defaults in PostgreSQL
Conflicts:
activerecord/CHANGELOG.md
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 e34e1fc10c..bf403c3ae0 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -80,7 +80,7 @@ module ActiveRecord when /\A'(.*)'::(num|date|tstz|ts|int4|int8)range\z/m $1 # 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 |