activerecord-redshift-adapter 8.0.0.beta1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d981a65a30765fe36e5e58616007f33103f238596de10188107d5e7bbe677093
-  data.tar.gz: 78f40be0d77ab87f6e4b3b1f6857f84aae35d0b5184a6fe1b320b14c080bbce9
+  metadata.gz: 692d2587480e3e8474c03b2f00acbf455a7e59c9f2e95c746b9fb67ee7edc8b3
+  data.tar.gz: e4e9f46485d980b6e52a052f60b9c01f6758e374b7be1beba575e811705a6dc8
 SHA512:
-  metadata.gz: f8a9a3801675594bc2a3400c3a4d4657247614b250558c7c169c1f720c0b8f8ce333b29e6a1e621bd3557539c69c8a5ecb160d059049e80ab24d3c531350aecb
-  data.tar.gz: f75478c7a7df07526ad528e562978bae1918b8146562d42bab6fcf45c8f8eff749b67a3efa5dc08530285642d5ed1003247c2fa64bf3ce60f3482b9824a79580
+  metadata.gz: 498a1d46c28dbe7432209ca5632756878709442396dd048b5785c4c06ef364113f03e075ffe05c0ce83f483383ae130f082011e24e983f78bc586e7a256fe1a3
+  data.tar.gz: 7f3128a718ed1ae5069912c14a339bb9b2c15f4253fee0f19d6052e3d051ae59660907d957d5909f5d11d819a643569014de15a2d0b162ce01778fc8c171a848

data/README.md

@@ -11,7 +11,7 @@ Thanks to the auhors.
 Usage
 -------------------
 
-For Rails, write following in Gemfile:
+For Rails, add the following in the Gemfile:
 
 ```ruby
 gem 'activerecord-redshift-adapter'
@@ -30,7 +30,8 @@ development:
   encoding: utf8
 ```
 
