activerecord-redshift-adapter-ng 0.9.0 → 0.9.1

data/lib/active_record/connection_adapters/redshift/oid/inet.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Inet < Cidr # :nodoc:
+          def type
+            :inet
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/json.rb

@@ -11,7 +11,7 @@ module ActiveRecord
 
           def type_cast_from_database(value)
             if value.is_a?(::String)
-              ::ActiveSupport::JSON.decode(value) rescue nil
+              ::ActiveSupport::JSON.decode(value)
             else
               super
             end

data/lib/active_record/connection_adapters/redshift/oid/money.rb

@@ -0,0 +1,43 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Money < Type::Decimal # :nodoc:
+          include Infinity
+
+          class_attribute :precision
+
+          def type
+            :money
+          end
+
+          def scale
+            2
+          end
+
+          def cast_value(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):
+            #  (1) $12,345,678.12
+            #  (2) $12.345.678,12
+            # Negative values are represented as follows:
+            #  (3) -$2.55
+            #  (4) ($2.55)
+
+            value.sub!(/^\((.+)\)$/, '-\1') # (4)
+            case value
+            when /^-?\D+[\d,]+\.\d{2}$/  # (1)
+              value.gsub!(/[^-\d.]/, '')
+            when /^-?\D+[\d.]+,\d{2}$/  # (2)
+              value.gsub!(/[^-\d,]/, '').sub!(/,/, '.')
+            end
+
+            super(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/point.rb

@@ -0,0 +1,43 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Point < Type::Value # :nodoc:
+          include Type::Mutable
+
+          def type
+            :point
+          end
+
+          def type_cast(value)
+            case value
+            when ::String
+              if value[0] == '(' && value[-1] == ')'
+                value = value[1...-1]
+              end
+              type_cast(value.split(','))
+            when ::Array
+              value.map { |v| Float(v) }
+            else
+              value
+            end
+          end
+
+          def type_cast_for_database(value)
+            if value.is_a?(::Array)
+              "(#{number_for_point(value[0])},#{number_for_point(value[1])})"
+            else
+              super
+            end
+          end
+
+          private
+
+          def number_for_point(number)
+            number.to_s.gsub(/\.0$/, '')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/range.rb

@@ -0,0 +1,76 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Range < Type::Value # :nodoc:
+          attr_reader :subtype, :type
+
+          def initialize(subtype, type)
+            @subtype = subtype
+            @type = type
+          end
+
+          def type_cast_for_schema(value)
+            value.inspect.gsub('Infinity', '::Float::INFINITY')
+          end
+
+          def cast_value(value)
+            return if 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 \
+                  "Excluding the beginning of a Range is only partialy supported " \
+                  "through `#succ`. This is not reliable and will be removed in " \
+                  "the future."
+              else
+                raise ArgumentError, "The Ruby Range object does not support excluding the beginning of a Range. (unsupported value: '#{value}')"
+              end
+            end
+            ::Range.new(from, to, extracted[:exclude_end])
+          end
+
+          def type_cast_for_database(value)
+            if value.is_a?(::Range)
+              from = type_cast_single_for_database(value.begin)
+              to = type_cast_single_for_database(value.end)
+              "[#{from},#{to}#{value.exclude_end? ? ')' : ']'}"
+            else
+              super
+            end
+          end
+
+          private
+
+          def type_cast_single(value)
+            infinity?(value) ? value : @subtype.type_cast_from_database(value)
+          end
+
+          def type_cast_single_for_database(value)
+            infinity?(value) ? '' : @subtype.type_cast_for_database(value)
+          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,
+              exclude_start: (value[0] == '('),
+              exclude_end:   (value[-1] == ')')
+            }
+          end
+
+          def infinity?(value)
+            value.respond_to?(:infinite?) && value.infinite?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/specialized_string.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class SpecializedString < Type::String # :nodoc:
+          attr_reader :type
+
+          def initialize(type)
+            @type = type
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/type_map_initializer.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       module OID # :nodoc:
         # This class uses the data from PostgreSQL pg_type table to build
         # the OID -> Type mapping.
-        #   - OID is an integer representing the type.
+        #   - OID is and integer representing the type.
         #   - Type is an OID::Type object.
         # This class has side effects on the +store+ passed during initialization.
         class TypeMapInitializer # :nodoc:
@@ -15,43 +15,65 @@ module ActiveRecord
           def run(records)
             nodes = records.reject { |row| @store.key? row['oid'].to_i }
             mapped, nodes = nodes.partition { |row| @store.key? row['typname'] }
