activerecord7-redshift-adapter-pennylane 1.0.3 → 1.0.5

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
-if ActiveRecord.version >= Gem::Version.new('7.1.0')
+require 'pg'
+
+require_relative "../tasks/redshift_tasks"
+
+if ActiveRecord.version >= Gem::Version.new('7.2.0')
+  require_relative 'redshift_7_2_adapter'
+elsif ActiveRecord.version >= Gem::Version.new('7.1.0')
   require_relative 'redshift_7_1_adapter'
 elsif ActiveRecord.version >= Gem::Version.new('7.0.0')
   require_relative 'redshift_7_0_adapter'
 else
   raise 'no compatible version of ActiveRecord detected'
-end
+end

data/lib/active_record/tasks/redshift_7_0_tasks.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+# Based on https://github.com/rails/rails/blob/v7.0.8.4/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
+
+require "tempfile"
+
+module ActiveRecord
+  module Tasks # :nodoc:
+    class RedshiftDatabaseTasks # :nodoc:
+      DEFAULT_ENCODING = ENV["CHARSET"] || "utf8"
+      ON_ERROR_STOP_1 = "ON_ERROR_STOP=1"
+      SQL_COMMENT_BEGIN = "--"
+
+      delegate :connection, :establish_connection, :clear_active_connections!,
+        to: ActiveRecord::Base
+
+      def self.using_database_configurations?
+        true
+      end
+
+      def initialize(db_config)
+        @db_config = db_config
+        @configuration_hash = db_config.configuration_hash
+      end
+
+      def create(master_established = false)
+        establish_master_connection unless master_established
+        connection.create_database(db_config.database, configuration_hash.merge(encoding: encoding))
+        establish_connection(db_config)
+      end
+
+      def drop
+        establish_master_connection
+        connection.drop_database(db_config.database)
+      end
+
+      def charset
+        connection.encoding
+      end
+
+      def collation
+        connection.collation
+      end
+
+      def purge
+        clear_active_connections!
+        drop
+        create true
+      end
+
+      def structure_dump(filename, extra_flags)
+        search_path = \
+          case ActiveRecord.dump_schemas
+          when :schema_search_path
+            configuration_hash[:schema_search_path]
+          when :all
+            nil
+          when String
+            ActiveRecord.dump_schemas
+          end
+
+        args = ["--schema-only", "--no-privileges", "--no-owner"]
+        args.concat(["--file", filename])
+
+        args.concat(Array(extra_flags)) if extra_flags
+
+        unless search_path.blank?
+          args += search_path.split(",").map do |part|
+            "--schema=#{part.strip}"
+          end
+        end
+
+        ignore_tables = ActiveRecord::SchemaDumper.ignore_tables
+        if ignore_tables.any?
+          args += ignore_tables.flat_map { |table| ["-T", table] }
+        end
+
+        args << db_config.database
+        run_cmd("pg_dump", args, "dumping")
+        remove_sql_header_comments(filename)
+        File.open(filename, "a") { |f| f << "SET search_path TO #{connection.schema_search_path};\n\n" }
+      end
+
+      def structure_load(filename, extra_flags)
+        args = ["--set", ON_ERROR_STOP_1, "--quiet", "--no-psqlrc", "--output", File::NULL, "--file", filename]
+        args.concat(Array(extra_flags)) if extra_flags
+        args << db_config.database
+        run_cmd("psql", args, "loading")
+      end
+
+      private
+        attr_reader :db_config, :configuration_hash
+
+        def encoding
+          configuration_hash[:encoding] || DEFAULT_ENCODING
+        end
+
+        def establish_master_connection
+          establish_connection configuration_hash.merge(
+            database: "redshift",
+            schema_search_path: "public"
+          )
+        end
+
+        def psql_env
+          {}.tap do |env|
+            env["PGHOST"]         = db_config.host                        if db_config.host
+            env["PGPORT"]         = configuration_hash[:port].to_s        if configuration_hash[:port]
+            env["PGPASSWORD"]     = configuration_hash[:password].to_s    if configuration_hash[:password]
+            env["PGUSER"]         = configuration_hash[:username].to_s    if configuration_hash[:username]
+            env["PGSSLMODE"]      = configuration_hash[:sslmode].to_s     if configuration_hash[:sslmode]
+            env["PGSSLCERT"]      = configuration_hash[:sslcert].to_s     if configuration_hash[:sslcert]
+            env["PGSSLKEY"]       = configuration_hash[:sslkey].to_s      if configuration_hash[:sslkey]
+            env["PGSSLROOTCERT"]  = configuration_hash[:sslrootcert].to_s if configuration_hash[:sslrootcert]
+          end
+        end
+
+        def run_cmd(cmd, args, action)
+          fail run_cmd_error(cmd, args, action) unless Kernel.system(psql_env, cmd, *args)
+        end
+
+        def run_cmd_error(cmd, args, action)
+          msg = +"failed to execute:\n"
+          msg << "#{cmd} #{args.join(' ')}\n\n"
+          msg << "Please check the output above for any errors and make sure that `#{cmd}` is installed in your PATH and has proper permissions.\n\n"
+          msg
+        end
+
+        def remove_sql_header_comments(filename)
+          removing_comments = true
+          tempfile = Tempfile.open("uncommented_structure.sql")
+          begin
+            File.foreach(filename) do |line|
+              unless removing_comments && (line.start_with?(SQL_COMMENT_BEGIN) || line.blank?)
+                tempfile << line
+                removing_comments = false
+              end
+            end
+          ensure
+            tempfile.close
+          end
+          FileUtils.cp(tempfile.path, filename)
+        end
+    end
+
+    DatabaseTasks.register_task(/redshift/, RedshiftDatabaseTasks)
+  end
+end

