From 2c043caefdab7e602c66b828f810c23df322787d Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 3 Apr 2010 22:18:55 +0200
Subject: [PATCH] Creating a database as an other user and giving grants
 doesn't seem to work for Ingres. Strange so for now create everything using
 the -u${db_user} option. This is something that needs to be investigated as
 it should be possible to have an different owner of the database.

---
 bacula/src/cats/create_ingres_database.in  | 5 +++--
 bacula/src/cats/drop_ingres_database.in    | 6 ++++--
 bacula/src/cats/drop_ingres_tables.in      | 5 +++--
 bacula/src/cats/grant_ingres_privileges.in | 3 ++-
 bacula/src/cats/make_ingres_tables.in      | 3 ++-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bacula/src/cats/create_ingres_database.in b/bacula/src/cats/create_ingres_database.in
index 1e4973de70..9422010492 100755
--- a/bacula/src/cats/create_ingres_database.in
+++ b/bacula/src/cats/create_ingres_database.in
@@ -5,7 +5,8 @@
 
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=@db_name@
+db_name=${db_name:-@db_name@}
+db_user=${db_user:-@db_user@}
 
 # use SQL_ASCII to be able to put any filename into
 #  the database even those created with unusual character sets
@@ -21,7 +22,7 @@ ENCODING="ENCODING 'SQL_ASCII'"
 #
 #ENCODING="ENCODING 'UTF8'"
      
-if createdb $* ${db_name}
+if createdb -u${db_user} $* ${db_name}
 then
    echo "Creation of ${db_name} database succeeded."
 else
diff --git a/bacula/src/cats/drop_ingres_database.in b/bacula/src/cats/drop_ingres_database.in
index 23c75fe287..0a4c4f7a9a 100755
--- a/bacula/src/cats/drop_ingres_database.in
+++ b/bacula/src/cats/drop_ingres_database.in
@@ -4,9 +4,11 @@
 #
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
+PATH="$bindir:$PATH"
+db_name=${db_name:-@db_name@}
+db_user=${db_user:-@db_user@}
 
-if destroydb ${db_name}
+if destroydb -u${db_user} ${db_name}
 then
    echo "Drop of ${db_name} database succeeded."
 else
diff --git a/bacula/src/cats/drop_ingres_tables.in b/bacula/src/cats/drop_ingres_tables.in
index 10b9f3c4bd..08996aa3e7 100755
--- a/bacula/src/cats/drop_ingres_tables.in
+++ b/bacula/src/cats/drop_ingres_tables.in
@@ -3,8 +3,9 @@
 # shell script to delete Bacula tables for PostgreSQL
 
 bindir=@SQL_BINDIR@
-db_name=@db_name@
-db_user=@db_user@
+PATH="$bindir:$PATH"
+db_name=${db_name:-@db_name@}
+db_user=${db_user:-@db_user@}
 
 sql -u${db_user} ${db_name} $* <<END-OF-DATA
 DROP TABLE filename\g
diff --git a/bacula/src/cats/grant_ingres_privileges.in b/bacula/src/cats/grant_ingres_privileges.in
index 82bab040d4..fd87e1cfb1 100755
--- a/bacula/src/cats/grant_ingres_privileges.in
+++ b/bacula/src/cats/grant_ingres_privileges.in
@@ -3,6 +3,7 @@
 # shell script TO GRANT privileges to the bacula database
 #
 bindir=@SQL_BINDIR@
+PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
 db_user=${db_user:-@db_user@}
 
@@ -11,7 +12,7 @@ CREATE USER ${db_user}
 \g
 END-OF-DATA
 
-if sql ${db_name} $* <<END-OF-DATA
+if sql -u${db_user} ${db_name} $* <<END-OF-DATA
 
 -- for tables
 GRANT ALL ON TABLE filename TO ${db_user};
diff --git a/bacula/src/cats/make_ingres_tables.in b/bacula/src/cats/make_ingres_tables.in
index 24445df1b6..e58caa05f7 100755
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -5,8 +5,9 @@
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
+db_user=${db_user:-@db_user@}
 
-sql $* ${db_name} <<END-OF-DATA
+sql -u${db_user} $* ${db_name} <<END-OF-DATA
 
 SET AUTOCOMMIT ON\g
 
-- 
2.39.5