aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-05-02 20:15:36 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-05-04 03:53:41 +0900
commit446f2521003de3b22f65104791b4371847e43b85 (patch)
tree54a489ef346469035a14123d2732d5568248af94 /activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
parent8ce44b287f0dab4918a26aeadd0a96a671b1161c (diff)
downloadrails-446f2521003de3b22f65104791b4371847e43b85.tar.gz
rails-446f2521003de3b22f65104791b4371847e43b85.tar.bz2
rails-446f2521003de3b22f65104791b4371847e43b85.zip
Move the collation handling code from the MySQL adapter to common classes
Some databases like MySQL allow defining collation charset for specific columns.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 050b815aad..bb944c7cfd 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -169,8 +169,8 @@ module ActiveRecord
end
end
- def new_column(name, default, sql_type_metadata = nil, null = true, default_function = nil) # :nodoc:
- PostgreSQLColumn.new(name, default, sql_type_metadata, null, default_function)
+ def new_column(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation = nil) # :nodoc:
+ PostgreSQLColumn.new(name, default, sql_type_metadata, null, default_function, collation)
end
# Returns the current database name.