diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-09 14:47:42 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-09 14:47:42 -0300 |
| commit | 1e92fe73522b58c353746aef30c395574ec1cdaf (patch) | |
| tree | fcb061d55759e9385ab9efec09ffb24c797c9812 /activerecord/lib | |
| parent | 5cd2beb0135faf18c978507a4be272dfc1499bb8 (diff) | |
| parent | 163df5d6a0dd6ac33fd4404867242d50274efa4a (diff) | |
| download | rails-1e92fe73522b58c353746aef30c395574ec1cdaf.tar.gz rails-1e92fe73522b58c353746aef30c395574ec1cdaf.tar.bz2 rails-1e92fe73522b58c353746aef30c395574ec1cdaf.zip | |
Merge pull request #24121 from y-yagi/use_same_to_type_object
use same name to type object
Diffstat (limited to 'activerecord/lib')
| -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 61c9628de3..6497b1cc31 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -815,7 +815,7 @@ module ActiveRecord ActiveRecord::Type.register(:bit_varying, OID::BitVarying, adapter: :postgresql) ActiveRecord::Type.register(:binary, OID::Bytea, adapter: :postgresql) ActiveRecord::Type.register(:cidr, OID::Cidr, adapter: :postgresql) - ActiveRecord::Type.register(:date_time, OID::DateTime, adapter: :postgresql) + ActiveRecord::Type.register(:datetime, OID::DateTime, adapter: :postgresql) ActiveRecord::Type.register(:decimal, OID::Decimal, adapter: :postgresql) ActiveRecord::Type.register(:enum, OID::Enum, adapter: :postgresql) ActiveRecord::Type.register(:hstore, OID::Hstore, adapter: :postgresql) |