PostgreSQLAdapter::OID source from recent 4.1.x

https://github.com/rails/rails/blob/4-1-stable/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb

latest commit rails/rails@5e09ea06a640c0205f4c7db1

Author: kares

lib/arjdbc/postgresql/base/oid.rb

@@ -6,11 +6,6 @@ module PostgreSQL
       module OID
         class Type
           def type; end
-          def simplified_type(sql_type); type end
-
-          def infinity(options = {})
-            ::Float::INFINITY * (options[:negative] ? -1 : 1)
-          end
         end
 
         class Identity < Type
@@ -19,29 +14,9 @@ def type_cast(value)
           end
         end
 
-        # String, Text types do not exist in AR 4.0/4.1
-        # AR reports Identity for them - make it similar
-        class String < Identity
-          def type; :string end
-        end
-
-        class SpecializedString < OID::String
-          def type; @type end
-
-          def initialize(type)
-            @type = type
-          end
-        end
-
-        class Text < OID::String
-          def type; :text end
-        end
-
         class Bit < Type
-          def type; :string end
-
           def type_cast(value)
-            if ::String === value
+            if String === value
               ConnectionAdapters::PostgreSQLColumn.string_to_bit value
             else
               value
@@ -50,20 +25,16 @@ def type_cast(value)
         end
 
         class Bytea < Type
-          def type; :binary end
-
           def type_cast(value)
             return if value.nil?
             PGconn.unescape_bytea value
           end
         end
 
         class Money < Type
-          def type; :decimal end
-
           def type_cast(value)
             return if value.nil?
-            return value unless ::String === value
+            return value unless String === value
 
             # Because money output is formatted according to the locale, there are two
             # cases to consider (note the decimal separators):
@@ -105,8 +76,6 @@ def type_cast(value)
         end
 
         class Point < Type
-          def type; :string end
-
           def type_cast(value)
             if ::String === value
               ConnectionAdapters::PostgreSQLColumn.string_to_point value
@@ -117,8 +86,6 @@ def type_cast(value)
         end
 
         class Array < Type
-          def type; @subtype.type end
-
           attr_reader :subtype
           def initialize(subtype)
             @subtype = subtype
@@ -135,56 +102,63 @@ def type_cast(value)
 
         class Range < Type
           attr_reader :subtype
-          def simplified_type(sql_type); sql_type.to_sym end
-
           def initialize(subtype)
             @subtype = subtype
           end
 
           def extract_bounds(value)
             from, to = value[1..-2].split(',')
             {
-              from:          (value[1] == ',' || from == '-infinity') ? @subtype.infinity(negative: true) : from,
-              to:            (value[-2] == ',' || to == 'infinity') ? @subtype.infinity : to,
+              from:          (value[1] == ',' || from == '-infinity') ? infinity(:negative => true) : from,
+              to:            (value[-2] == ',' || to == 'infinity') ? infinity : to,
               exclude_start: (value[0] == '('),
               exclude_end:   (value[-1] == ')')
             }
           end
 
+          def infinity(options = {})
+            ::Float::INFINITY * (options[:negative] ? -1 : 1)
+          end
+
           def infinity?(value)
             value.respond_to?(:infinite?) && value.infinite?
           end
 
-          def type_cast_single(value)
-            infinity?(value) ? value : @subtype.type_cast(value)
+          def to_integer(value)
+            infinity?(value) ? value : value.to_i
           end
 
           def type_cast(value)
             return if value.nil? || value == 'empty'
             return value if value.is_a?(::Range)
 
             extracted = extract_bounds(value)
