Actually use user's ~/.psqlrc file

CrunchyData · Oct 22, 2024 · bf32370 · bf32370
1 parent 9e1c006
commit bf32370
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/cb.cr b/src/cb.cr
@@ -14,6 +14,8 @@ module CB
 
   DASHBOARD_HOST = ENV["CB_DASHBOARD_HOST"]? || HOST.gsub(/\Aapi\./, "")
 
+  PSQLRC = File.expand_path(ENV["PSQLRC"]? || "~/.psqlrc", home: true)
+
   # Release constants.
   BUILD_RELEASE  = {{ flag?(:release) }}
   SHARDS_VERSION = {{ `shards version "#{__DIR__}"`.chomp.stringify }}

diff --git a/src/cb/psql.cr b/src/cb/psql.cr
@@ -95,7 +95,7 @@ module CB
       end
 
       psqlrc = File.tempfile(c.id, "psqlrc")
-      File.copy("~/.psqlrc", psqlrc.path) if File.exists?("~/.psqlrc")
+      File.copy(CB::PSQLRC, psqlrc.path) if File.exists?(CB::PSQLRC)
       File.open(psqlrc.path, "a") do |f|
         f.puts "\\set ON_ERROR_ROLLBACK interactive"
         f.puts "\\set PROMPT1 '#{psqlpromptname}/%[%033[33;1m%]%x%x%x%[%033[0m%]%[%033[1m%]%/%[%033[0m%]%R%# '"