aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-09-25 08:27:41 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-09-25 08:30:39 +0900
commit8f037a5ab929f929fe0897edc9ecadf901c32e56 (patch)
tree03c8e46e071cee75528bea727c5046e7581c7500 /activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
parent018b16f988dfd129f5dc7091eadda8eb05cdba76 (diff)
downloadrails-8f037a5ab929f929fe0897edc9ecadf901c32e56.tar.gz
rails-8f037a5ab929f929fe0897edc9ecadf901c32e56.tar.bz2
rails-8f037a5ab929f929fe0897edc9ecadf901c32e56.zip
Extract `integer_like_primary_key_type` to ease to handle it for adapters
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
index eff96af87a..da25e4863c 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
@@ -57,17 +57,12 @@ module ActiveRecord
include ColumnMethods
def new_column_definition(name, type, **options) # :nodoc:
- if integer_like_primary_key?(type, options)
- options[:auto_increment] = true
- end
-
case type
when :virtual
type = options[:type]
when :primary_key
type = :integer
options[:limit] ||= 8
- options[:auto_increment] = true
options[:primary_key] = true
when /\Aunsigned_(?<type>.+)\z/
type = $~[:type].to_sym
@@ -81,6 +76,11 @@ module ActiveRecord
def aliased_types(name, fallback)
fallback
end
+
+ def integer_like_primary_key_type(type, options)
+ options[:auto_increment] = true
+ type
+ end
end
class Table < ActiveRecord::ConnectionAdapters::Table