diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-12-02 13:37:28 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-12-02 13:37:28 +0100 |
| commit | c7e192c7737c25a73838d65aae171016504e4e0a (patch) | |
| tree | a680f1fe3e9498056ea401860ad103ec3ec8c99d /activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |
| parent | 780269c7326572e1f7cfa2f1a3e911de292dc373 (diff) | |
| parent | 9e4ed2f996d8dd7eaac0399f4efb5ce58aa593f8 (diff) | |
| download | rails-c7e192c7737c25a73838d65aae171016504e4e0a.tar.gz rails-c7e192c7737c25a73838d65aae171016504e4e0a.tar.bz2 rails-c7e192c7737c25a73838d65aae171016504e4e0a.zip | |
Merge pull request #17576 from senny/native_database_types
no need to pass native_database_types around
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index fd3232e902..3a60de1f28 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -127,7 +127,7 @@ module ActiveRecord # Adds +:array+ option to the default set provided by the # AbstractAdapter - def prepare_column_options(column, types) # :nodoc: + def prepare_column_options(column) # :nodoc: spec = super spec[:array] = 'true' if column.respond_to?(:array) && column.array spec[:default] = "\"#{column.default_function}\"" if column.default_function |