data/lib/active_record/tasks/redshift_7_1_tasks.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+# Based on https://github.com/rails/rails/blob/v7.1.4/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
+
+require "tempfile"
+
+module ActiveRecord
+  module Tasks # :nodoc:
+    class RedshiftDatabaseTasks # :nodoc:
+      DEFAULT_ENCODING = ENV["CHARSET"] || "utf8"
+      ON_ERROR_STOP_1 = "ON_ERROR_STOP=1"
+      SQL_COMMENT_BEGIN = "--"
+
+      def self.using_database_configurations?
+        true
+      end
+
+      def initialize(db_config)
+        @db_config = db_config
+        @configuration_hash = db_config.configuration_hash
+      end
+
+      def create(connection_already_established = false)
+        establish_connection(public_schema_config) unless connection_already_established
+        connection.create_database(db_config.database, configuration_hash.merge(encoding: encoding))
+        establish_connection
+      end
+
+      def drop
+        establish_connection(public_schema_config)
+        connection.drop_database(db_config.database)
+      end
+
+      def charset
+        connection.encoding
+      end
+
+      def collation
+        connection.collation
+      end
+
+      def purge
+        ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
+        drop
+        create true
+      end
+
+      def structure_dump(filename, extra_flags)
+        search_path = \
+          case ActiveRecord.dump_schemas
+          when :schema_search_path
+            configuration_hash[:schema_search_path]
+          when :all
+            nil
+          when String
+            ActiveRecord.dump_schemas
+          end
+
+        args = ["--schema-only", "--no-privileges", "--no-owner"]
+        args.concat(["--file", filename])
+
+        args.concat(Array(extra_flags)) if extra_flags
+
+        unless search_path.blank?
+          args += search_path.split(",").map do |part|
+            "--schema=#{part.strip}"
+          end
+        end
+
+        ignore_tables = ActiveRecord::SchemaDumper.ignore_tables
+        if ignore_tables.any?
+          ignore_tables = connection.data_sources.select { |table| ignore_tables.any? { |pattern| pattern === table } }
+          args += ignore_tables.flat_map { |table| ["-T", table] }
+        end
+
+        args << db_config.database
+        run_cmd("pg_dump", args, "dumping")
+        remove_sql_header_comments(filename)
+        File.open(filename, "a") { |f| f << "SET search_path TO #{connection.schema_search_path};\n\n" }
+      end
+
+      def structure_load(filename, extra_flags)
+        args = ["--set", ON_ERROR_STOP_1, "--quiet", "--no-psqlrc", "--output", File::NULL, "--file", filename]
+        args.concat(Array(extra_flags)) if extra_flags
+        args << db_config.database
+        run_cmd("psql", args, "loading")
+      end
+
+      private
+        attr_reader :db_config, :configuration_hash
+
+        def connection
+          ActiveRecord::Base.connection
+        end
+
+        def establish_connection(config = db_config)
+          ActiveRecord::Base.establish_connection(config)
+        end
+
+        def encoding
+          configuration_hash[:encoding] || DEFAULT_ENCODING
+        end
+
+        def public_schema_config
+          configuration_hash.merge(database: "redshift", schema_search_path: "public")
+        end
+
+        def psql_env
+          {}.tap do |env|
+            env["PGHOST"]         = db_config.host                        if db_config.host
+            env["PGPORT"]         = configuration_hash[:port].to_s        if configuration_hash[:port]
+            env["PGPASSWORD"]     = configuration_hash[:password].to_s    if configuration_hash[:password]
+            env["PGUSER"]         = configuration_hash[:username].to_s    if configuration_hash[:username]
+            env["PGSSLMODE"]      = configuration_hash[:sslmode].to_s     if configuration_hash[:sslmode]
+            env["PGSSLCERT"]      = configuration_hash[:sslcert].to_s     if configuration_hash[:sslcert]
+            env["PGSSLKEY"]       = configuration_hash[:sslkey].to_s      if configuration_hash[:sslkey]
+            env["PGSSLROOTCERT"]  = configuration_hash[:sslrootcert].to_s if configuration_hash[:sslrootcert]
+          end
+        end
+
+        def run_cmd(cmd, args, action)
+          fail run_cmd_error(cmd, args, action) unless Kernel.system(psql_env, cmd, *args)
+        end
+
+        def run_cmd_error(cmd, args, action)
+          msg = +"failed to execute:\n"
+          msg << "#{cmd} #{args.join(' ')}\n\n"
+          msg << "Please check the output above for any errors and make sure that `#{cmd}` is installed in your PATH and has proper permissions.\n\n"
+          msg
+        end
+
+        def remove_sql_header_comments(filename)
+          removing_comments = true
+          tempfile = Tempfile.open("uncommented_structure.sql")
+          begin
+            File.foreach(filename) do |line|
+              unless removing_comments && (line.start_with?(SQL_COMMENT_BEGIN) || line.blank?)
+                tempfile << line
+                removing_comments = false
+              end
+            end
+          ensure
+            tempfile.close
+          end
+          FileUtils.cp(tempfile.path, filename)
+        end
+    end
+
+    DatabaseTasks.register_task(/redshift/, RedshiftDatabaseTasks)
+  end
+end

