Fix rails db command

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.14.0)
+    umbrellio-sequel-plugins (0.15.0)
       sequel
       symbiont-ruby
 

lib/umbrellio_sequel_plugins/rails_db_command.rb

@@ -9,45 +9,86 @@ class Rails::Command::DbconsoleCommand < Rails::Command::Base
   def perform
     require "rake"
     Rake.with_application(&:load_rakefile) # Needed to initialize Rails.application
-    Rails::DBConsole.start(options)
+    start!
   end
-end
-
-class Rails::DBConsole
-  DBConfig = Struct.new(:configuration_hash, :adapter, :database)
 
   private
 
-  def db_config
-    @db_config ||= DBConfig.new(configuration_hash, adapter, database)
+  # See ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.dbconsole
+  def start!
+    ENV["PGUSER"] = pg_config[:username] if pg_config[:username]
+    ENV["PGHOST"] = pg_config[:host] if pg_config[:host]
+    ENV["PGPORT"] = pg_config[:port].to_s if pg_config[:port]
+
+    if pg_config[:password] && options[:include_password]
+      ENV["PGPASSWORD"] = pg_config[:password].to_s
+    end
+
+    ENV["PGSSLMODE"] = pg_config[:sslmode].to_s if pg_config[:sslmode]
+    ENV["PGSSLCERT"] = pg_config[:sslcert].to_s if pg_config[:sslcert]
+    ENV["PGSSLKEY"] = pg_config[:sslkey].to_s if pg_config[:sslkey]
+    ENV["PGSSLROOTCERT"] = pg_config[:sslrootcert].to_s if pg_config[:sslrootcert]
+
+    if pg_config[:variables]
+      ENV["PGOPTIONS"] = pg_config[:variables].filter_map do |name, value|
+        "-c #{name}=#{value.to_s.gsub(/[ \\]/, '\\\\\0')}" unless value.in?([":default", :default])
+      end.join(" ")
+    end
+
+    find_cmd_and_exec("psql", database)
   end
 
-  def configuration_hash
-    return @configuration_hash if defined?(@configuration_hash)
+  def pg_config
+    @pg_config ||= begin
+      rails_db_config = Rails.application.config.database_configuration
 
-    rails_db_config = Rails.application.config.database_configuration
+      sequel_configuration = SequelRails::Configuration.new
+      SequelRails.configuration = sequel_configuration.merge!(raw: rails_db_config)
 
-    sequel_configuration = SequelRails::Configuration.new
-    SequelRails.configuration = sequel_configuration.merge!(raw: rails_db_config)
+      storage = SequelRails::Storage.adapter_for(Rails.env)
+      config = storage.config.with_indifferent_access
 
-    storage = SequelRails::Storage.adapter_for(Rails.env)
-    config = storage.config.with_indifferent_access
+      if @options[:server]
+        server_config = config.fetch(:servers).fetch(@options[:server])
+        config.merge!(server_config)
+      end
 
-    if @options[:server]
-      server_config = config.fetch(:servers).fetch(@options[:server])
-      config.merge!(server_config)
+      config
     end
-
-    @configuration_hash = config
   end
 
-  def adapter
-    mapping = SequelRails::DbConfig::ADAPTER_MAPPING.invert
-    value = configuration_hash.fetch(:adapter)
-    mapping[value] || value
+  # See ActiveRecord::ConnectionAdapters::AbstractAdapter.find_cmd_and_exec
+  def find_cmd_and_exec(commands, *args) # rubocop:disable Metrics/MethodLength
+    commands = Array(commands)
+
+    dirs_on_path = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
+    unless (ext = RbConfig::CONFIG["EXEEXT"]).empty?
+      commands = commands.map { |cmd| "#{cmd}#{ext}" }
+    end
+
+    full_path_command = nil
+    found = commands.detect do |cmd|
+      dirs_on_path.detect do |path|
+        full_path_command = File.join(path, cmd)
+        begin
+          stat = File.stat(full_path_command)
+        rescue SystemCallError
+        else
+          stat.file? && stat.executable?
+        end
+      end
+    end
+
+    if found
+      exec(*[full_path_command, *args].compact)
+    else
+      abort(
+        "Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.",
+      )
+    end
   end
 
   def database
-    @options[:database] || configuration_hash.fetch(:database)
+    options[:database] || pg_config.fetch(:database)
   end
 end

umbrellio-sequel-plugins.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.14.0"
+  gem_version = "0.15.0"
 
   if ENV.fetch("PUBLISH_JOB", nil)
     release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"