diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-21 09:24:39 -0600 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-21 10:12:31 -0600 |
commit | 22cc2b86f790b08bf58311bb6eb3bb148cb1dea9 (patch) | |
tree | 0e38c2f374aba0fde84391a286c6b74e130208af /activerecord/lib/active_record/type.rb | |
parent | e467deb6c66d9b45a0c596706284c140f8e1f1b3 (diff) | |
download | rails-22cc2b86f790b08bf58311bb6eb3bb148cb1dea9.tar.gz rails-22cc2b86f790b08bf58311bb6eb3bb148cb1dea9.tar.bz2 rails-22cc2b86f790b08bf58311bb6eb3bb148cb1dea9.zip |
Various stylistic nitpicks
We do not need to require each file from AM individually, the type
module does that for us. Even if the classes are extremely small right
now, I'd rather keep any custom classes needed by AR in their own files,
as they can easily have more complex changes in the future.
Diffstat (limited to 'activerecord/lib/active_record/type.rb')
-rw-r--r-- | activerecord/lib/active_record/type.rb | 56 |
1 files changed, 16 insertions, 40 deletions
diff --git a/activerecord/lib/active_record/type.rb b/activerecord/lib/active_record/type.rb index 5b089d66a0..28ab07e868 100644 --- a/activerecord/lib/active_record/type.rb +++ b/activerecord/lib/active_record/type.rb @@ -1,24 +1,12 @@ -require 'active_model/type/helpers' -require 'active_model/type/value' - -require 'active_model/type/big_integer' -require 'active_model/type/binary' -require 'active_model/type/boolean' -require 'active_model/type/date' -require 'active_model/type/date_time' -require 'active_model/type/decimal' -require 'active_model/type/decimal_without_scale' -require 'active_model/type/float' -require 'active_model/type/integer' -require 'active_model/type/string' -require 'active_model/type/text' -require 'active_model/type/time' -require 'active_model/type/unsigned_integer' - -require 'active_model/type/registry' +require 'active_model/type' require 'active_record/type/internal/abstract_json' require 'active_record/type/internal/timezone' + +require 'active_record/type/date' +require 'active_record/type/date_time' +require 'active_record/type/time' + require 'active_record/type/serialized' require 'active_record/type/adapter_specific_registry' @@ -56,29 +44,17 @@ module ActiveRecord end end - class Date < ActiveModel::Type::Date - include Internal::Timezone - end - - class DateTime < ActiveModel::Type::DateTime - include Internal::Timezone - end - class Time < ActiveModel::Type::Time - include Internal::Timezone - end - - Helpers = ActiveModel::Type::Helpers - BigInteger = ActiveModel::Type::BigInteger - Binary = ActiveModel::Type::Binary - Boolean = ActiveModel::Type::Boolean - Decimal = ActiveModel::Type::Decimal + BigInteger = ActiveModel::Type::BigInteger + Binary = ActiveModel::Type::Binary + Boolean = ActiveModel::Type::Boolean + Decimal = ActiveModel::Type::Decimal DecimalWithoutScale = ActiveModel::Type::DecimalWithoutScale - Float = ActiveModel::Type::Float - Integer = ActiveModel::Type::Integer - String = ActiveModel::Type::String - Text = ActiveModel::Type::Text - UnsignedInteger = ActiveModel::Type::UnsignedInteger - Value = ActiveModel::Type::Value + Float = ActiveModel::Type::Float + Integer = ActiveModel::Type::Integer + String = ActiveModel::Type::String + Text = ActiveModel::Type::Text + UnsignedInteger = ActiveModel::Type::UnsignedInteger + Value = ActiveModel::Type::Value register(:big_integer, Type::BigInteger, override: false) register(:binary, Type::Binary, override: false) |