-            ranges, nodes = nodes.partition { |row| row['typtype'] == 'r'.freeze }
-            enums, nodes = nodes.partition { |row| row['typtype'] == 'e'.freeze }
-            domains, nodes = nodes.partition { |row| row['typtype'] == 'd'.freeze }
-            arrays, nodes = nodes.partition { |row| row['typinput'] == 'array_in'.freeze }
-            composites, nodes = nodes.partition { |row| row['typelem'].to_i != 0 }
+            ranges, nodes = nodes.partition { |row| row['typtype'] == 'r' }
+            enums, nodes = nodes.partition { |row| row['typtype'] == 'e' }
+            domains, nodes = nodes.partition { |row| row['typtype'] == 'd' }
+            arrays, nodes = nodes.partition { |row| row['typinput'] == 'array_in' }
+            composites, nodes = nodes.partition { |row| row['typelem'] != '0' }
 
             mapped.each     { |row| register_mapped_type(row)    }
+            enums.each      { |row| register_enum_type(row)      }
+            domains.each    { |row| register_domain_type(row)    }
+            arrays.each     { |row| register_array_type(row)     }
+            ranges.each     { |row| register_range_type(row)     }
+            composites.each { |row| register_composite_type(row) }
           end
 
           private
-
           def register_mapped_type(row)
             alias_type row['oid'], row['typname']
           end
 
-          def register(oid, oid_type = nil, &block)
-            oid = assert_valid_registration(oid, oid_type || block)
-            if block_given?
-              @store.register_type(oid, &block)
+          def register_enum_type(row)
+            register row['oid'], OID::Enum.new
+          end
+
+          def register_array_type(row)
+            if subtype = @store.lookup(row['typelem'].to_i)
+              register row['oid'], OID::Array.new(subtype, row['typdelim'])
+            end
+          end
+
+          def register_range_type(row)
+            if subtype = @store.lookup(row['rngsubtype'].to_i)
+              register row['oid'], OID::Range.new(subtype, row['typname'].to_sym)
+            end
+          end
+
+          def register_domain_type(row)
+            if base_type = @store.lookup(row["typbasetype"].to_i)
+              register row['oid'], base_type
             else
-              @store.register_type(oid, oid_type)
+              warn "unknown base type (OID: #{row["typbasetype"]}) for domain #{row["typname"]}."
             end
           end
 
+          def register_composite_type(row)
+            if subtype = @store.lookup(row['typelem'].to_i)
+              register row['oid'], OID::Vector.new(row['typdelim'], subtype)
+            end
+          end
+
+          def register(oid, oid_type)
+            oid = assert_valid_registration(oid, oid_type)
+            @store.register_type(oid, oid_type)
+          end
+
           def alias_type(oid, target)
             oid = assert_valid_registration(oid, target)
             @store.alias_type(oid, target)
           end
 
-          def register_with_subtype(oid, target_oid)
-            if @store.key?(target_oid)
-              register(oid) do |_, *args|
-                yield @store.lookup(target_oid, *args)
-              end
-            end
-          end
-
           def assert_valid_registration(oid, oid_type)
             raise ArgumentError, "can't register nil type for OID #{oid}" if oid_type.nil?
             oid.to_i

data/lib/active_record/connection_adapters/redshift/oid/uuid.rb

@@ -0,0 +1,28 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Uuid < Type::Value # :nodoc:
+          RFC_4122 = %r{\A\{?[a-fA-F0-9]{4}-?
+                             [a-fA-F0-9]{4}-?
+                             [a-fA-F0-9]{4}-?
+                             [1-5][a-fA-F0-9]{3}-?
+                             [8-Bab][a-fA-F0-9]{3}-?
+                             [a-fA-F0-9]{4}-?
+                             [a-fA-F0-9]{4}-?
+                             [a-fA-F0-9]{4}-?\}?\z}x
+
+          alias_method :type_cast_for_database, :type_cast_from_database
+
+          def type
+            :uuid
+          end
+
+          def type_cast(value)
+            value.to_s[RFC_4122, 0]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/vector.rb

