aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorErik Peterson <erik@subwindow.com>2013-04-04 21:06:52 -0400
committerErik Peterson <erik@subwindow.com>2013-04-05 09:37:08 -0400
commit661365e7ce445955996c9024b76cea84e4f31a02 (patch)
tree2fd37d4d3bbe0d6cf4c010eb3bc63c5da1b93ec3 /activerecord/lib/active_record
parentdce398d579e484ff64a0260cea4591ad952dc99c (diff)
downloadrails-661365e7ce445955996c9024b76cea84e4f31a02.tar.gz
rails-661365e7ce445955996c9024b76cea84e4f31a02.tar.bz2
rails-661365e7ce445955996c9024b76cea84e4f31a02.zip
Correctly parse bigint defaults in PostgreSQL
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
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