From 37024ce479676bbb338d4083dbc31f34a1eca893 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 7 Mar 2016 06:25:54 +0900 Subject: Dump `bigint` instead of `integer` with `limit: 8` for schema dumper Before: ```ruby create_table "big_numbers", force: :cascade do |t| t.integer "bigint_column", limit: 8 end ``` After: ```ruby create_table "big_numbers", force: :cascade do |t| t.bigint "bigint_column" end ``` --- .../active_record/connection_adapters/abstract/schema_dumper.rb | 8 ++++++-- .../active_record/connection_adapters/postgresql/schema_dumper.rb | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb index 2209874d0a..9e653cd7c4 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb @@ -57,11 +57,15 @@ module ActiveRecord private def schema_type(column) - column.type + if column.bigint? + :bigint + else + column.type + end end def schema_limit(column) - limit = column.limit + limit = column.limit unless column.bigint? limit.inspect if limit && limit != native_database_types[column.type][:limit] end 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 5cb2bbbf18..19761618cf 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb @@ -41,10 +41,6 @@ module ActiveRecord end end - def schema_limit(column) - super unless schema_type(column) == :bigserial - end - def schema_expression(column) super unless column.serial? end -- cgit v1.2.3