@@ -0,0 +1,26 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Vector < Type::Value # :nodoc:
+          attr_reader :delim, :subtype
+
+          # +delim+ corresponds to the `typdelim` column in the pg_types
+          # table.  +subtype+ is derived from the `typelem` column in the
+          # pg_types table.
+          def initialize(delim, subtype)
+            @delim   = delim
+            @subtype = subtype
+          end
+
+          # FIXME: this should probably split on +delim+ and use +subtype+
+          # to cast the values.  Unfortunately, the current Rails behavior
+          # is to just return the string.
+          def type_cast(value)
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/oid/xml.rb

@@ -0,0 +1,28 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Xml < Type::String # :nodoc:
+          def type
+            :xml
+          end
+
+          def type_cast_for_database(value)
+            return unless value
+            Data.new(super)
+          end
+
+          class Data # :nodoc:
+            def initialize(value)
+              @value = value
+            end
+
+            def to_s
+              @value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift/quoting.rb

@@ -70,6 +70,14 @@ module ActiveRecord
           case value
           when Type::Binary::Data
             "'#{escape_bytea(value.to_s)}'"
+          when OID::Xml::Data
+            "xml '#{quote_string(value.to_s)}'"
+          when OID::Bit::Data
+            if value.binary?
+              "B'#{value}'"
+            elsif value.hex?
+              "X'#{value}'"
+            end
           when Float
             if value.infinite? || value.nan?
               "'#{value}'"
@@ -88,6 +96,8 @@ module ActiveRecord
             # See http://deveiate.org/code/pg/PGconn.html#method-i-exec_prepared-doc
             # for more information
             { value: value.to_s, format: 1 }
+          when OID::Xml::Data, OID::Bit::Data
+            value.to_s
           else
             super
           end

data/lib/active_record/connection_adapters/redshift/referential_integrity.rb

@@ -7,7 +7,22 @@ module ActiveRecord
         end
 
         def disable_referential_integrity # :nodoc:
+          if supports_disable_referential_integrity?
+            begin
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+            rescue
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER USER" }.join(";"))
+            end
+          end
           yield
+        ensure
+          if supports_disable_referential_integrity?
+            begin
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+            rescue
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER USER" }.join(";"))
+            end
+          end
         end
       end
     end

data/lib/active_record/connection_adapters/redshift/schema_definitions.rb

@@ -2,6 +2,64 @@ module ActiveRecord
   module ConnectionAdapters
     module Redshift
       module ColumnMethods
+        def xml(*args)
+          options = args.extract_options!
+          column(args[0], :xml, options)
+        end
+
+        def tsvector(*args)
+          options = args.extract_options!
+          column(args[0], :tsvector, options)
+        end
+
+        def int4range(name, options = {})
+          column(name, :int4range, options)
+        end
+
+        def int8range(name, options = {})
+          column(name, :int8range, options)
+        end
+
+        def tsrange(name, options = {})
+          column(name, :tsrange, options)
+        end
+
+        def tstzrange(name, options = {})
+          column(name, :tstzrange, options)
+        end
+
+        def numrange(name, options = {})
+          column(name, :numrange, options)
+        end
+
+        def daterange(name, options = {})
+          column(name, :daterange, options)
+        end
+
+        def hstore(name, options = {})
+          column(name, :hstore, options)
+        end
+
+        def ltree(name, options = {})
+          column(name, :ltree, options)
+        end
+
+        def inet(name, options = {})
+          column(name, :inet, options)
+        end
+
+        def cidr(name, options = {})
+          column(name, :cidr, options)
+        end
+
+        def macaddr(name, options = {})
+          column(name, :macaddr, options)
+        end
+
+        def uuid(name, options = {})
+          column(name, :uuid, options)
+        end
+
         def json(name, options = {})
           column(name, :json, options)
         end
@@ -9,9 +67,30 @@ module ActiveRecord
         def jsonb(name, options = {})
           column(name, :jsonb, options)
         end
+
+        def citext(name, options = {})
+          column(name, :citext, options)
+        end
+
+        def point(name, options = {})
+          column(name, :point, options)
+        end
+
+        def bit(name, options)
+          column(name, :bit, options)
+        end
+
+        def bit_varying(name, options)
+          column(name, :bit_varying, options)
+        end
+
+        def money(name, options)
+          column(name, :money, options)
+        end
       end
 
       class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
+        attr_accessor :array
       end
 
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
@@ -52,6 +131,12 @@ module ActiveRecord
           column name, type, options
         end
 
+        def new_column_definition(name, type, options) # :nodoc:
+          column = super
+          column.array = options[:array]
+          column
+        end
+
         private
 
           def create_column_definition(name, type)