activerecord6-redshift-adapter 1.1.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aed3175ea88bb9b6b163ffc7b198768b81c16330dc1d7b480d7d1a17356f6033
-  data.tar.gz: 66de7284e67e34a05bbd376be4cd8c3ee0a0c3b7565db16229a7c1512eb0de41
+  metadata.gz: 9b6838020bc89ee6ffd8861657f32f98219011a7cf3f4592fc341704a866fff8
+  data.tar.gz: 232c5134bb175bc46a1762b7dc9a002bcd79656b7a7a20fef07aeea0b105e99d
 SHA512:
-  metadata.gz: c840dd282c228c3aab781e770ac40a8c5a2ee3ddb71c6d380f27cf6a9c411ed3ff5c659cfa6dbaa768da6db58dadbdefec8736309f4cff360a5639fcf2c83c96
-  data.tar.gz: bce5739dd4b207c1c92f726b80ad0a920eeb04b3f5d76800e5ff0121bd3a2c79474a967795c6ca4c7d567b6c8654dd9620188aa8397f0ee0a38886a072eb0439
+  metadata.gz: dad43df760170a8b2cfb967c17d0726fb66006f8f070d7b932dd66f415705dc53cbca96a227298c3781dc2f75c69f7806c7c08b90895837717f84b534a1ed927
+  data.tar.gz: 0db86869e3b6f4a02dcdbd2c28a92678e006e24d1f0bd95566dd8b7f3697e19d8c3edc7be4a514a24c36e7a77558317f5849663931b5916e6e20d6e2f2c56750

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

@@ -3,8 +3,18 @@ module ActiveRecord
     class RedshiftColumn < Column #:nodoc:
       delegate :oid, :fmod, to: :sql_type_metadata
 
-      def initialize(name, default, sql_type_metadata, null = true, default_function = nil)
-        super name, default, sql_type_metadata, null, default_function
+      if ActiveRecord::VERSION::MAJOR >= 6 && ActiveRecord::VERSION::MINOR >= 1
+        # Required for Rails 6.1, see https://github.com/rails/rails/pull/41756
+        mattr_reader :array, default: false
+        alias :array? :array
+
+        def initialize(name, default, sql_type_metadata, null = true, default_function = nil, **)
+          super name, default, sql_type_metadata, null, default_function
+        end
+      else
+        def initialize(name, default, sql_type_metadata, null = true, default_function = nil)
+          super name, default, sql_type_metadata, null, default_function
+        end
       end
     end
   end

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

@@ -87,7 +87,14 @@ module ActiveRecord
 
         # Executes a SELECT query and returns an array of rows. Each row is an
         # array of field values.
-        def select_rows(sql, name = nil, binds = [])
+        def select_rows(arel, name = nil, binds = [])
+          if respond_to?(:arel_from_relation, true)
+            arel = arel_from_relation(arel)
+            sql, binds = to_sql_and_binds(arel, [])
+          else
+            arel, binds = binds_from_relation arel, []
+            sql = to_sql(arel, binds)
+          end
           execute_and_clear(sql, name, binds) do |result|
             result.values
           end

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

@@ -1,21 +1,42 @@
 module ActiveRecord
   module ConnectionAdapters
     module Redshift
-      class SchemaCreation < AbstractAdapter::SchemaCreation
-        private
 
-        def visit_ColumnDefinition(o)
-          o.sql_type = type_to_sql(o.type, limit: o.limit, precision: o.precision, scale: o.scale)
-          super
+      if ActiveRecord::VERSION::MAJOR >= 6 && ActiveRecord::VERSION::MINOR >= 1
+        class SchemaCreation < SchemaCreation
+          private
+
+          def visit_ColumnDefinition(o)
+            o.sql_type = type_to_sql(o.type, limit: o.limit, precision: o.precision, scale: o.scale)
+            super
+          end
+
+          def add_column_options!(sql, options)
+            column = options.fetch(:column) { return super }
+            if column.type == :uuid && options[:default] =~ /\(\)/
+              sql << " DEFAULT #{options[:default]}"
+            else
+              super
+            end
+          end
         end
+      else
+        class SchemaCreation < AbstractAdapter::SchemaCreation
+          private
 
-        def add_column_options!(sql, options)
-          column = options.fetch(:column) { return super }
-          if column.type == :uuid && options[:default] =~ /\(\)/
-            sql << " DEFAULT #{options[:default]}"
-          else
+          def visit_ColumnDefinition(o)
+            o.sql_type = type_to_sql(o.type, limit: o.limit, precision: o.precision, scale: o.scale)
             super
           end
+
+          def add_column_options!(sql, options)
+            column = options.fetch(:column) { return super }
+            if column.type == :uuid && options[:default] =~ /\(\)/
+              sql << " DEFAULT #{options[:default]}"
+            else
+              super
+            end
+          end
         end
       end
 

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -159,7 +159,7 @@ module ActiveRecord
         super(connection, logger, config)
 
         @visitor = Arel::Visitors::PostgreSQL.new self
-        @visitor.extend(ConnectionAdapters::DetermineIfPreparableVisitor)
+        @visitor.extend(ConnectionAdapters::DetermineIfPreparableVisitor) if defined?(ConnectionAdapters::DetermineIfPreparableVisitor)
         @prepared_statements = false
 
         @connection_parameters = connection_parameters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord6-redshift-adapter
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Nancy Foen
@@ -11,29 +11,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -41,14 +38,11 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-description: Amazon Redshift _makeshift_ adapter for ActiveRecord 6.
-email: fantast.d@gmail.com
+description: Amazon Redshift adapter for ActiveRecord 6.x.
+email: contact@quent.in
 executables: []
 extensions: []
 extra_rdoc_files: []