activerecord5-redshift-adapter 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b959184045064e88bb252f7187099071c8880a
-  data.tar.gz: 3e5501d98546343c70c3f0f3faecdc83e1127a9b
+  metadata.gz: 5d005f91339d55e76d7049742031c13f01e2d6c5
+  data.tar.gz: 921290bab163086925bb525c8fc46969449bbdb9
 SHA512:
-  metadata.gz: 31f426b79e9f0f535fe3d675ea33c3ab855211fa68fd60ebb8fe9d38d8c43dd0221b016fb23976ef3b278e4b0e75bef2b60a85a43cf512f13f350450d1485c3b
-  data.tar.gz: 0f820063d56b1a63f2ed71d3f19435ae542968729bd8df7bc6110ccc9c6e14c913ab1ab448917427e3e2a8728f565285df3b27898e389ca82a565c5bf789994f
+  metadata.gz: 1e487fc2579684324dd31c71f0abf79cc396ec643ab2e5732e27400bd5cc23383a4f203886209f9315b84384183f5f1c696e2bc76801050e54878b4879d1da63
+  data.tar.gz: 4745a50021f467e6ffd585a321f872ac4cba0acb2df54473cf829e339679eb439ed14d09f61a6cff2bf41682c7122f23c8ff76b1b6f203512521abc05694a443

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

@@ -45,16 +45,31 @@ module ActiveRecord
         end
 
         def select_value(arel, name = nil, binds = [])
-          arel, binds = binds_from_relation arel, binds
-          sql = to_sql(arel, binds)
+          # In Rails 5.2, arel_from_relation replaced binds_from_relation,
+          # so we see which method exists to get the variables
+          if respond_to?(:arel_from_relation, true)
+            arel = arel_from_relation(arel)
+            sql, binds = to_sql(arel, binds)
+          else
+            arel, binds = binds_from_relation arel, binds
+            sql = to_sql(arel, binds)
+          end
           execute_and_clear(sql, name, binds) do |result|
             result.getvalue(0, 0) if result.ntuples > 0 && result.nfields > 0
           end
         end
 
         def select_values(arel, name = nil)
-          arel, binds = binds_from_relation arel, []
-          sql = to_sql(arel, binds)
+          # In Rails 5.2, arel_from_relation replaced binds_from_relation,
+          # so we see which method exists to get the variables
+          if respond_to?(:arel_from_relation, true)
+            arel = arel_from_relation(arel)
+            sql, binds = to_sql(arel, [])
+          else
+            arel, binds = binds_from_relation arel, []
+            sql = to_sql(arel, binds)
+          end
+
           execute_and_clear(sql, name, binds) do |result|
             if result.nfields > 0
               result.column_values(0)
@@ -126,8 +141,8 @@ module ActiveRecord
           end
         end
 
-        # Executes an SQL statement, returning a PGresult object on success
-        # or raising a PGError exception otherwise.
+        # Executes an SQL statement, returning a PG::Result object on success
+        # or raising a PG::Error exception otherwise.
         def execute(sql, name = nil)
           log(sql, name) do
             @connection.async_exec(sql)

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

@@ -37,12 +37,12 @@ module ActiveRecord
 
         # Quotes column names for use in SQL queries.
         def quote_column_name(name) #:nodoc:
-          PGconn.quote_ident(name.to_s)
+          PG::Connection.quote_ident(name.to_s)
         end
 
         # Quotes schema names for use in SQL queries.
         def quote_schema_name(name)
-          PGconn.quote_ident(name)
+          PG::Connection.quote_ident(name)
         end
 
         # Quote date/time values for use in SQL input.

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

@@ -19,9 +19,9 @@ module ActiveRecord
 
         def quoted
           if schema
-            PGconn.quote_ident(schema) << SEPARATOR << PGconn.quote_ident(identifier)
+            PG::Connection.quote_ident(schema) << SEPARATOR << PG::Connection.quote_ident(identifier)
           else
-            PGconn.quote_ident(identifier)
+            PG::Connection.quote_ident(identifier)
           end
         end
 

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -34,10 +34,10 @@ module ActiveRecord
       conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
       conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-      # Forward only valid config params to PGconn.connect.
+      # Forward only valid config params to PG::Connection.connect.
       conn_params.keep_if { |k, _| RS_VALID_CONN_PARAMS.include?(k) }
 
-      # The postgres drivers don't allow the creation of an unconnected PGconn object,
+      # The postgres drivers don't allow the creation of an unconnected PG::Connection object,
       # so just pass a nil connection object for the time being.
       ConnectionAdapters::RedshiftAdapter.new(nil, logger, conn_params, config)
     end
@@ -176,8 +176,8 @@ module ActiveRecord
           end
 
           def connection_active?
-            @connection.status == PGconn::CONNECTION_OK
-          rescue PGError
+            @connection.status == PG::Connection::CONNECTION_OK
+          rescue PG::Error
             false
           end
       end
@@ -218,7 +218,7 @@ module ActiveRecord
       def active?
         @connection.query 'SELECT 1'
         true
-      rescue PGError
+      rescue PG::Error
         false
       end
 
@@ -522,7 +522,7 @@ module ActiveRecord
           # FEATURE_NOT_SUPPORTED.  Check here for more details:
           # http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
           begin
-            code = pgerror.result.result_error_field(PGresult::PG_DIAG_SQLSTATE)
+            code = pgerror.result.result_error_field(PG::Result::PG_DIAG_SQLSTATE)
           rescue
             raise e
           end
@@ -561,7 +561,7 @@ module ActiveRecord
         # Connects to a PostgreSQL server and sets up the adapter depending on the
         # connected server's characteristics.
         def connect
-          @connection = PGconn.connect(@connection_parameters)
+          @connection = PG::Connection.connect(@connection_parameters)
 
           configure_connection
         rescue ::PG::Error => error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord5-redshift-adapter
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Nancy Foen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Amazon Redshift adapter for ActiveRecord