data/lib/active_record/tasks/redshift_7_2_tasks.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+# Based on https://github.com/rails/rails/blob/v7.2.1/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
+
+require "tempfile"
+
+module ActiveRecord
+  module Tasks # :nodoc:
+    class RedshiftDatabaseTasks # :nodoc:
+      DEFAULT_ENCODING = ENV["CHARSET"] || "utf8"
+      ON_ERROR_STOP_1 = "ON_ERROR_STOP=1"
+      SQL_COMMENT_BEGIN = "--"
+
+      def self.using_database_configurations?
+        true
+      end
+
+      def initialize(db_config)
+        @db_config = db_config
+        @configuration_hash = db_config.configuration_hash
+      end
+
+      def create(connection_already_established = false)
+        establish_connection(public_schema_config) unless connection_already_established
+        connection.create_database(db_config.database, configuration_hash.merge(encoding: encoding))
+        establish_connection
+      end
+
+      def drop
+        establish_connection(public_schema_config)
+        connection.drop_database(db_config.database)
+      end
+
+      def charset
+        connection.encoding
+      end
+
+      def collation
+        connection.collation
+      end
+
+      def purge
+        ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
+        drop
+        create true
+      end
+
+      def structure_dump(filename, extra_flags)
+        search_path = \
+          case ActiveRecord.dump_schemas
+          when :schema_search_path
+            configuration_hash[:schema_search_path]
+          when :all
+            nil
+          when String
+            ActiveRecord.dump_schemas
+          end
+
+        args = ["--schema-only", "--no-privileges", "--no-owner"]
+        args.concat(["--file", filename])
+
+        args.concat(Array(extra_flags)) if extra_flags
+
+        unless search_path.blank?
+          args += search_path.split(",").map do |part|
+            "--schema=#{part.strip}"
+          end
+        end
+
+        ignore_tables = ActiveRecord::SchemaDumper.ignore_tables
+        if ignore_tables.any?
+          ignore_tables = connection.data_sources.select { |table| ignore_tables.any? { |pattern| pattern === table } }
+          args += ignore_tables.flat_map { |table| ["-T", table] }
+        end
+
+        args << db_config.database
+        run_cmd("pg_dump", args, "dumping")
+        remove_sql_header_comments(filename)
+        File.open(filename, "a") { |f| f << "SET search_path TO #{connection.schema_search_path};\n\n" }
+      end
+
+      def structure_load(filename, extra_flags)
+        args = ["--set", ON_ERROR_STOP_1, "--quiet", "--no-psqlrc", "--output", File::NULL, "--file", filename]
+        args.concat(Array(extra_flags)) if extra_flags
+        args << db_config.database
+        run_cmd("psql", args, "loading")
+      end
+
+      private
+        attr_reader :db_config, :configuration_hash
+
+        def connection
+          ActiveRecord::Base.lease_connection
+        end
+
+        def establish_connection(config = db_config)
+          ActiveRecord::Base.establish_connection(config)
+        end
+
+        def encoding
+          configuration_hash[:encoding] || DEFAULT_ENCODING
+        end
+
+        def public_schema_config
+          configuration_hash.merge(database: "redshift", schema_search_path: "public")
+        end
+
+        def psql_env
+          {}.tap do |env|
+            env["PGHOST"]         = db_config.host                        if db_config.host
+            env["PGPORT"]         = configuration_hash[:port].to_s        if configuration_hash[:port]
+            env["PGPASSWORD"]     = configuration_hash[:password].to_s    if configuration_hash[:password]
+            env["PGUSER"]         = configuration_hash[:username].to_s    if configuration_hash[:username]
+            env["PGSSLMODE"]      = configuration_hash[:sslmode].to_s     if configuration_hash[:sslmode]
+            env["PGSSLCERT"]      = configuration_hash[:sslcert].to_s     if configuration_hash[:sslcert]
+            env["PGSSLKEY"]       = configuration_hash[:sslkey].to_s      if configuration_hash[:sslkey]
+            env["PGSSLROOTCERT"]  = configuration_hash[:sslrootcert].to_s if configuration_hash[:sslrootcert]
+          end
+        end
+
+        def run_cmd(cmd, args, action)
+          fail run_cmd_error(cmd, args, action) unless Kernel.system(psql_env, cmd, *args)
+        end
+
+        def run_cmd_error(cmd, args, action)
+          msg = +"failed to execute:\n"
+          msg << "#{cmd} #{args.join(' ')}\n\n"
+          msg << "Please check the output above for any errors and make sure that `#{cmd}` is installed in your PATH and has proper permissions.\n\n"
+          msg
+        end
+
+        def remove_sql_header_comments(filename)
+          removing_comments = true
+          tempfile = Tempfile.open("uncommented_structure.sql")
+          begin
+            File.foreach(filename) do |line|
+              unless removing_comments && (line.start_with?(SQL_COMMENT_BEGIN) || line.blank?)
+                tempfile << line
+                removing_comments = false
+              end
+            end
+          ensure
+            tempfile.close
+          end
+          FileUtils.cp(tempfile.path, filename)
+        end
+    end
+
+    DatabaseTasks.register_task(/redshift/, RedshiftDatabaseTasks)
+  end
+end

