activerecord-redshift-adapter-ng 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de733c7700e8cdcabfb21c0f586ebdf5f982586b
-  data.tar.gz: 74dad27ced8d0ff64e8638fb6c464112eb55c083
+  metadata.gz: ffdccdc8440d8d53be78f296fd2c137eab0481e1
+  data.tar.gz: f8402a7779848906a456ed6be8ec81210224d164
 SHA512:
-  metadata.gz: f07eb341fdbc4b144b86760bb662483a015747c0d70479b6f4bf1a90018d01dab69aa53af883db67c5afac8e0b65f303eb2df4f602c841dcdad9420a6fda8643
-  data.tar.gz: cf00590cf283dfbad15e0936d1f1d87c44b3d1b4668d9dfa8a7cbf3e5ef638f146adb0515154845fe74f81d32d9b3555f9abeee4e6ba127a29e304dde22df016
+  metadata.gz: e9cb7ba3125df8eb048c44e0425ff49397a9c23df14385952b390fff3759b83e54b928adb7e93d396247291fd1dbf1073678528303a733cf51453fe7fa930a91
+  data.tar.gz: 6c10e072ad442a23d4b3b4c2acf2f65450bd2060bab15ee8c8c568204b812885d7f77bb783c604d7fdd6d6bb09f876a33163b2e2450f8c2c92bac9243bb1052d

data/LICENSE

@@ -1,4 +1,3 @@
------------------------------------------------------------------------------------
 The MIT License (MIT)
 
 Copyright (c) 2004-2013 David Heinemeier Hansson (original code author)
@@ -20,35 +19,3 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------------------------------------------------------------------------------------
-Copyright (c) 2010-2013, Fiksu, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- o Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- o Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-
- o Fiksu, Inc. nor the names of its contributors may be used to
-   endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,34 +1,30 @@
-# activerecord-redshift-adapter-ng
+activerecord4-redshift-adapter
+==============================
 
-Amazon Redshift adapter for ActiveRecord.
-I copied PostgreSQL driver from ActiveRecord and modified for Redshift.
-"Barely works" patch was borrowed from fiksu/activerecord-redshift-adapter.
+Amazon Redshift adapter for ActiveRecord 4 (Rails 4).
+Almost all code are copied from ActiveRecord 4.2.0 PostgreSQL
+driver and modified for Redshift.
 
