aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-02-08 04:19:34 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-02-08 04:28:38 +0900
commitbf25ab9523e628c83ca4bd26a4b4d1d1ca84f723 (patch)
tree1b514258e6f8a511e2955a429f857c073abeca26 /activerecord
parent8526e9bed21a119266e886c3316d3fe10c9af5ce (diff)
downloadrails-bf25ab9523e628c83ca4bd26a4b4d1d1ca84f723.tar.gz
rails-bf25ab9523e628c83ca4bd26a4b4d1d1ca84f723.tar.bz2
rails-bf25ab9523e628c83ca4bd26a4b4d1d1ca84f723.zip
`schema_type` returns symbol rather than string
A return value of `schema_type` is used by: 1. primary key type: using as `symbol.inspect` 2. normal column type: using as `symbol.to_s` It is better to return symbol.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb6
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb4
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb6
3 files changed, 8 insertions, 8 deletions
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 a95109fdae..b1b6044e72 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
@@ -14,7 +14,7 @@ module ActiveRecord
def column_spec_for_primary_key(column)
return if column.type == :integer
- spec = { id: column.type.inspect }
+ spec = { id: schema_type(column).inspect }
spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type].include?(key) })
end
@@ -24,7 +24,7 @@ module ActiveRecord
def prepare_column_options(column)
spec = {}
spec[:name] = column.name.inspect
- spec[:type] = schema_type(column)
+ spec[:type] = schema_type(column).to_s
spec[:null] = 'false' unless column.null
if limit = schema_limit(column)
@@ -57,7 +57,7 @@ module ActiveRecord
private
def schema_type(column)
- column.type.to_s
+ column.type
end
def schema_limit(column)
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
index 9dee3172f4..ccf5b6cadc 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
@@ -12,7 +12,7 @@ module ActiveRecord
spec[:unsigned] = 'true' if column.unsigned?
return if spec.empty?
else
- spec[:id] = column.type.inspect
+ spec[:id] = schema_type(column).inspect
spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type, :null].include?(key) })
end
spec
@@ -32,7 +32,7 @@ module ActiveRecord
def schema_type(column)
if column.sql_type == 'tinyblob'
- 'blob'
+ :blob
else
super
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 cc7721ddd8..b82bdb8b0c 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
@@ -11,7 +11,7 @@ module ActiveRecord
spec[:id] = ':uuid'
spec[:default] = schema_default(column) || 'nil'
else
- spec[:id] = column.type.inspect
+ spec[:id] = schema_type(column).inspect
spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type, :null].include?(key) })
end
spec
@@ -35,9 +35,9 @@ module ActiveRecord
return super unless column.serial?
if column.bigint?
- 'bigserial'
+ :bigserial
else
- 'serial'
+ :serial
end
end