-or use it directly in the URL when establishing a connection:
+or use it directly in the connection or `DATABASE_URL`:
+
 ```ruby
 class SomeModel < ApplicationRecord
   establish_connection('redshift://username:password@host/database')

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

@@ -207,6 +207,11 @@ module ActiveRecord
           end
         end
 
+        # Returns the current ID of a table's sequence.
+        def last_insert_id_result(sequence_name)
+          internal_exec_query("SELECT currval(#{quote(sequence_name)})", "SQL")
+        end
+
         # Begins a transaction.
         def begin_db_transaction
           execute 'BEGIN'

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

@@ -220,17 +220,17 @@ module ActiveRecord
         end
 
         # Returns the sequence name for a table's primary key or some other specified key.
-        def default_sequence_name(table_name, pk = nil) # :nodoc:
-          result = serial_sequence(table_name, pk || 'id')
+        def default_sequence_name(table_name, pk = "id") # :nodoc:
+          result = serial_sequence(table_name, pk)
           return nil unless result
 
           Utils.extract_schema_qualified_name(result).to_s
         rescue ActiveRecord::StatementInvalid
-          Redshift::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq").to_s
+          Redshift::Name.new(nil, "#{table_name}_#{pk}_seq").to_s
         end
 
         def serial_sequence(table, column)
-          select_value("SELECT pg_get_serial_sequence('#{table}', '#{column}')", 'SCHEMA')
+          select_value("SELECT pg_get_serial_sequence(#{quote(table)}, #{quote(column)})", 'SCHEMA')
         end
 
         def set_pk_sequence!(table, value); end

data/lib/active_record/connection_adapters/redshift_7_0_adapter.rb

@@ -330,11 +330,8 @@ module ActiveRecord
       def translate_exception(exception, message:, sql:, binds:)
         return exception unless exception.respond_to?(:result)
 
-        case exception.message
-        when /duplicate key value violates unique constraint/
-          RecordNotUnique.new(message, exception)
-        when /violates foreign key constraint/
-          InvalidForeignKey.new(message, exception)
+        if exception.is_a?(PG::DuplicateDatabase)
+          DatabaseAlreadyExists.new(message, sql: sql, binds: binds)
         else
           super
         end
@@ -619,10 +616,6 @@ module ActiveRecord
         end
       end
 
-      def last_insert_id_result(sequence_name) # :nodoc:
-        exec_query("SELECT currval('#{sequence_name}')", 'SQL')
-      end
-
       # Returns the list of a table's column names, data types, and default values.
       #
       # The underlying query is roughly:
@@ -654,8 +647,9 @@ module ActiveRecord
       end
 
       def extract_table_ref_from_insert_sql(sql)
-        sql[/into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im]
-        Regexp.last_match(1)&.strip
+        if sql =~ /into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im
+          $1.delete('"').strip
+        end
       end
 
       def arel_visitor

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

@@ -220,17 +220,17 @@ module ActiveRecord
         end
 
         # Returns the sequence name for a table's primary key or some other specified key.
-        def default_sequence_name(table_name, pk = nil) # :nodoc:
-          result = serial_sequence(table_name, pk || 'id')
+        def default_sequence_name(table_name, pk = 'id') # :nodoc:
+          result = serial_sequence(table_name, pk)
           return nil unless result
 
           Utils.extract_schema_qualified_name(result).to_s
         rescue ActiveRecord::StatementInvalid
-          Redshift::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq").to_s
+          Redshift::Name.new(nil, "#{table_name}_#{pk}_seq").to_s
         end
 
         def serial_sequence(table, column)
-          select_value("SELECT pg_get_serial_sequence('#{table}', '#{column}')", 'SCHEMA')
+          select_value("SELECT pg_get_serial_sequence(#{quote(table)}, #{quote(column)})", 'SCHEMA')
         end
 
         def set_pk_sequence!(table, value); end

data/lib/active_record/connection_adapters/redshift_7_1_adapter.rb

@@ -353,11 +353,8 @@ module ActiveRecord
       def translate_exception(exception, message:, sql:, binds:)
         return exception unless exception.respond_to?(:result)
 
-        case exception.message
-        when /duplicate key value violates unique constraint/
-          RecordNotUnique.new(message, exception)
-        when /violates foreign key constraint/
-          InvalidForeignKey.new(message, exception)
+        if exception.is_a?(PG::DuplicateDatabase)
+          DatabaseAlreadyExists.new(message, sql: sql, binds: binds)
         else
           super
         end
@@ -692,11 +689,6 @@ module ActiveRecord
         end
       end
 
-      def last_insert_id_result(sequence_name)
-        # :nodoc:
-        exec_query("SELECT currval('#{sequence_name}')", 'SQL')
-      end
-
       # Returns the list of a table's column names, data types, and default values.
       #
       # The underlying query is roughly:
@@ -728,11 +720,6 @@ module ActiveRecord
         END_SQL
       end
 
-      def extract_table_ref_from_insert_sql(sql)
-        sql[/into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im]
-        Regexp.last_match(1)&.strip
-      end
-
       def arel_visitor
         Arel::Visitors::PostgreSQL.new(self)
       end

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

@@ -220,17 +220,17 @@ module ActiveRecord
         end
 
         # Returns the sequence name for a table's primary key or some other specified key.
-        def default_sequence_name(table_name, pk = nil) # :nodoc:
-          result = serial_sequence(table_name, pk || 'id')
+        def default_sequence_name(table_name, pk = 'id') # :nodoc:
+          result = serial_sequence(table_name, pk)
           return nil unless result
 
           Utils.extract_schema_qualified_name(result).to_s
         rescue ActiveRecord::StatementInvalid
-          Redshift::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq").to_s
+          Redshift::Name.new(nil, "#{table_name}_#{pk}_seq").to_s
         end
 
         def serial_sequence(table, column)
-          select_value("SELECT pg_get_serial_sequence('#{table}', '#{column}')", 'SCHEMA')
+          select_value("SELECT pg_get_serial_sequence(#{quote(table)}, #{quote(column)})".tap { puts _1 }, 'SCHEMA')
         end
 
         def set_pk_sequence!(table, value); end

data/lib/active_record/connection_adapters/redshift_7_2_adapter.rb

@@ -353,11 +353,8 @@ module ActiveRecord
       def translate_exception(exception, message:, sql:, binds:)
         return exception unless exception.respond_to?(:result)
 
-        case exception.message
-        when /duplicate key value violates unique constraint/
-          RecordNotUnique.new(message, exception)
-        when /violates foreign key constraint/
-          InvalidForeignKey.new(message, exception)
+        if exception.is_a?(PG::DuplicateDatabase)
+          DatabaseAlreadyExists.new(message, sql: sql, binds: binds)
         else
           super
         end
@@ -692,11 +689,6 @@ module ActiveRecord
         end
       end
 
-      def last_insert_id_result(sequence_name)
-        # :nodoc:
-        exec_query("SELECT currval('#{sequence_name}')", 'SQL')
-      end
-
       # Returns the list of a table's column names, data types, and default values.
       #
       # The underlying query is roughly:
@@ -728,11 +720,6 @@ module ActiveRecord
         END_SQL
       end
 
-      def extract_table_ref_from_insert_sql(sql)
-        sql[/into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im]
-        Regexp.last_match(1)&.strip
-      end
-
       def arel_visitor
         Arel::Visitors::PostgreSQL.new(self)
       end

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

@@ -220,17 +220,17 @@ module ActiveRecord
         end
 
         # Returns the sequence name for a table's primary key or some other specified key.
-        def default_sequence_name(table_name, pk = nil) # :nodoc:
-          result = serial_sequence(table_name, pk || 'id')
+        def default_sequence_name(table_name, pk = 'id') # :nodoc:
+          result = serial_sequence(table_name, pk)
           return nil unless result
 
           Utils.extract_schema_qualified_name(result).to_s
         rescue ActiveRecord::StatementInvalid
-          Redshift::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq").to_s
+          Redshift::Name.new(nil, "#{table_name}_#{pk}_seq").to_s
         end
 
         def serial_sequence(table, column)
-          select_value("SELECT pg_get_serial_sequence('#{table}', '#{column}')", 'SCHEMA')
+          select_value("SELECT pg_get_serial_sequence(#{quote(table)}, #{quote(column)})".tap { puts _1 }, 'SCHEMA')
         end
 
         def set_pk_sequence!(table, value); end

data/lib/active_record/connection_adapters/redshift_8_0_adapter.rb

@@ -353,11 +353,8 @@ module ActiveRecord
       def translate_exception(exception, message:, sql:, binds:)
         return exception unless exception.respond_to?(:result)
 
-        case exception.message
-        when /duplicate key value violates unique constraint/
-          RecordNotUnique.new(message, exception)
-        when /violates foreign key constraint/
-          InvalidForeignKey.new(message, exception)
+        if exception.is_a?(PG::DuplicateDatabase)
+          DatabaseAlreadyExists.new(message, sql: sql, binds: binds)
         else
           super
         end
@@ -691,11 +688,6 @@ module ActiveRecord
         end
       end
 
-      def last_insert_id_result(sequence_name)
-        # :nodoc:
-        exec_query("SELECT currval('#{sequence_name}')", 'SQL')
-      end
-
       # Returns the list of a table's column names, data types, and default values.
       #
       # The underlying query is roughly:
@@ -727,11 +719,6 @@ module ActiveRecord
         END_SQL
       end
 
-      def extract_table_ref_from_insert_sql(sql)
-        sql[/into\s("[A-Za-z0-9_."\[\]\s]+"|[A-Za-z0-9_."\[\]]+)\s*/im]
-        Regexp.last_match(1)&.strip
-      end
-
       def arel_visitor
         Arel::Visitors::PostgreSQL.new(self)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-redshift-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.0.beta1
+  version: 8.0.0
 platform: ruby
 authors:
 - Janusz Mordarski
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Amazon Redshift adapter for ActiveRecord