From 53be81b9edb6180103736ddf0101d01a17b9a657 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 3 Apr 2010 16:23:24 +0200
Subject: [PATCH] Fix grant script to set grants on correct sequence names and
 not PostgreSQL names.

---
 .../src/cats/grant_postgresql_privileges.in   | 32 +++++++++----------
 bacula/src/cats/make_ingres_tables.in         |  4 ---
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index 5480903bef..e7219d03cf 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -37,22 +37,22 @@ grant all on PathHierarchy  to ${db_user};
 grant all on PathVisibility to ${db_user};
 -- for sequences on those tables
 
-grant select, update on filename_filenameid_seq    to ${db_user};
-grant select, update on path_pathid_seq 	   to ${db_user};
-grant select, update on fileset_filesetid_seq	   to ${db_user};
-grant select, update on pool_poolid_seq 	   to ${db_user};
-grant select, update on client_clientid_seq	   to ${db_user};
-grant select, update on media_mediaid_seq	   to ${db_user};
-grant select, update on job_jobid_seq		   to ${db_user};
-grant select, update on file_fileid_seq 	   to ${db_user};
-grant select, update on jobmedia_jobmediaid_seq    to ${db_user};
-grant select, update on basefiles_baseid_seq	   to ${db_user};
-grant select, update on storage_storageid_seq	   to ${db_user};
-grant select, update on mediatype_mediatypeid_seq  to ${db_user};
-grant select, update on device_deviceid_seq	   to ${db_user};
-grant select, update on location_locationid_seq    to ${db_user};
-grant select, update on locationlog_loclogid_seq   to ${db_user};
-grant select, update on log_logid_seq		   to ${db_user};
+grant select, update on filename_seq    to ${db_user};
+grant select, update on path_seq 	to ${db_user};
+grant select, update on fileset_seq	to ${db_user};
+grant select, update on pool_seq 	to ${db_user};
+grant select, update on client_seq	to ${db_user};
+grant select, update on media_seq	to ${db_user};
+grant select, update on job_seq		to ${db_user};
+grant select, update on file_seq 	to ${db_user};
+grant select, update on jobmedia_seq    to ${db_user};
+grant select, update on basefiles_seq	to ${db_user};
+grant select, update on storage_seq	to ${db_user};
+grant select, update on mediatype_seq   to ${db_user};
+grant select, update on device_seq	to ${db_user};
+grant select, update on location_seq    to ${db_user};
+grant select, update on locationlog_seq to ${db_user};
+grant select, update on log_seq		to ${db_user};
 END-OF-DATA
 if [ $? -eq 0 ]
 then
diff --git a/bacula/src/cats/make_ingres_tables.in b/bacula/src/cats/make_ingres_tables.in
index e2151fe1f6..379d4d79e6 100755
--- a/bacula/src/cats/make_ingres_tables.in
+++ b/bacula/src/cats/make_ingres_tables.in
@@ -268,7 +268,6 @@ CREATE TABLE Device (
    PRIMARY KEY(DeviceId)
    );
 
-
 CREATE SEQUENCE pool_seq;
 CREATE TABLE pool
 (
@@ -343,8 +342,6 @@ CREATE TABLE LocationLog (
    PRIMARY KEY(LocLogId)
 );
 
-
-
 CREATE TABLE counters
 (
     counter	      varchar(256)	  not null,
@@ -355,7 +352,6 @@ CREATE TABLE counters
     primary key (counter)
 );
 
-
 CREATE SEQUENCE basefiles_seq;
 CREATE TABLE basefiles
 (
-- 
2.39.2