diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-03 18:32:01 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-03 18:32:01 -0300 |
| commit | 1515c4d98da3f730ef971fa5a13cad828bd9bef4 (patch) | |
| tree | 4bbaa9baa7e048f8e54bceceb144cb94157d6f5c /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | |
| parent | 03b0911cff6545c84b83c1adca0e66822c336b2e (diff) | |
| parent | f8e748b4e85996cb70a3e6f258944ad45f07a802 (diff) | |
| download | rails-1515c4d98da3f730ef971fa5a13cad828bd9bef4.tar.gz rails-1515c4d98da3f730ef971fa5a13cad828bd9bef4.tar.bz2 rails-1515c4d98da3f730ef971fa5a13cad828bd9bef4.zip | |
Merge pull request #19978 from kamipo/collation_option_support_for_postgresql
PostgreSQL: `:collation` support for string and text columns
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index ae42e8ef8d..0705c22a8c 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -387,8 +387,8 @@ module ActiveRecord end end - def new_column(name, default, sql_type_metadata = nil, null = true) - Column.new(name, default, sql_type_metadata, null) + def new_column(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation = nil) + Column.new(name, default, sql_type_metadata, null, default_function, collation) end def lookup_cast_type(sql_type) # :nodoc: |