diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-11-16 10:22:21 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-11-16 10:22:21 +0100 |
| commit | 9dcf330946a8bef0a0e2fb6e6d1bb92eae62a1da (patch) | |
| tree | b40c4ee1f84dc4a8de5a0d1a70ec25e585bcf8a4 /activerecord | |
| parent | e38e0c61e9d73b3531a02c6dd44c9694f64f2c0a (diff) | |
| parent | 500eefdcd020a89b27ae67507f11fc99da919bb0 (diff) | |
| download | rails-9dcf330946a8bef0a0e2fb6e6d1bb92eae62a1da.tar.gz rails-9dcf330946a8bef0a0e2fb6e6d1bb92eae62a1da.tar.bz2 rails-9dcf330946a8bef0a0e2fb6e6d1bb92eae62a1da.zip | |
Merge pull request #22302 from kamipo/remove_not_needed_native_database_types_entries
Remove not needed `NATIVE_DATABASE_TYPES` entries
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index b6e17ad4ef..c75c9ab3b5 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -134,9 +134,7 @@ module ActiveRecord time: { name: "time" }, date: { name: "date" }, binary: { name: "blob" }, - blob: { name: "blob" }, boolean: { name: "tinyint", limit: 1 }, - bigint: { name: "bigint" }, json: { name: "json" }, } diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index ed6ab8235f..3eefab8f44 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -72,7 +72,6 @@ module ActiveRecord NATIVE_DATABASE_TYPES = { primary_key: "serial primary key", - bigserial: "bigserial", string: { name: "character varying" }, text: { name: "text" }, integer: { name: "integer" }, @@ -89,7 +88,6 @@ module ActiveRecord int8range: { name: "int8range" }, binary: { name: "bytea" }, boolean: { name: "boolean" }, - bigint: { name: "bigint" }, xml: { name: "xml" }, tsvector: { name: "tsvector" }, hstore: { name: "hstore" }, |