diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-12-08 13:45:47 -0500 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-12-08 13:45:47 -0500 |
commit | ef76f83f4cf0f27e84c0c5f4a3ff426d7ad84d9d (patch) | |
tree | 673c743609e2c3730706eae5ded47c40c6acf4f0 /activemodel/lib | |
parent | 6e948f480118bceb66b72a53874b800fbda05327 (diff) | |
parent | 994ce87bbda7cc4b0059c951b06cdd15dc26cb97 (diff) | |
download | rails-ef76f83f4cf0f27e84c0c5f4a3ff426d7ad84d9d.tar.gz rails-ef76f83f4cf0f27e84c0c5f4a3ff426d7ad84d9d.tar.bz2 rails-ef76f83f4cf0f27e84c0c5f4a3ff426d7ad84d9d.zip |
Merge pull request #26696 from iainbeeston/only-ruby-types-in-activemodel
Moved database-specific ActiveModel types into ActiveRecord
Diffstat (limited to 'activemodel/lib')
-rw-r--r-- | activemodel/lib/active_model/type.rb | 4 | ||||
-rw-r--r-- | activemodel/lib/active_model/type/decimal_without_scale.rb | 11 | ||||
-rw-r--r-- | activemodel/lib/active_model/type/text.rb | 11 | ||||
-rw-r--r-- | activemodel/lib/active_model/type/unsigned_integer.rb | 15 |
4 files changed, 0 insertions, 41 deletions
diff --git a/activemodel/lib/active_model/type.rb b/activemodel/lib/active_model/type.rb index 0d3349e236..b8e6d2376b 100644 --- a/activemodel/lib/active_model/type.rb +++ b/activemodel/lib/active_model/type.rb @@ -7,14 +7,11 @@ 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/immutable_string" 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" @@ -53,7 +50,6 @@ module ActiveModel register(:immutable_string, Type::ImmutableString) register(:integer, Type::Integer) register(:string, Type::String) - register(:text, Type::Text) register(:time, Type::Time) end end diff --git a/activemodel/lib/active_model/type/decimal_without_scale.rb b/activemodel/lib/active_model/type/decimal_without_scale.rb deleted file mode 100644 index 985e1038ed..0000000000 --- a/activemodel/lib/active_model/type/decimal_without_scale.rb +++ /dev/null @@ -1,11 +0,0 @@ -require "active_model/type/big_integer" - -module ActiveModel - module Type - class DecimalWithoutScale < BigInteger # :nodoc: - def type - :decimal - end - end - end -end diff --git a/activemodel/lib/active_model/type/text.rb b/activemodel/lib/active_model/type/text.rb deleted file mode 100644 index 7c0d647706..0000000000 --- a/activemodel/lib/active_model/type/text.rb +++ /dev/null @@ -1,11 +0,0 @@ -require "active_model/type/string" - -module ActiveModel - module Type - class Text < String # :nodoc: - def type - :text - end - end - end -end diff --git a/activemodel/lib/active_model/type/unsigned_integer.rb b/activemodel/lib/active_model/type/unsigned_integer.rb deleted file mode 100644 index 288fa23efe..0000000000 --- a/activemodel/lib/active_model/type/unsigned_integer.rb +++ /dev/null @@ -1,15 +0,0 @@ -module ActiveModel - module Type - class UnsignedInteger < Integer # :nodoc: - private - - def max_value - super * 2 - end - - def min_value - 0 - end - end - end -end |