From 9a6cab90048d12923ea719b0260e46e03b8c6b36 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 10 Apr 2010 12:18:43 +0200
Subject: [PATCH] Revert "Creating a database as an other user and giving
 grants doesn't seem to work for Ingres."

This reverts commit a87309a9aa0729805910bbfbab8f8a57d7f0629c.
---
 bacula/src/cats/create_ingres_database.in  | 5 ++---
 bacula/src/cats/drop_ingres_database.in    | 6 ++----
 bacula/src/cats/drop_ingres_tables.in      | 4 +---
 bacula/src/cats/grant_ingres_privileges.in | 3 +--
 bacula/src/cats/make_ingres_tables.in      | 3 +--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/bacula/src/cats/create_ingres_database.in b/bacula/src/cats/create_ingres_database.in
index 9422010492..1e4973de70 100755
--- a/bacula/src/cats/create_ingres_database.in
+++ b/bacula/src/cats/create_ingres_database.in
@@ -5,8 +5,7 @@
 
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=@db_name@
 
 # use SQL_ASCII to be able to put any filename into
 #  the database even those created with unusual character sets
@@ -22,7 +21,7 @@ ENCODING="ENCODING 'SQL_ASCII'"
 #
 #ENCODING="ENCODING 'UTF8'"
      
-if createdb -u${db_user} $* ${db_name}
+if createdb $* ${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 0a4c4f7a9a..23c75fe287 100755
--- a/bacula/src/cats/drop_ingres_database.in
+++ b/bacula/src/cats/drop_ingres_database.in
@@ -4,11 +4,9 @@
 #
 
 bindir=@SQL_BINDIR@
-PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=@db_name@
 
-if destroydb -u${db_user} ${db_name}
+if destroydb ${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 08996aa3e7..ac6b6eadca 100755
--- a/bacula/src/cats/drop_ingres_tables.in
+++ b/bacula/src/cats/drop_ingres_tables.in
@@ -3,9 +3,7 @@
 # shell script to delete Bacula tables for PostgreSQL
 
 bindir=@SQL_BINDIR@
-PATH="$bindir:$PATH"
-db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
+db_name=@db_name@
 
 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 fd87e1cfb1..82bab040d4 100755
--- a/bacula/src/cats/grant_ingres_privileges.in
+++ b/bacula/src/cats/grant_ingres_privileges.in
@@ -3,7 +3,6 @@
 # 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@}
 
@@ -12,7 +11,7 @@ CREATE USER ${db_user}
 \g
 END-OF-DATA
 
-if sql -u${db_user} ${db_name} $* <<END-OF-DATA
+if sql ${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 43f68d9224..caeeaffdde 100755
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -5,9 +5,8 @@
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
 db_name=${db_name:-@db_name@}
-db_user=${db_user:-@db_user@}
 
-sql -u${db_user} $* ${db_name} <<END-OF-DATA
+sql $* ${db_name} <<END-OF-DATA
 
 SET AUTOCOMMIT ON\g
 
-- 
2.39.5