From: Dan Langille <dan@langille.org>
Date: Tue, 9 Dec 2003 21:27:09 +0000 (+0000)
Subject: Add PostgreSQL support.  Coding and testing is incomplete.
X-Git-Tag: Release-1.34.0~311
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad3da2e79965f41c9efc69bf0307db859715ef51;p=bacula%2Fbacula

Add PostgreSQL support.  Coding and testing is incomplete.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@845 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in
new file mode 100644
index 0000000000..7863c8eff8
--- /dev/null
+++ b/bacula/src/cats/create_postgresql_database.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# shell script to create Bacula database(s)
+#
+
+bindir=@SQL_BINDIR@
+
+if $bindir/psql $* -f <<END-OF-DATA
+CREATE DATABASE bacula;
+END-OF-DATA
+then
+   echo "Creation of bacula database succeeded."
+else
+   echo "Creation of bacula database failed."
+fi
+exit 0
diff --git a/bacula/src/cats/drop_postgresql_tables.in b/bacula/src/cats/drop_postgresql_tables.in
new file mode 100644
index 0000000000..3abd60ef34
--- /dev/null
+++ b/bacula/src/cats/drop_postgresql_tables.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# shell script to delete Bacula tables for PostgreSQL
+
+bindir=@SQL_BINDIR@
+
+if $bindir/mysql $* <<END-OF-DATA
+/c bacula
+drop table unsavedfiles;
+drop table basefiles;
+drop table jobmedia;
+drop table file;
+drop table job;
+drop table media;
+drop table client;
+drop table pool;
+drop table fileset;
+drop table path;
+drop table filename;
+drop table counters;
+drop table version;
+END-OF-DATA
+then
+   echo "Deletion of Bacula PostgreSQL tables succeeded."
+else
+   echo "Deletion of Bacula PostgreSQL tables failed."
+fi
+exit 0
diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
new file mode 100644
index 0000000000..21aa8858ff
--- /dev/null
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# shell script to grant privileges to the bacula database
+#
+bindir=@SQL_BINDIR@
+
+if $bindir/psql $* -f - <<END-OF-DATA
+\c bacula
+
+-- for tables
+grant all on unsavedfiles to bacula;
+grant all on basefiles    to bacula;
+grant all on jobmedia     to bacula;
+grant all on file         to bacula;
+grant all on job          to bacula;
+grant all on media        to bacula;
+grant all on client       to bacula;
+grant all on pool         to bacula;
+grant all on fileset      to bacula;
+grant all on path         to bacula;
+grant all on filename     to bacula;
+grant all on counters     to bacula;
+grant all on version      to bacula;
+
+-- for sequences on those tables
+
+grant update on filename_filenameid_seq to bacula;
+grant update on path_pathid_seq         to bacula;
+grant update on fileset_filesetid_seq   to bacula;
+grant update on pool_poolid_seq         to bacula;
+grant update on client_clientid_seq     to bacula;
+grant update on media_mediaid_seq       to bacula;
+grant update on job_jobid_seq           to bacula;
+grant update on file_fileid_seq         to bacula;
+grant update on jobmedia_jobmediaid_seq to bacula;
+grant update on basefiles_baseid_seq    to bacula;
+
+END-OF-DATA
+then
+   echo "Privileges for bacula granted."
+   exit 0
+else
+   echo "Error creating privileges."
+   exit 1
+fi
diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
new file mode 100644
index 0000000000..6233306397
--- /dev/null
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -0,0 +1,295 @@
+#!/bin/sh
+#
+# shell script to create Bacula PostgreSQL tables
+#
+bindir=@SQL_BINDIR@
+
+if $bindir/psql $* -f - <<END-OF-DATA
+\c bacula
+
+create table version
+(
+    versionid         integer               not null
+);
+
+INSERT INTO Version (VersionId) VALUES (7);
+
+create table counters
+(
+    counter           text                  not null,
+    MinValue          integer                       ,
+    maxvalue          integer                       ,
+    currentvalue      integer                       ,
+    wrapcounter       text                  not null,
+    primary key (counter)
+);
+
+create table filename
+(
+    filenameid        serial                not null,
+    name              text                  not null,
+    primary key (filenameid)
+);
+
+create index filename_name_idx on filename (name);
+
+create table path
+(
+    pathid            serial                not null,
+    name              text                  not null,
+    primary key (pathid)
+);
+
+create index path_name_idx on path (name);
+
+create table fileset
+(
+    filesetid         serial                not null,
+    name              text                  not null,
+    md5               text                  not null,
+    createtime        timestamp without time zone not null,
+    primary key (filesetid)
+);
+
+create index fileset_name_idx on fileset (name);
+
+create table pool
+(
+    poolid            serial                not null,
+    name              text                  not null,
+    numvols           integer               not null,
+    maxvols           integer               not null,
+    useonce           smallint              not null,
+    usecatalog        smallint              not null,
+    acceptanyvolume   smallint                      
+        default 0,
+    volretention      bigint                not null,
+    voluseduration    bigint                not null,
+    maxvoljobs        integer               not null,
+    maxvolfiles       integer               not null,
+    maxvolbytes       bigint                not null,
+    autoprune         smallint              not null
+        default 0,
+    recycle           smallint                      
+        default 0,
+    pooltype          text                          
+        check (pooltype is null or (pooltype in ('Backup','Copy','Cloned','Archive','Migration'))),
+    labelformat       text                  not null,
+    enabled           smallint              not null
+        default 1,
+    scratchpoolid     integer                       ,
+    recyclepoolid     integer                       ,
+    primary key (poolid)
+);
+
+create index pool_name_idx on pool (name);
+
+create table client
+(
+    clientid          serial                not null,
+    name              text                  not null,
+    uname             text                  not null,
+    autoprune         smallint                      
+        default 0,
+    fileretention     bigint                not null,
+    jobretention      bigint                not null,
+    primary key (clientid)
+);
+
+create unique index client_name_idx on client (name);
+
+create table media
+(
+    mediaid           serial                not null,
+    volumename        text                  not null,
+    slot              integer               not null
+        default 0,
+    poolid            integer               not null,
+    mediatype         text                  not null,
+    firstwritten      timestamp without time zone not null,
+    lastwritten       timestamp without time zone not null,
+    labeldate         timestamp without time zone not null,
+    voljobs           integer               not null,
+    volfiles          integer               not null,
+    volblocks         integer               not null,
+    volmounts         integer               not null,
+    volbytes          bigint                not null,
+    volerrors         integer               not null,
+    volwrites         integer               not null,
+    volcapacitybytes  bigint                not null,
+    volstatus         text                  not null
+        check (volstatus in ('Full','Archive','Append','Recycle','Purged','Read-Only','Disabled','Error','Busy',
+            'Used','Cleaning')),
+    recycle           smallint              not null,
+    volretention      bigint                not null,
+    voluseduration    bigint                not null,
+    maxvoljobs        integer               not null,
+    maxvolfiles       integer               not null,
+    mavvolbytes       bigint                not null,
+    drive             integer               not null
+        default 0,
+    inchanger         smallint              not null
+        default 0,
+    mediaaddressing   smallint              not null
+        default 0,
+    primary key (mediaid)
+);
+
+create table job
+(
+    jobid             serial                not null,
+    job               text                  not null,
+    name              text                  not null,
+    type              char(1)               not null,
+    level             char(1)               not null,
+    clientid          integer               not null,
+    jobstatus         char(1)               not null,
+    schedtime         timestamp without time zone not null,
+    starttime         timestamp without time zone not null,
+    endtime           timestamp without time zone not null,
+    jobtdate          bigint                not null,
+    volsessionid      integer               not null,
+    volsessiontime    integer               not null,
+    jobfiles          integer               not null,
+    jobbytes          bigint                not null,
+    joberrors         integer               not null,
+    jobmissingfiles   integer               not null,
+    poolid            integer               not null,
+    filesetid         integer               not null,
+    purgedfiles       smallint              not null
+        default 0,
+    hasbase           smallint              not null
+        default 0,
+    primary key (jobid)
+);
+
+create index job_name_idx on job (name);
+
+create table file
+(
+    fileid            serial                not null,
+    fileindex         integer               not null,
+    jobid             integer               not null,
+    pathid            integer               not null,
+    filenameid        bigint                not null,
+    markid            integer               not null
+        default 0,
+    lstat             text                  not null,
+    md5               text                  not null,
+    primary key (fileid)
+);
+
+create table jobmedia
+(
+    jobmediaid        serial                not null,
+    jobid             integer               not null,
+    mediaid           integer               not null,
+    firstindex        integer               not null,
+    lastindex         integer               not null,
+    startfile         integer               not null,
+    endfile           integer               not null,
+    startblock        integer               not null,
+    endblock          integer               not null,
+    volindex          integer               not null,
+    primary key (jobmediaid)
+);
+
+create index job_media_job_id_media_id_idx on jobmedia (jobid, mediaid);
+
+create table basefiles
+(
+    baseid            serial                not null,
+    jobid             integer               not null,
+    fileid            integer               not null,
+    fileindex         integer                       ,
+    basejobid         integer                       ,
+    primary key (baseid)
+);
+
+create table unsavedfiles
+(
+    UnsavedId         integer               not null,
+    jobid             integer               not null,
+    pathid            integer               not null,
+    filenameid        integer               not null,
+    primary key (UnsavedId)
+);
+
+alter table pool
+    add foreign key  (scratchpoolid)
+       references pool (poolid) on update cascade on delete cascade;
+
+alter table pool
+    add foreign key  (recyclepoolid)
+       references pool (poolid) on update cascade on delete cascade;
+
+alter table media
+    add foreign key  (poolid)
+       references pool (poolid) on update cascade on delete cascade;
+
+alter table job
+    add foreign key  (poolid)
+       references pool (poolid) on update cascade on delete cascade;
+
+alter table job
+    add foreign key  (filesetid)
+       references fileset (filesetid) on update cascade on delete cascade;
+
+alter table job
+    add foreign key  (clientid)
+       references client (clientid) on update cascade on delete cascade;
+
+alter table file
+    add foreign key  (jobid)
+       references job (jobid) on update cascade on delete cascade;
+
+alter table file
+    add foreign key  (pathid)
+       references path (pathid) on update cascade on delete restrict;
+
+alter table file
+    add foreign key  (filenameid)
+       references filename (filenameid) on update cascade on delete cascade;
+
+alter table jobmedia
+    add foreign key  (jobid)
+       references job (jobid) on update cascade on delete cascade;
+
+alter table jobmedia
+    add foreign key  (mediaid)
+       references media (mediaid) on update cascade on delete cascade;
+
+alter table basefiles
+    add foreign key  (jobid)
+       references job (jobid) on update cascade on delete cascade;
+
+alter table basefiles
+    add foreign key  (fileid)
+       references file (fileid) on update cascade on delete cascade;
+
+alter table basefiles
+    add foreign key  (basejobid)
+       references job (jobid) on update cascade on delete cascade;
+
+alter table unsavedfiles
+    add foreign key  (jobid)
+       references job (jobid) on update restrict on delete restrict;
+
+alter table unsavedfiles
+    add foreign key  (pathid)
+       references path (pathid) on update restrict on delete restrict;
+
+alter table unsavedfiles
+    add foreign key  (filenameid)
+       references filename (filenameid) on update restrict on delete restrict;
+
+
+
+
+END-OF-DATA
+then
+   echo "Creation of Bacula PostgreSQL tables succeeded."
+else
+   echo "Creation of Bacula PostgreSQL tables failed."
+fi
+exit 0
diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
new file mode 100644
index 0000000000..d5b3533f6c
--- /dev/null
+++ b/bacula/src/cats/postgresql.c
@@ -0,0 +1,496 @@
+/*
+ * Bacula Catalog Database routines specific to PostgreSQL
+ *   These are PostgreSQL specific routines
+ *
+ *    Dan Langille, December 2004
+ *    based upon work done by Kern Sibbald, March 2000
+ *
+ *    Version $Id$
+ */
+
+/*
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.
+
+ */
+
+
+/* The following is necessary so that we do not include
+ * the dummy external definition of DB.
+ */
+#define __SQL_C 		      /* indicate that this is sql.c */
+
+#include "bacula.h"
+#include "cats.h"
+
+#ifdef HAVE_POSTGRESQL
+
+/* -----------------------------------------------------------------------
+ *
+ *   PostgreSQL dependent defines and subroutines
+ *
+ * -----------------------------------------------------------------------
+ */
+
+/* List of open databases */
+static BQUEUE db_list = {&db_list, &db_list};
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/*
+ * Initialize database data structure. In principal this should
+ * never have errors, or it is really fatal.
+ */
+B_DB *
+db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password, 
+		 char *db_address, int db_port, char *db_socket) 
+{
+   B_DB *mdb;
+
+   if (!db_user) {		
+      Jmsg(jcr, M_FATAL, 0, _("A user name for PostgreSQL must be supplied.\n"));
+      return NULL;
+   }
+   P(mutex);			      /* lock DB queue */
+   /* Look to see if DB already open */
+   for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
+      if (strcmp(mdb->db_name, db_name) == 0) {
+         Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
+	 mdb->ref_count++;
+	 V(mutex);
+	 return mdb;		      /* already open */
+      }
+   }
+   Dmsg0(100, "db_open first time\n");
+   mdb = (B_DB *) malloc(sizeof(B_DB));
+   memset(mdb, 0, sizeof(B_DB));
+   mdb->db_name = bstrdup(db_name);
+   mdb->db_user = bstrdup(db_user);
+   if (db_password) {
+      mdb->db_password = bstrdup(db_password);
+   }
+   if (db_address) {
+      mdb->db_address  = bstrdup(db_address);
+   }
+   if (db_socket) {
+      mdb->db_socket   = bstrdup(db_socket);
+   }
+   mdb->db_port        = db_port;
+   mdb->have_insert_id = TRUE;
+   mdb->errmsg         = get_pool_memory(PM_EMSG); /* get error message buffer */
+   *mdb->errmsg        = 0;
+   mdb->cmd            = get_pool_memory(PM_EMSG);    /* get command buffer */
+   mdb->cached_path    = get_pool_memory(PM_FNAME);
+   mdb->cached_path_id = 0;
+   mdb->ref_count      = 1;
+   mdb->fname          = get_pool_memory(PM_FNAME);
+   mdb->path           = get_pool_memory(PM_FNAME);
+   mdb->esc_name       = get_pool_memory(PM_FNAME);
+   qinsert(&db_list, &mdb->bq); 	   /* put db in list */
+   V(mutex);
+   return mdb;
+}
+
+/*
+ * Now actually open the database.  This can generate errors,
+ * which are returned in the errmsg
+ */
+int
+db_open_database(JCR *jcr, B_DB *mdb)
+{
+   int errstat;
+
+   P(mutex);
+   if (mdb->connected) {
+      V(mutex);
+      return 1;
+   }
+   mdb->connected = FALSE;
+
+   if ((errstat=rwl_init(&mdb->lock)) != 0) {
+      Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"), 
+	    strerror(errstat));
+      V(mutex);
+      return 0;
+   }
+
+   /* connect to the database */
+   mdb->db = PQsetdbLogin(
+	mdb->db_address,	      /* default = localhost */
+	(char *) mdb->db_port,	  /* default port */
+	NULL,                     /* pg options */
+	NULL,                     /* tty, ignored */
+	mdb->db_name,		      /* database name */
+	mdb->db_user,		      /* login name */
+	mdb->db_password);	      /* password */
+
+   /* If no connect, try once more in case it is a timing problem */
+   if (PQstatus(mdb->db) != CONNECTION_OK) {
+   mdb->db = PQsetdbLogin(
+	mdb->db_address,	      /* default = localhost */
+	(char *) mdb->db_port,	  /* default port */
+	NULL,                     /* pg options */
+	NULL,                     /* tty, ignored */
+	mdb->db_name,		      /* database name */
+	mdb->db_user,		      /* login name */
+	mdb->db_password);	      /* password */
+   }
+    
+   Dmsg0(50, "pg_real_connect done\n");
+   Dmsg3(50, "db_user=%s db_name=%s db_password=%s\n", mdb->db_user, mdb->db_name, 
+            mdb->db_password==NULL?"(NULL)":mdb->db_password);
+  
+   if (PQstatus(mdb->db) != CONNECTION_OK) {
+      Mmsg2(&mdb->errmsg, _("Unable to connect to PostgreSQL server.\n"
+            "Database=%s User=%s\n"
+            "It is probably not running or your password is incorrect.\n"),
+            mdb->db_name, mdb->db_user);
+      V(mutex);
+      return 0;
+   }
+
+   if (!check_tables_version(jcr, mdb)) {
+      V(mutex);
+      db_close_database(jcr, mdb);
+      return 0;
+   }
+
+   mdb->connected = TRUE;
+   V(mutex);
+   return 1;
+}
+
+void
+db_close_database(JCR *jcr, B_DB *mdb)
+{
+   P(mutex);
+   mdb->ref_count--;
+   if (mdb->ref_count == 0) {
+      qdchain(&mdb->bq);
+      if (mdb->connected && mdb->db) {
+         sql_close(mdb);
+      }
+      rwl_destroy(&mdb->lock);	     
+      free_pool_memory(mdb->errmsg);
+      free_pool_memory(mdb->cmd);
+      free_pool_memory(mdb->cached_path);
+      free_pool_memory(mdb->fname);
+      free_pool_memory(mdb->path);
+      free_pool_memory(mdb->esc_name);
+      if (mdb->db_name) {
+         free(mdb->db_name);
+      }
+      if (mdb->db_user) {
+         free(mdb->db_user);
+      }
+      if (mdb->db_password) {
+         free(mdb->db_password);
+      }
+      if (mdb->db_address) {
+         free(mdb->db_address);
+      }
+      if (mdb->db_socket) {
+         free(mdb->db_socket);
+      }
+      free(mdb);
+   }
+   V(mutex);
+}
+
+/*
+ * Return the next unique index (auto-increment) for
+ * the given table.  Return NULL on error.
+ *  
+ * For MySQL, NULL causes the auto-increment value
+ *  to be updated.
+ */
+int db_next_index(JCR *jcr, B_DB *mdb, char *table, char *index)
+{
+   strcpy(index, "NULL");
+   return 1;
+}   
+
+
+/*
+ * Escape strings so that PostgreSQL is happy
+ *
+ *   NOTE! len is the length of the old string. Your new
+ *	   string must be long enough (max 2*old+1) to hold
+ *	   the escaped output.
+ */
+void
+db_escape_string(char *snew, char *old, int len)
+{
+   PQescapeString(snew, old, len);
+}
+
+/*
+ * Submit a general SQL command (cmd), and for each row returned,
+ *  the sqlite_handler is called with the ctx.
+ */
+int db_sql_query(B_DB *mdb, char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+{
+   SQL_ROW row;
+   int     numrows;
+
+   Dmsg0(50, "db_sql_query started\n");
+  
+   db_lock(mdb);
+   if (sql_query(mdb, query) != 0) {
+      Mmsg(&mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
+      db_unlock(mdb);
+      Dmsg0(50, "db_sql_query failed\n");
+      return 0;
+   }
+   Dmsg0(50, "db_sql_query succeeded. checking handler\n");
+
+   if (result_handler != NULL) {
+      Dmsg0(50, "db_sql_query invoking handler\n");
+      if ((mdb->result = sql_store_result(mdb)) != NULL) {
+         int num_fields = sql_num_fields(mdb);
+
+         Dmsg0(50, "db_sql_query sql_store_result suceeded\n");
+         while ((row = sql_fetch_row(mdb)) != NULL) {
+
+            Dmsg0(50, "db_sql_query sql_fetch_row worked\n");
+            if (result_handler(ctx, num_fields, row))
+	           break;
+         }
+
+         sql_free_result(mdb);
+      }
+   }
+   db_unlock(mdb);
+
+   Dmsg0(50, "db_sql_query finished\n");
+
+   return 1;
+}
+
+
+static void
+list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
+{
+   SQL_FIELD  *field;
+   unsigned int i, j;
+
+   sql_field_seek(mdb, 0);
+   send(ctx, "+");
+   for (i = 0; i < sql_num_fields(mdb); i++) {
+      field = sql_fetch_field(mdb);
+      for (j = 0; j < field->max_length + 2; j++)
+              send(ctx, "-");
+      send(ctx, "+");
+   }
+   send(ctx, "\n");
+}
+
+/*
+ * If full_list is set, we list vertically, otherwise, we 
+ * list on one line horizontally.      
+ */
+void
+list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
+{
+   SQL_FIELD *field;
+   SQL_ROW row;
+   unsigned int i, col_len, max_len = 0;
+   char buf[2000], ewc[30];
+
+   if (mdb->result == NULL) {
+      send(ctx, _("No results to list.\n"));
+      return;
+   }
+   /* determine column display widths */
+   sql_field_seek(mdb, 0);
+   for (i = 0; i < sql_num_fields(mdb); i++) {
+      field   = sql_fetch_field(mdb);
+      col_len = strlen(field->name);
+      if (type == VERT_LIST) {
+         if (col_len > max_len) {
+            max_len = col_len;
+         }
+      } else {
+         if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
+            field->max_length += (field->max_length - 1) / 3;
+         }
+         if (col_len < field->max_length) {
+            col_len = field->max_length;
+         }
+         if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
+            col_len = 4;                 /* 4 = length of the word "NULL" */
+         }
+         field->max_length = col_len;	 /* reset column info */
+      }
+   }
+
+   if (type == VERT_LIST) {
+      goto vertical_list;
+   }
+
+   list_dashes(mdb, send, ctx);
+   send(ctx, "|");
+   sql_field_seek(mdb, 0);
+   for (i = 0; i < sql_num_fields(mdb); i++) {
+      field = sql_fetch_field(mdb);
+      bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
+      send(ctx, buf);
+   }
+   send(ctx, "\n");
+   list_dashes(mdb, send, ctx);
+
+   while ((row = sql_fetch_row(mdb)) != NULL) {
+      sql_field_seek(mdb, 0);
+      send(ctx, "|");
+      for (i = 0; i < sql_num_fields(mdb); i++) {
+      field = sql_fetch_field(mdb);
+      if (row[i] == NULL) {
+         bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
+      } else if (IS_NUM(field->type)) {
+         bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,       
+	     add_commas(row[i], ewc));
+         } else {
+             bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, row[i]);
+         }
+         send(ctx, buf);
+      }
+      send(ctx, "\n");
+   }
+   list_dashes(mdb, send, ctx);
+   return;
+
+vertical_list:
+   
+   while ((row = sql_fetch_row(mdb)) != NULL) {
+      sql_field_seek(mdb, 0);
+      for (i = 0; i < sql_num_fields(mdb); i++) {
+      field = sql_fetch_field(mdb);
+      if (row[i] == NULL) {
+         bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL");
+      } else if (IS_NUM(field->type)) {
+            bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
+	        add_commas(row[i], ewc));
+         } else {
+            bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]);
+         }
+         send(ctx, buf);
+      }
+      send(ctx, "\n");
+   }
+   return;
+}
+
+POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb) {
+	int            nFields;
+	int            j;
+	POSTGRESQL_ROW row = NULL; // by default, return NULL
+
+	Dmsg0(50, "my_postgresql_fetch_row start\n");
+	ASSERT(mdb->row != NULL);
+
+	// if still within the result set
+	if (mdb->row_number < mdb->num_rows) {
+		Dmsg2(50, "my_postgresql_fetch_row row number '%d' is acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
+		// allocate space for one row
+		// get each value from this row
+		for (j = 0; j < mdb->num_fields; j++) {
+			mdb->row[j] = PQgetvalue(mdb->result, mdb->row_number, j);
+			Dmsg2(50, "my_postgresql_fetch_row field '%d' is '%s'\n", j, mdb->row[j]);
+		}
+		// increment the row number for the next call
+		mdb->row_number++;
+
+		row = mdb->row;
+	} else {
+		Dmsg2(50, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
+	}
+
+	Dmsg1(50, "my_postgresql_fetch_row finishes returning %x\n", row);
+
+	return row;
+}
+
+POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb) {
+	mdb->field.name       = PQfname    (mdb->result, mdb->field_number);
+
+	// I am not sure this returns the max width of the result set
+	mdb->field.max_length = PQfsize    (mdb->result, mdb->field_number);
+
+	// I am not sure this returns what we can use
+	mdb->field.type       = PQftype    (mdb->result, mdb->field_number);
+
+	mdb->field.flags      = PQgetisnull(mdb->result, mdb->row_number, mdb->field_number);
+
+	return &mdb->field;
+}
+
+void my_postgresql_data_seek(B_DB *mdb, int row) {
+	// set the row number to be returned on the next call
+	// to my_postgresql_fetch_row
+	mdb->row_number = row;
+}
+
+void my_postgresql_field_seek(B_DB *mdb, int field) {
+	mdb->field_number = field;
+}
+
+int my_postgresql_query(B_DB *mdb, char *query) {
+	Dmsg0(50, "my_postgresql_query started\n");
+	// We are starting a new query.  reset everything.
+	mdb->num_rows     = -1;
+	mdb->row_number   = -1;
+	mdb->field_number = -1;
+
+	if (mdb->row) {
+
+		Dmsg0(50, "my_postgresql_query freeing space\n");
+		free(mdb->row);
+		mdb->row = NULL;
+	}
+
+
+	Dmsg1(50, "doing PQexec with '%s'\n", query);
+	mdb->result = PQexec(mdb->db, query);
+	if (PQresultStatus(mdb->result) == PGRES_TUPLES_OK) {
+
+		mdb->num_rows   = PQntuples(mdb->result);
+		// how many fields in the set?
+		mdb->num_fields = PQnfields(mdb->result);
+
+		// point at the first row for the fetch row function
+		mdb->row_number = 0;
+
+		mdb->row = (POSTGRESQL_ROW) malloc(sizeof(char *) * mdb->num_fields);
+		Dmsg2(50, "PQexec was OK.  rows=%d columns=%d\n", mdb->num_rows, mdb->num_fields);
+		mdb->status = 0;
+	} else {
+		mdb->status = 1;
+	}
+
+	Dmsg0(50, "my_postgresql_query finishing\n");
+
+	return mdb->status;
+}
+
+void my_postgresql_free_result (B_DB *mdb) {
+	PQclear(mdb->result);
+	free(mdb->row);
+	mdb->row = NULL;
+}
+
+
+#endif /* HAVE_POSTGRESQL */
diff --git a/bacula/src/cats/postgresql.in b/bacula/src/cats/postgresql.in
new file mode 100644
index 0000000000..39c3fe6bfb
--- /dev/null
+++ b/bacula/src/cats/postgresql.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# shell script to create Bacula PostgreSQL tables
+#
+bindir=@SQL_BINDIR@
+
+$bindir/psql $* bacula