Reproduce Rails PG adapter changes (#44)

lib/active_record/connection_adapters/redshift_7_0/database_statements.rb

@@ -207,6 +207,11 @@ def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
           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'

lib/active_record/connection_adapters/redshift_7_0/schema_statements.rb

@@ -220,17 +220,17 @@ def schema_search_path
         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

lib/active_record/connection_adapters/redshift_7_0_adapter.rb

@@ -616,10 +616,6 @@ def configure_connection
         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:
@@ -651,8 +647,9 @@ def column_definitions(table_name) # :nodoc:
       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

lib/active_record/connection_adapters/redshift_7_1/schema_statements.rb

@@ -220,17 +220,17 @@ def schema_search_path
         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

lib/active_record/connection_adapters/redshift_7_1_adapter.rb

@@ -689,11 +689,6 @@ def reconfigure_connection_timezone
         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:
@@ -725,11 +720,6 @@ def column_definitions(table_name)
         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

lib/active_record/connection_adapters/redshift_7_2/schema_statements.rb

@@ -220,17 +220,17 @@ def schema_search_path
         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

lib/active_record/connection_adapters/redshift_7_2_adapter.rb

@@ -689,11 +689,6 @@ def reconfigure_connection_timezone
         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:
@@ -725,11 +720,6 @@ def column_definitions(table_name)
         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