-            from = type_cast_single extracted[:from]
-            to = type_cast_single extracted[:to]
-
-            if !infinity?(from) && extracted[:exclude_start]
-              if from.respond_to?(:succ)
-                from = from.succ
-                ActiveSupport::Deprecation.warn <<-MESSAGE
-Excluding the beginning of a Range is only partialy supported through `#succ`.
-This is not reliable and will be removed in the future.
-                MESSAGE
-              else
-                raise ArgumentError, "The Ruby Range object does not support excluding the beginning of a Range. (unsupported value: '#{value}')"
-              end
+
+            case @subtype
+            when :date
+              from  = ConnectionAdapters::Column.value_to_date(extracted[:from])
+              from += 1.day if extracted[:exclude_start]
+              to    = ConnectionAdapters::Column.value_to_date(extracted[:to])
+            when :decimal
+              from  = BigDecimal.new(extracted[:from].to_s)
+              # FIXME: add exclude start for ::Range, same for timestamp ranges
+              to    = BigDecimal.new(extracted[:to].to_s)
+            when :time
+              from = ConnectionAdapters::Column.string_to_time(extracted[:from])
+              to   = ConnectionAdapters::Column.string_to_time(extracted[:to])
+            when :integer
+              from = to_integer(extracted[:from]) rescue value ? 1 : 0
+              from += 1 if extracted[:exclude_start]
+              to   = to_integer(extracted[:to]) rescue value ? 1 : 0
+            else
+              return value
             end
+
             ::Range.new(from, to, extracted[:exclude_end])
           end
         end
 
         class Integer < Type
-          def type; :integer end
-
           def type_cast(value)
             return if value.nil?
 
@@ -193,8 +167,6 @@ def type_cast(value)
         end
 
         class Boolean < Type
-          def type; :boolean end
-
           def type_cast(value)
             return if value.nil?
 
@@ -204,9 +176,6 @@ def type_cast(value)
 
         class Timestamp < Type
           def type; :timestamp; end
-          def simplified_type(sql_type)
-            :datetime
-          end
 
           def type_cast(value)
             return if value.nil?
@@ -218,7 +187,7 @@ def type_cast(value)
         end
 
         class Date < Type
-          def type; :date; end
+          def type; :datetime; end
 
           def type_cast(value)
             return if value.nil?
@@ -230,8 +199,6 @@ def type_cast(value)
         end
 
         class Time < Type
-          def type; :time end
-
           def type_cast(value)
             return if value.nil?
 
@@ -242,8 +209,6 @@ def type_cast(value)
         end
 
         class Float < Type
-          def type; :float end
-
           def type_cast(value)
             case value
               when nil;         nil
@@ -257,32 +222,19 @@ def type_cast(value)
         end
 
         class Decimal < Type
-          def type; :decimal end
-
           def type_cast(value)
             return if value.nil?
 
             ConnectionAdapters::Column.value_to_decimal value
           end
-
-          def infinity(options = {})
-            BigDecimal.new("Infinity") * (options[:negative] ? -1 : 1)
-          end
-        end
-
-        class Enum < Type
-          def type; :enum end
-
-          def type_cast(value)
-            value.to_s
-          end
         end
 
         class Hstore < Type
-          def type; :hstore end
-
           def type_cast_for_write(value)
-            ConnectionAdapters::PostgreSQLColumn.hstore_to_string value
+            # roundtrip to ensure uniform uniform types
+            # TODO: This is not an efficient solution.
+            stringified = ConnectionAdapters::PostgreSQLColumn.hstore_to_string(value)
+            type_cast(stringified)
           end
 
           def type_cast(value)
@@ -297,22 +249,19 @@ def accessor
         end
 
         class Cidr < Type
-          def type; :cidr end
           def type_cast(value)
             return if value.nil?
 
             ConnectionAdapters::PostgreSQLColumn.string_to_cidr value
           end
         end
-        class Inet < Cidr
-          def type; :inet end
-        end
 
         class Json < Type
-          def type; :json end
-
           def type_cast_for_write(value)
-            ConnectionAdapters::PostgreSQLColumn.json_to_string value
+            # roundtrip to ensure uniform uniform types
+            # TODO: This is not an efficient solution.
+            stringified = ConnectionAdapters::PostgreSQLColumn.json_to_string(value)
+            type_cast(stringified)
           end
 
           def type_cast(value)
@@ -326,13 +275,6 @@ def accessor
           end
         end
 
