From b47e175b7403f42a12bbbb11142215aff139dc2f Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Mon, 25 Aug 2014 11:56:17 +0200 Subject: [PATCH] [PATCH] Missing job states in DB table Status Adds the missing and currently used states, which are defined in jcr.h, to the status table of the database. Fixes #333: Missing job states in DB table Status --- src/cats/ddl/creates/ingres.sql | 10 ++++++++++ src/cats/ddl/creates/mysql.sql | 5 +++++ src/cats/ddl/creates/postgresql.sql | 10 ++++++++++ src/cats/ddl/creates/sqlite3.sql | 10 ++++++++++ src/cats/ddl/updates/mysql.14_2001.sql | 7 +++++++ src/cats/ddl/updates/postgresql.14_2001.sql | 11 +++++++++++ src/cats/ddl/updates/sqlite3.14_2001.sql | 11 +++++++++++ 7 files changed, 64 insertions(+) diff --git a/src/cats/ddl/creates/ingres.sql b/src/cats/ddl/creates/ingres.sql index ef84bbf..f427efc 100644 --- a/src/cats/ddl/creates/ingres.sql +++ b/src/cats/ddl/creates/ingres.sql @@ -510,6 +510,16 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('A', 'Canceled by user',90); INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('I', 'Incomplete job', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('L', 'Committing data', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('W', 'Terminated with warnings', 20); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('l', 'Doing data despooling', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('q', 'Queued waiting for device', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('F', 'Waiting for Client',15); INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('S', 'Waiting for Storage daemon',15); diff --git a/src/cats/ddl/creates/mysql.sql b/src/cats/ddl/creates/mysql.sql index dc4348c..9458d83 100644 --- a/src/cats/ddl/creates/mysql.sql +++ b/src/cats/ddl/creates/mysql.sql @@ -439,6 +439,11 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('f', 'Fatal error', 100), ('D', 'Verify found differences', 15), ('A', 'Canceled by user', 90), + ('I', 'Incomplete job', 15), + ('L', 'Committing data', 15), + ('W', 'Terminated with warnings', 20), + ('l', 'Doing data despooling', 15), + ('q', 'Queued waiting for device', 15), ('F', 'Waiting for Client', 15), ('S', 'Waiting for Storage daemon', 15), ('m', 'Waiting for new media', 15), diff --git a/src/cats/ddl/creates/postgresql.sql b/src/cats/ddl/creates/postgresql.sql index 852b468..5957872 100644 --- a/src/cats/ddl/creates/postgresql.sql +++ b/src/cats/ddl/creates/postgresql.sql @@ -449,6 +449,16 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('A', 'Canceled by user',90); INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('I', 'Incomplete job', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('L', 'Committing data', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('W', 'Terminated with warnings', 20); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('l', 'Doing data despooling', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('q', 'Queued waiting for device', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('F', 'Waiting for Client',15); INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('S', 'Waiting for Storage daemon',15); diff --git a/src/cats/ddl/creates/sqlite3.sql b/src/cats/ddl/creates/sqlite3.sql index c53607c..e364d50 100644 --- a/src/cats/ddl/creates/sqlite3.sql +++ b/src/cats/ddl/creates/sqlite3.sql @@ -438,6 +438,16 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('A', 'Canceled by user',90); INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('I', 'Incomplete job', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('L', 'Committing data', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('W', 'Terminated with warnings', 20); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('l', 'Doing data despooling', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('q', 'Queued waiting for device', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('F', 'Waiting for Client',15); INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES ('S', 'Waiting for Storage daemon',15); diff --git a/src/cats/ddl/updates/mysql.14_2001.sql b/src/cats/ddl/updates/mysql.14_2001.sql index e3ecd14..a44f2a2 100644 --- a/src/cats/ddl/updates/mysql.14_2001.sql +++ b/src/cats/ddl/updates/mysql.14_2001.sql @@ -16,4 +16,11 @@ CREATE TABLE NDMPLevelMap ( ALTER TABLE Media DROP COLUMN VolParts; ALTER TABLE Media ADD COLUMN EncryptionKey TINYBLOB; +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('I', 'Incomplete job', 15), + ('L', 'Committing data', 15), + ('W', 'Terminated with warnings', 20), + ('l', 'Doing data despooling', 15), + ('q', 'Queued waiting for device', 15); + UPDATE Version SET VersionId = 2001; diff --git a/src/cats/ddl/updates/postgresql.14_2001.sql b/src/cats/ddl/updates/postgresql.14_2001.sql index 59c01ae..fa763df 100644 --- a/src/cats/ddl/updates/postgresql.14_2001.sql +++ b/src/cats/ddl/updates/postgresql.14_2001.sql @@ -18,6 +18,17 @@ CREATE TABLE NDMPLevelMap ( ALTER TABLE Media DROP COLUMN VolParts RESTRICT; ALTER TABLE Media ADD COLUMN EncryptionKey text; +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('I', 'Incomplete job', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('L', 'Committing data', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('W', 'Terminated with warnings', 20); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('l', 'Doing data despooling', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('q', 'Queued waiting for device', 15); + UPDATE Version SET VersionId = 2001; COMMIT; diff --git a/src/cats/ddl/updates/sqlite3.14_2001.sql b/src/cats/ddl/updates/sqlite3.14_2001.sql index 3bcd6ab..e86ba9f 100644 --- a/src/cats/ddl/updates/sqlite3.14_2001.sql +++ b/src/cats/ddl/updates/sqlite3.14_2001.sql @@ -17,5 +17,16 @@ CREATE TABLE NDMPLevelMap ( ALTER TABLE Media ADD COLUMN EncryptionKey VARCHAR(128); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('I', 'Incomplete job', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('L', 'Committing data', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('W', 'Terminated with warnings', 20); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('l', 'Doing data despooling', 15); +INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES + ('q', 'Queued waiting for device', 15); + UPDATE Version SET VersionId = 2001; COMMIT; -- 1.8.4.5