data/lib/active_record/tasks/redshift_tasks.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+if ActiveRecord.version >= Gem::Version.new('7.2.0')
+  require_relative 'redshift_7_2_tasks'
+elsif ActiveRecord.version >= Gem::Version.new('7.1.0')
+  require_relative 'redshift_7_1_tasks'
+elsif ActiveRecord.version >= Gem::Version.new('7.0.0')
+  require_relative 'redshift_7_0_tasks'
+else
+  raise 'no compatible version of ActiveRecord detected'
+end

data/lib/activerecord7-redshift-adapter-pennylane.rb

@@ -0,0 +1,13 @@
+module Activerecord7RedshiftAdapterPennylane
+  class Railtie < ::Rails::Railtie
+    initializer "activerecord7-redshift-adapter-pennylane.setup" do
+      ActiveSupport.on_load(:active_record) do
+        # The adapter registration API was introduced in Rails 7.2.0 in
+        # https://github.com/rails/rails/commit/009c7e74117690f0dbe200188a929b345c9306c1
+        next unless ActiveRecord.version >= Gem::Version.new('7.2.0')
+
+        ActiveRecord::ConnectionAdapters.register('redshift', 'ActiveRecord::ConnectionAdapters::RedshiftAdapter')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord7-redshift-adapter-pennylane
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Nancy Foen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,7 +85,29 @@ files:
 - lib/active_record/connection_adapters/redshift_7_1/type_metadata.rb
 - lib/active_record/connection_adapters/redshift_7_1/utils.rb
 - lib/active_record/connection_adapters/redshift_7_1_adapter.rb
