aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorErik Peterson <erik@subwindow.com>2013-04-04 21:06:52 -0400
committerYves Senn <yves.senn@gmail.com>2013-04-11 10:11:18 +0200
commita6d9e16e41906ce656993781d2579c4a848a83a1 (patch)
treed02ef3d3edf2f1a8bb1b813dd2205b2ef0e7b683 /activerecord/test
parent536f316cd3586e63675e6aba440763b4f0deee9c (diff)
downloadrails-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/test')
-rw-r--r--activerecord/test/cases/schema_dumper_test.rb5
-rw-r--r--activerecord/test/schema/postgresql_specific_schema.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 0a9643b7e0..629e5e0fff 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -206,6 +206,11 @@ class SchemaDumperTest < ActiveRecord::TestCase
end
if current_adapter?(:PostgreSQLAdapter)
+ def test_schema_dump_includes_bigint_default
+ output = standard_dump
+ assert_match %r{t.integer\s+"bigint_default",\s+:limit => 8,\s+:default => 0}, output
+ end
+
def test_schema_dump_includes_xml_shorthand_definition
output = standard_dump
if %r{create_table "postgresql_xml_data_type"} =~ output
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index b2c655ddcd..4f546df2eb 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -30,6 +30,7 @@ ActiveRecord::Schema.define do
char3 text default 'a text field',
positive_integer integer default 1,
negative_integer integer default -1,
+ bigint_default bigint default 0::bigint,
decimal_number decimal(3,2) default 2.78,
multiline_default text DEFAULT '--- []