-        class Uuid < Type
-          def type; :uuid end
-          def type_cast(value)
-            value.presence
-          end
-        end
-
         class TypeMap
           def initialize
             @mapping = {}
@@ -379,7 +321,7 @@ def fetch(ftype, fmod)
         }
 
         # Register an OID type named +name+ with a typecasting object in
-        # +type+. +name+ should correspond to the `typname` column in
+        # +type+.  +name+ should correspond to the `typname` column in
         # the `pg_type` table.
         def self.register_type(name, type)
           NAMES[name] = type
@@ -396,47 +338,54 @@ def self.registered_type?(name)
         end
 
         register_type 'int2', OID::Integer.new
-        alias_type 'int4', 'int2'
-        alias_type 'int8', 'int2'
-        alias_type 'oid', 'int2'
+        alias_type    'int4', 'int2'
+        alias_type    'int8', 'int2'
+        alias_type    'oid',  'int2'
+
+        register_type 'daterange', OID::Range.new(:date)
+        register_type 'numrange', OID::Range.new(:decimal)
+        register_type 'tsrange', OID::Range.new(:time)
+        register_type 'int4range', OID::Range.new(:integer)
+        alias_type    'tstzrange', 'tsrange'
+        alias_type    'int8range', 'int4range'
+
         register_type 'numeric', OID::Decimal.new
-        register_type 'float4', OID::Float.new
-        alias_type 'float8', 'float4'
-        register_type 'text', OID::Text.new
-        register_type 'varchar', OID::String.new
-        alias_type 'char', 'varchar'
-        alias_type 'name', 'varchar'
-        alias_type 'bpchar', 'varchar'
+        register_type 'text', OID::Identity.new
+        alias_type 'varchar', 'text'
+        alias_type 'char', 'text'
+        alias_type 'bpchar', 'text'
+        alias_type 'xml', 'text'
+
+        # FIXME: why are we keeping these types as strings?
+        alias_type 'tsvector', 'text'
+        alias_type 'interval', 'text'
+        alias_type 'macaddr',  'text'
+        alias_type 'uuid',     'text'
+
+        register_type 'money', OID::Money.new
+        register_type 'bytea', OID::Bytea.new
         register_type 'bool', OID::Boolean.new
         register_type 'bit', OID::Bit.new
-        alias_type 'varbit', 'bit'
+        register_type 'varbit', OID::Bit.new
+
+        register_type 'float4', OID::Float.new
+        alias_type 'float8', 'float4'
+
         register_type 'timestamp', OID::Timestamp.new
-        alias_type 'timestamptz', 'timestamp'
+        register_type 'timestamptz', OID::Timestamp.new
         register_type 'date', OID::Date.new
         register_type 'time', OID::Time.new
 
-        register_type 'money', OID::Money.new
-        register_type 'bytea', OID::Bytea.new
+        register_type 'path', OID::Identity.new
         register_type 'point', OID::Point.new
+        register_type 'polygon', OID::Identity.new
+        register_type 'circle', OID::Identity.new
         register_type 'hstore', OID::Hstore.new
         register_type 'json', OID::Json.new
-        register_type 'cidr', OID::Cidr.new
-        register_type 'inet', OID::Inet.new
-        register_type 'uuid', OID::Uuid.new
-        register_type 'xml', SpecializedString.new(:xml)
-        register_type 'tsvector', SpecializedString.new(:tsvector)
-        register_type 'macaddr', SpecializedString.new(:macaddr)
-        register_type 'citext', SpecializedString.new(:citext)
-        register_type 'ltree', SpecializedString.new(:ltree)
+        register_type 'ltree', OID::Identity.new
 
-        # FIXME: why are we keeping these types as strings?
-        alias_type 'interval', 'varchar'
-        alias_type 'path', 'varchar'
-        alias_type 'line', 'varchar'
-        alias_type 'polygon', 'varchar'
-        alias_type 'circle', 'varchar'
-        alias_type 'lseg', 'varchar'
-        alias_type 'box', 'varchar'
+        register_type 'cidr', OID::Cidr.new
+        alias_type 'inet', 'cidr'
       end
     end
   end