diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-27 11:28:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-27 11:28:00 -0300 |
| commit | 52434e9a512477d632b492793bcae5b4732ea689 (patch) | |
| tree | cc72e7f445021e721832a817679fcf0d4a5cab05 /activerecord/lib/active_record/connection_adapters | |
| parent | 3067aee91fa4eaaa82a58a79d32c72fd9b9b3f51 (diff) | |
| parent | 6b46106d65c749d4eba304b753f9a70ede6ed5d9 (diff) | |
| download | rails-52434e9a512477d632b492793bcae5b4732ea689.tar.gz rails-52434e9a512477d632b492793bcae5b4732ea689.tar.bz2 rails-52434e9a512477d632b492793bcae5b4732ea689.zip | |
Merge pull request #15295 from sgrif/sg-deprecate-decimals
Deprecate decimal columns being automatically treated as integers
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index ca5db4095e..6ecd4efdc8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -396,6 +396,7 @@ module ActiveRecord precision = extract_precision(sql_type) if scale == 0 + # FIXME: Remove this class as well Type::DecimalWithoutScale.new(precision: precision) else Type::Decimal.new(precision: precision, scale: scale) diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 1f327d1f2f..027169ae3c 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -478,6 +478,8 @@ module ActiveRecord # places after decimal = fmod - 4 & 0xffff # places before decimal = (fmod - 4) >> 16 & 0xffff if fmod && (fmod - 4 & 0xffff).zero? + # FIXME: Remove this class, and the second argument to + # lookups on PG Type::DecimalWithoutScale.new(precision: precision) else OID::Decimal.new(precision: precision, scale: scale) |