-I know Redshift driver already exists (https://github.com/fiksu/activerecord-redshift-adapter),
-but it currently supports only ActiveRecord 3.  Also, AR4 code is magnifically
-different from AR3 code because of file separation, patching does not work well.
-I want to use Rails 4 with Redshift NOW, so I wrote this driver.
-If anybody write better Redshift driver which works with ActiveRecord 4,
-I abandon this driver.
+Forked and heavily modified from (https://github.com/aamine/activerecord4-redshift-adapter). 
 
-Usage
+How to Use
 -------------------
 
-Write following in Gemfile:
+In Gemfile
 ```
-gem 'activerecord-redshift-adapter-ng'
+gem 'activerecord4-redshift-adapter', github: 'khwangster/activerecord4-redshift-adapter'
 ```
 
 In database.yml
 ```
 development:
   adapter: redshift
-  host: your_cluster_name.hashhash.ap-northeast-1.redshift.amazonaws.com
-  port: 5439
+  host: your_cluster_name.ident.ap-east-1.redshift.amazonaws.com
   database: dev
+  port: 5439
   username: your_user
   password: your_password
-  encoding: utf8
+  encoding: utf-8
   pool: 3
   timeout: 5000
 ```

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

@@ -1,8 +1,18 @@
 module ActiveRecord
   module ConnectionAdapters
+    # PostgreSQL-specific extensions to column definitions in a table.
     class RedshiftColumn < Column #:nodoc:
+      attr_accessor :array
+
       def initialize(name, default, cast_type, sql_type = nil, null = true, default_function = nil)
-        super name, default, cast_type, sql_type, null
+        if sql_type =~ /\[\]$/
+          @array = true
+          super(name, default, cast_type, sql_type[0..sql_type.length - 3], null)
+        else
+          @array = false
+          super(name, default, cast_type, sql_type, null)
+        end
+
         @default_function = default_function
       end
     end

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

@@ -1,13 +1,28 @@
 require 'active_record/connection_adapters/redshift/oid/infinity'
 
+require 'active_record/connection_adapters/redshift/oid/array'
+require 'active_record/connection_adapters/redshift/oid/bit'
+require 'active_record/connection_adapters/redshift/oid/bit_varying'
+require 'active_record/connection_adapters/redshift/oid/bytea'
+require 'active_record/connection_adapters/redshift/oid/cidr'
 require 'active_record/connection_adapters/redshift/oid/date'
 require 'active_record/connection_adapters/redshift/oid/date_time'
 require 'active_record/connection_adapters/redshift/oid/decimal'
+require 'active_record/connection_adapters/redshift/oid/enum'
 require 'active_record/connection_adapters/redshift/oid/float'
+require 'active_record/connection_adapters/redshift/oid/hstore'
+require 'active_record/connection_adapters/redshift/oid/inet'
 require 'active_record/connection_adapters/redshift/oid/integer'
 require 'active_record/connection_adapters/redshift/oid/json'
 require 'active_record/connection_adapters/redshift/oid/jsonb'
+require 'active_record/connection_adapters/redshift/oid/money'
+require 'active_record/connection_adapters/redshift/oid/point'
+require 'active_record/connection_adapters/redshift/oid/range'
+require 'active_record/connection_adapters/redshift/oid/specialized_string'
 require 'active_record/connection_adapters/redshift/oid/time'
+require 'active_record/connection_adapters/redshift/oid/uuid'
+require 'active_record/connection_adapters/redshift/oid/vector'
+require 'active_record/connection_adapters/redshift/oid/xml'
 
 require 'active_record/connection_adapters/redshift/oid/type_map_initializer'
 

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

@@ -0,0 +1,96 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Array < Type::Value # :nodoc:
+          include Type::Mutable
+
+          # Loads pg_array_parser if available. String parsing can be
+          # performed quicker by a native extension, which will not create
+          # a large amount of Ruby objects that will need to be garbage
+          # collected. pg_array_parser has a C and Java extension
+          begin
+            require 'pg_array_parser'
+            include PgArrayParser
+          rescue LoadError
+            require 'active_record/connection_adapters/redshift/array_parser'
+            include Redshift::ArrayParser
+          end
+
+          attr_reader :subtype, :delimiter
+          delegate :type, to: :subtype
+
+          def initialize(subtype, delimiter = ',')
+            @subtype = subtype
+            @delimiter = delimiter
+          end
+
+          def type_cast_from_database(value)
+            if value.is_a?(::String)
+              type_cast_array(parse_pg_array(value), :type_cast_from_database)
+            else
+              super
+            end
+          end
+
+          def type_cast_from_user(value)
+            type_cast_array(value, :type_cast_from_user)
+          end
+
+          def type_cast_for_database(value)
+            if value.is_a?(::Array)
+              cast_value_for_database(value)
+            else
+              super
+            end
+          end
+
+          private
+
+          def type_cast_array(value, method)
+            if value.is_a?(::Array)
+              value.map { |item| type_cast_array(item, method) }
+            else
+              @subtype.public_send(method, value)
+            end
+          end
+
+          def cast_value_for_database(value)
+            if value.is_a?(::Array)
+              casted_values = value.map { |item| cast_value_for_database(item) }
+              "{#{casted_values.join(delimiter)}}"
+            else
+              quote_and_escape(subtype.type_cast_for_database(value))
+            end
+          end
+
+          ARRAY_ESCAPE = "\\" * 2 * 2 # escape the backslash twice for PG arrays
+
+          def quote_and_escape(value)
+            case value
+            when ::String
+              if string_requires_quoting?(value)
+                value = value.gsub(/\\/, ARRAY_ESCAPE)
+                value.gsub!(/"/,"\\\"")
+                %("#{value}")
+              else
+                value
+              end
+            when nil then "NULL"
+            else value
+            end
+          end
+
+          # See http://www.postgresql.org/docs/9.2/static/arrays.html#ARRAYS-IO
+          # for a list of all cases in which strings will be quoted.
+          def string_requires_quoting?(string)
+            string.empty? ||
+              string == "NULL" ||
+              string =~ /[\{\}"\\\s]/ ||
+              string.include?(delimiter)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Bit < Type::Value # :nodoc:
+          def type
+            :bit
+          end
+
+          def type_cast(value)
+            if ::String === value
+              case value
+              when /^0x/i
+                value[2..-1].hex.to_s(2) # Hexadecimal notation
+              else
+                value                    # Bit-string notation
+              end
+            else
+              value
+            end
+          end
+
+          def type_cast_for_database(value)
+            Data.new(super) if value
+          end
+
+          class Data
+            def initialize(value)
+              @value = value
+            end
+
+            def to_s
+              value
+            end
+
+            def binary?
+              /\A[01]*\Z/ === value
+            end
+
+            def hex?
+              /\A[0-9A-F]*\Z/i === value
+            end
+
+            protected
+
+            attr_reader :value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class BitVarying < OID::Bit # :nodoc:
+          def type
+            :bit_varying
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Bytea < Type::Binary # :nodoc:
+          def type_cast_from_database(value)
+            return if value.nil?
+            PGconn.unescape_bytea(super)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Cidr < Type::Value # :nodoc:
+          def type
+            :cidr
+          end
+
+          def type_cast_for_schema(value)
+            subnet_mask = value.instance_variable_get(:@mask_addr)
+
+            # If the subnet mask is equal to /32, don't output it
+            if subnet_mask == (2**32 - 1)
+              "\"#{value.to_s}\""
+            else
+              "\"#{value.to_s}/#{subnet_mask.to_s(2).count('1')}\""
+            end
+          end
+
+          def type_cast_for_database(value)
+            if IPAddr === value
+              "#{value.to_s}/#{value.instance_variable_get(:@mask_addr).to_s(2).count('1')}"
+            else
+              value
+            end
+          end
+
+          def cast_value(value)
+            if value.nil?
+              nil
+            elsif String === value
+              begin
+                IPAddr.new(value)
+              rescue ArgumentError
+                nil
+              end
+            else
+              value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,15 +5,6 @@ module ActiveRecord
         class DateTime < Type::DateTime # :nodoc:
           include Infinity
 
-          def type_cast_for_database(value)
-            if has_precision? && value.acts_like?(:time) && value.year <= 0
-              bce_year = format("%04d", -value.year + 1)
-              super.sub(/^-?\d+/, bce_year) + " BC"
-            else
-              super
-            end
-          end
-
           def cast_value(value)
             if value.is_a?(::String)
               case value

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

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Enum < Type::Value # :nodoc:
+          def type
+            :enum
+          end
+
+          def type_cast(value)
+            value.to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Redshift
+      module OID # :nodoc:
+        class Hstore < Type::Value # :nodoc:
+          include Type::Mutable
+
+          def type
+            :hstore
+          end
+
+          def type_cast_from_database(value)
+            if value.is_a?(::String)
+              ::Hash[value.scan(HstorePair).map { |k, v|
+                v = v.upcase == 'NULL' ? nil : v.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1')
+                k = k.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1')
+                [k, v]
+              }]
+            else
+              value
+            end
+          end
+
+          def type_cast_for_database(value)
+            if value.is_a?(::Hash)
+              value.map { |k, v| "#{escape_hstore(k)}=>#{escape_hstore(v)}" }.join(', ')
+            else
+              value
+            end
+          end
+
+          def accessor
+            ActiveRecord::Store::StringKeyedHashAccessor
+          end
+
+          private
+
+          HstorePair = begin
+            quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"/
+            unquoted_string = /(?:\\.|[^\s,])[^\s=,\\]*(?:\\.[^\s=,\\]*|=[^,>])*/
+            /(#{quoted_string}|#{unquoted_string})\s*=>\s*(#{quoted_string}|#{unquoted_string})/
+          end
+
+          def escape_hstore(value)
+            if value.nil?
+              'NULL'
+            else
+              if value == ""
+                '""'
+              else
+                '"%s"' % value.to_s.gsub(/(["\\])/, '\\\\\1')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end