+- lib/active_record/connection_adapters/redshift_7_2/array_parser.rb
+- lib/active_record/connection_adapters/redshift_7_2/column.rb
+- lib/active_record/connection_adapters/redshift_7_2/database_statements.rb
+- lib/active_record/connection_adapters/redshift_7_2/oid.rb
+- lib/active_record/connection_adapters/redshift_7_2/oid/date_time.rb
+- lib/active_record/connection_adapters/redshift_7_2/oid/decimal.rb
+- lib/active_record/connection_adapters/redshift_7_2/oid/json.rb
+- lib/active_record/connection_adapters/redshift_7_2/oid/jsonb.rb
+- lib/active_record/connection_adapters/redshift_7_2/oid/type_map_initializer.rb
+- lib/active_record/connection_adapters/redshift_7_2/quoting.rb
+- lib/active_record/connection_adapters/redshift_7_2/referential_integrity.rb
+- lib/active_record/connection_adapters/redshift_7_2/schema_definitions.rb
+- lib/active_record/connection_adapters/redshift_7_2/schema_dumper.rb
+- lib/active_record/connection_adapters/redshift_7_2/schema_statements.rb
+- lib/active_record/connection_adapters/redshift_7_2/type_metadata.rb
+- lib/active_record/connection_adapters/redshift_7_2/utils.rb
+- lib/active_record/connection_adapters/redshift_7_2_adapter.rb
 - lib/active_record/connection_adapters/redshift_adapter.rb
+- lib/active_record/tasks/redshift_7_0_tasks.rb
+- lib/active_record/tasks/redshift_7_1_tasks.rb
+- lib/active_record/tasks/redshift_7_2_tasks.rb
+- lib/active_record/tasks/redshift_tasks.rb
+- lib/activerecord7-redshift-adapter-pennylane.rb
 homepage: https://github.com/pennylane-hq/activerecord7-redshift-adapter
 licenses:
 - MIT
@@ -105,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Amazon Redshift adapter for ActiveRecord