Skip to content

Commit

Permalink
Missing job states in DB table Status
Browse files Browse the repository at this point in the history
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

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
  • Loading branch information
fbergkemper authored and Marco van Wieringen committed Feb 17, 2015
1 parent 3e4697f commit f49a077
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/cats/ddl/creates/ingres.sql
Expand Up @@ -509,6 +509,16 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
('D', 'Verify found differences',15);
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
Expand Down
5 changes: 5 additions & 0 deletions src/cats/ddl/creates/mysql.sql
Expand Up @@ -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),
Expand Down
10 changes: 10 additions & 0 deletions src/cats/ddl/creates/postgresql.sql
Expand Up @@ -448,6 +448,16 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
('D', 'Verify found differences',15);
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
Expand Down
10 changes: 10 additions & 0 deletions src/cats/ddl/creates/sqlite3.sql
Expand Up @@ -437,6 +437,16 @@ INSERT INTO Status (JobStatus,JobStatusLong,Severity) VALUES
('D', 'Verify found differences',15);
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
Expand Down
7 changes: 7 additions & 0 deletions src/cats/ddl/updates/mysql.14_2001.sql
Expand Up @@ -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;
11 changes: 11 additions & 0 deletions src/cats/ddl/updates/postgresql.14_2001.sql
Expand Up @@ -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;

Expand Down
11 changes: 11 additions & 0 deletions src/cats/ddl/updates/sqlite3.14_2001.sql
Expand Up @@ -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;

0 comments on commit f49a077

Please sign in to comment.