From 6b08bbeb3380d393c77bf1d271e35c80a825eeef Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 19 Apr 2005 19:17:43 +0000 Subject: [PATCH] Fix SQLite and PostgreSQL table creation script syntax problems. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1938 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/make_postgresql_tables.in | 54 +++++++++++++------- bacula/src/cats/make_sqlite3_tables.in | 56 ++++++++++++++------- bacula/src/cats/make_sqlite_tables.in | 56 ++++++++++++++------- bacula/src/cats/update_postgresql_tables.in | 54 +++++++++++++------- bacula/src/cats/update_sqlite3_tables.in | 54 +++++++++++++------- bacula/src/cats/update_sqlite_tables.in | 54 +++++++++++++------- 6 files changed, 218 insertions(+), 110 deletions(-) diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in index 9c22c51aef..151216e868 100644 --- a/bacula/src/cats/make_postgresql_tables.in +++ b/bacula/src/cats/make_postgresql_tables.in @@ -280,24 +280,42 @@ CREATE TABLE Status ( ); INSERT INTO Status (JobStatus,JobStatusLong) VALUES - ('C', 'Created, not yet running'), - ('R', 'Running'), - ('B', 'Blocked'), - ('T', 'Completed successfully'), - ('E', 'Terminated with errors'), - ('e', 'Non-fatal error'), - ('f', 'Fatal error'), - ('D', 'Verify found differences'), - ('A', 'Canceled by user'), - ('F', 'Waiting for Client'), - ('S', 'Waiting for Storage daemon'), - ('m', 'Waiting for new media'), - ('M', 'Waiting for media mount'), - ('s', 'Waiting for storage resource'), - ('j', 'Waiting for job resource'), - ('c', 'Waiting for client resource'), - ('d', 'Waiting on maximum jobs'), - ('t', 'Waiting on start time'), + ('C', 'Created, not yet running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('R', 'Running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('B', 'Blocked'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('T', 'Completed successfully'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('E', 'Terminated with errors'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('e', 'Non-fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('f', 'Fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('D', 'Verify found differences'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('A', 'Canceled by user'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('F', 'Waiting for Client'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('S', 'Waiting for Storage daemon'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('m', 'Waiting for new media'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('M', 'Waiting for media mount'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('s', 'Waiting for storage resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('j', 'Waiting for job resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('c', 'Waiting for client resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('d', 'Waiting on maximum jobs'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('t', 'Waiting on start time'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('p', 'Waiting on higher priority jobs'); diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in index 7d3ad2f1c5..25afc6b7f2 100644 --- a/bacula/src/cats/make_sqlite3_tables.in +++ b/bacula/src/cats/make_sqlite3_tables.in @@ -262,30 +262,48 @@ CREATE TABLE CDImages ( CREATE TABLE Status ( - JobStatus CHAR(1) BINARY NOT NULL, + JobStatus CHAR(1) NOT NULL, JobStatusLong BLOB, PRIMARY KEY (JobStatus) ); INSERT INTO Status (JobStatus,JobStatusLong) VALUES - ('C', 'Created, not yet running'), - ('R', 'Running'), - ('B', 'Blocked'), - ('T', 'Completed successfully'), - ('E', 'Terminated with errors'), - ('e', 'Non-fatal error'), - ('f', 'Fatal error'), - ('D', 'Verify found differences'), - ('A', 'Canceled by user'), - ('F', 'Waiting for Client'), - ('S', 'Waiting for Storage daemon'), - ('m', 'Waiting for new media'), - ('M', 'Waiting for media mount'), - ('s', 'Waiting for storage resource'), - ('j', 'Waiting for job resource'), - ('c', 'Waiting for client resource'), - ('d', 'Waiting on maximum jobs'), - ('t', 'Waiting on start time'), + ('C', 'Created, not yet running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('R', 'Running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('B', 'Blocked'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('T', 'Completed successfully'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('E', 'Terminated with errors'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('e', 'Non-fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('f', 'Fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('D', 'Verify found differences'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('A', 'Canceled by user'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('F', 'Waiting for Client'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('S', 'Waiting for Storage daemon'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('m', 'Waiting for new media'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('M', 'Waiting for media mount'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('s', 'Waiting for storage resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('j', 'Waiting for job resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('c', 'Waiting for client resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('d', 'Waiting on maximum jobs'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('t', 'Waiting on start time'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('p', 'Waiting on higher priority jobs'); diff --git a/bacula/src/cats/make_sqlite_tables.in b/bacula/src/cats/make_sqlite_tables.in index 7d3ad2f1c5..25afc6b7f2 100644 --- a/bacula/src/cats/make_sqlite_tables.in +++ b/bacula/src/cats/make_sqlite_tables.in @@ -262,30 +262,48 @@ CREATE TABLE CDImages ( CREATE TABLE Status ( - JobStatus CHAR(1) BINARY NOT NULL, + JobStatus CHAR(1) NOT NULL, JobStatusLong BLOB, PRIMARY KEY (JobStatus) ); INSERT INTO Status (JobStatus,JobStatusLong) VALUES - ('C', 'Created, not yet running'), - ('R', 'Running'), - ('B', 'Blocked'), - ('T', 'Completed successfully'), - ('E', 'Terminated with errors'), - ('e', 'Non-fatal error'), - ('f', 'Fatal error'), - ('D', 'Verify found differences'), - ('A', 'Canceled by user'), - ('F', 'Waiting for Client'), - ('S', 'Waiting for Storage daemon'), - ('m', 'Waiting for new media'), - ('M', 'Waiting for media mount'), - ('s', 'Waiting for storage resource'), - ('j', 'Waiting for job resource'), - ('c', 'Waiting for client resource'), - ('d', 'Waiting on maximum jobs'), - ('t', 'Waiting on start time'), + ('C', 'Created, not yet running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('R', 'Running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('B', 'Blocked'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('T', 'Completed successfully'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('E', 'Terminated with errors'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('e', 'Non-fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('f', 'Fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('D', 'Verify found differences'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('A', 'Canceled by user'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('F', 'Waiting for Client'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('S', 'Waiting for Storage daemon'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('m', 'Waiting for new media'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('M', 'Waiting for media mount'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('s', 'Waiting for storage resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('j', 'Waiting for job resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('c', 'Waiting for client resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('d', 'Waiting on maximum jobs'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('t', 'Waiting on start time'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('p', 'Waiting on higher priority jobs'); diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in index 2d108bd028..37870a5ef7 100755 --- a/bacula/src/cats/update_postgresql_tables.in +++ b/bacula/src/cats/update_postgresql_tables.in @@ -80,24 +80,42 @@ CREATE TABLE Status ( ); INSERT INTO Status (JobStatus,JobStatusLong) VALUES - ('C', 'Created, not yet running'), - ('R', 'Running'), - ('B', 'Blocked'), - ('T', 'Completed successfully'), - ('E', 'Terminated with errors'), - ('e', 'Non-fatal error'), - ('f', 'Fatal error'), - ('D', 'Verify found differences'), - ('A', 'Canceled by user'), - ('F', 'Waiting for Client'), - ('S', 'Waiting for Storage daemon'), - ('m', 'Waiting for new media'), - ('M', 'Waiting for media mount'), - ('s', 'Waiting for storage resource'), - ('j', 'Waiting for job resource'), - ('c', 'Waiting for client resource'), - ('d', 'Waiting on maximum jobs'), - ('t', 'Waiting on start time'), + ('C', 'Created, not yet running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('R', 'Running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('B', 'Blocked'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('T', 'Completed successfully'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('E', 'Terminated with errors'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('e', 'Non-fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('f', 'Fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('D', 'Verify found differences'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('A', 'Canceled by user'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('F', 'Waiting for Client'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('S', 'Waiting for Storage daemon'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('m', 'Waiting for new media'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('M', 'Waiting for media mount'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('s', 'Waiting for storage resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('j', 'Waiting for job resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('c', 'Waiting for client resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('d', 'Waiting on maximum jobs'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('t', 'Waiting on start time'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('p', 'Waiting on higher priority jobs'); diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in index 73aae37025..d0d9e743d3 100755 --- a/bacula/src/cats/update_sqlite3_tables.in +++ b/bacula/src/cats/update_sqlite3_tables.in @@ -291,24 +291,42 @@ CREATE TABLE Status ( ); INSERT INTO Status (JobStatus,JobStatusLong) VALUES - ('C', 'Created, not yet running'), - ('R', 'Running'), - ('B', 'Blocked'), - ('T', 'Completed successfully'), - ('E', 'Terminated with errors'), - ('e', 'Non-fatal error'), - ('f', 'Fatal error'), - ('D', 'Verify found differences'), - ('A', 'Canceled by user'), - ('F', 'Waiting for Client'), - ('S', 'Waiting for Storage daemon'), - ('m', 'Waiting for new media'), - ('M', 'Waiting for media mount'), - ('s', 'Waiting for storage resource'), - ('j', 'Waiting for job resource'), - ('c', 'Waiting for client resource'), - ('d', 'Waiting on maximum jobs'), - ('t', 'Waiting on start time'), + ('C', 'Created, not yet running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('R', 'Running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('B', 'Blocked'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('T', 'Completed successfully'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('E', 'Terminated with errors'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('e', 'Non-fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('f', 'Fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('D', 'Verify found differences'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('A', 'Canceled by user'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('F', 'Waiting for Client'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('S', 'Waiting for Storage daemon'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('m', 'Waiting for new media'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('M', 'Waiting for media mount'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('s', 'Waiting for storage resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('j', 'Waiting for job resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('c', 'Waiting for client resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('d', 'Waiting on maximum jobs'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('t', 'Waiting on start time'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('p', 'Waiting on higher priority jobs'); diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in index 73aae37025..d0d9e743d3 100755 --- a/bacula/src/cats/update_sqlite_tables.in +++ b/bacula/src/cats/update_sqlite_tables.in @@ -291,24 +291,42 @@ CREATE TABLE Status ( ); INSERT INTO Status (JobStatus,JobStatusLong) VALUES - ('C', 'Created, not yet running'), - ('R', 'Running'), - ('B', 'Blocked'), - ('T', 'Completed successfully'), - ('E', 'Terminated with errors'), - ('e', 'Non-fatal error'), - ('f', 'Fatal error'), - ('D', 'Verify found differences'), - ('A', 'Canceled by user'), - ('F', 'Waiting for Client'), - ('S', 'Waiting for Storage daemon'), - ('m', 'Waiting for new media'), - ('M', 'Waiting for media mount'), - ('s', 'Waiting for storage resource'), - ('j', 'Waiting for job resource'), - ('c', 'Waiting for client resource'), - ('d', 'Waiting on maximum jobs'), - ('t', 'Waiting on start time'), + ('C', 'Created, not yet running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('R', 'Running'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('B', 'Blocked'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('T', 'Completed successfully'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('E', 'Terminated with errors'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('e', 'Non-fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('f', 'Fatal error'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('D', 'Verify found differences'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('A', 'Canceled by user'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('F', 'Waiting for Client'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('S', 'Waiting for Storage daemon'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('m', 'Waiting for new media'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('M', 'Waiting for media mount'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('s', 'Waiting for storage resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('j', 'Waiting for job resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('c', 'Waiting for client resource'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('d', 'Waiting on maximum jobs'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES + ('t', 'Waiting on start time'); +INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('p', 'Waiting on higher priority jobs'); -- 2.39.5