From 1b55948641c15d15ca01d09e2fb093b97f3cdb70 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 30 Oct 2014 00:59:46 +0000
Subject: Use the specified user for db.lua listdatabases

---
 db.lua | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'db.lua')

diff --git a/db.lua b/db.lua
index adcc25a..2de44c3 100644
--- a/db.lua
+++ b/db.lua
@@ -166,7 +166,16 @@ end
 export.listdatabases = function(dbobject)
 	local result = {}
 	if dbobject.engine == mymodule.engine.postgresql then
-		local cmd = {"psql", "-U", "postgres", "-lt"}
+		local cmd = {"psql", "-lt", "-U"}
+		local stdin
+		if dbobject.user and dbobject.user ~= "" then
+			cmd[#cmd+1] = dbobject.user
+		else
+			cmd[#cmd+1] = "postgres"
+		end
+		if dbobject.password and dbobject.password ~= "" then
+			-- Have never seen a need to use password
+		end
 		if dbobject.host and dbobject.host ~= "" then
 			cmd[#cmd+1] = "-h"
 			cmd[#cmd+1] = dbobject.host
@@ -176,7 +185,6 @@ export.listdatabases = function(dbobject)
 			cmd[#cmd+1] = dbobject.port
 		end
 		cmd["stderr"]=subprocess.STDOUT
-APP.logevent("calling: "..table.concat(cmd, " "))
 		local code, cmdresult = subprocess.call_capture(cmd)
 		if code ~= 0 then
 			error(cmdresult, 0)
-- 
cgit v1.2.3