aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-02-29 20:09:55 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-03-04 23:25:50 +0900
commita449b073430b28644b4e2a5e6a1b5615c1b2d67b (patch)
tree10f601e682d70fcf7666bff1c920f1012f26890f /activerecord
parentc577657f6de64b743b12a21108dc9cc5cfc35098 (diff)
downloadrails-a449b073430b28644b4e2a5e6a1b5615c1b2d67b.tar.gz
rails-a449b073430b28644b4e2a5e6a1b5615c1b2d67b.tar.bz2
rails-a449b073430b28644b4e2a5e6a1b5615c1b2d67b.zip
Fix bigserial appears with limit 8 for schema dumper
Before: ```ruby create_table "postgresql_big_serials", force: :cascade do |t| t.bigserial "seq", limit: 8, null: false end ``` After: ```ruby create_table "postgresql_big_serials", force: :cascade do |t| t.bigserial "seq", null: false end ```
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb4
-rw-r--r--activerecord/test/cases/adapters/postgresql/serial_test.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
index 19761618cf..5cb2bbbf18 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
@@ -41,6 +41,10 @@ module ActiveRecord
end
end
+ def schema_limit(column)
+ super unless schema_type(column) == :bigserial
+ end
+
def schema_expression(column)
super unless column.serial?
end
diff --git a/activerecord/test/cases/adapters/postgresql/serial_test.rb b/activerecord/test/cases/adapters/postgresql/serial_test.rb
index 7d30db247b..2d6f1e0910 100644
--- a/activerecord/test/cases/adapters/postgresql/serial_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/serial_test.rb
@@ -26,7 +26,7 @@ class PostgresqlSerialTest < ActiveRecord::PostgreSQLTestCase
def test_schema_dump_with_shorthand
output = dump_table_schema "postgresql_serials"
- assert_match %r{t\.serial\s+"seq"}, output
+ assert_match %r{t\.serial\s+"seq",\s+null: false$}, output
end
end
@@ -55,6 +55,6 @@ class PostgresqlBigSerialTest < ActiveRecord::PostgreSQLTestCase
def test_schema_dump_with_shorthand
output = dump_table_schema "postgresql_big_serials"
- assert_match %r{t\.bigserial\s+"seq"}, output
+ assert_match %r{t\.bigserial\s+"seq",\s+null: false$}, output
end
end