From 17af0744b0a92508e06cd64f12bc0eb77ffb0631 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 28 Oct 2008 11:31:28 +0000 Subject: [PATCH] Apply Joao's patch to SQLite tables to make chars work. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7922 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/make_sqlite3_tables.in | 12 ++++++------ bacula/src/cats/make_sqlite_tables.in | 12 ++++++------ bacula/src/version.h | 4 ++-- bacula/technotes-2.5 | 2 ++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in index 3620fe8caa..d997317102 100644 --- a/bacula/src/cats/make_sqlite3_tables.in +++ b/bacula/src/cats/make_sqlite3_tables.in @@ -51,10 +51,10 @@ CREATE TABLE Job ( JobId INTEGER, Job VARCHAR(128) NOT NULL, Name VARCHAR(128) NOT NULL, - Type CHAR NOT NULL, - Level CHAR NOT NULL, + Type CHAR(1) NOT NULL, + Level CHAR(1) NOT NULL, ClientId INTEGER REFERENCES Client DEFAULT 0, - JobStatus CHAR NOT NULL, + JobStatus CHAR(1) NOT NULL, SchedTime DATETIME NOT NULL, StartTime DATETIME DEFAULT 0, EndTime DATETIME DEFAULT 0, @@ -80,10 +80,10 @@ CREATE TABLE JobHistory ( JobId INTEGER, Job VARCHAR(128) NOT NULL, Name VARCHAR(128) NOT NULL, - Type CHAR NOT NULL, - Level CHAR NOT NULL, + Type CHAR(1) NOT NULL, + Level CHAR(1) NOT NULL, ClientId INTEGER REFERENCES Client DEFAULT 0, - JobStatus CHAR NOT NULL, + JobStatus CHAR(1) NOT NULL, SchedTime DATETIME NOT NULL, StartTime DATETIME DEFAULT 0, EndTime DATETIME DEFAULT 0, diff --git a/bacula/src/cats/make_sqlite_tables.in b/bacula/src/cats/make_sqlite_tables.in index 0aece75e9f..b98d39770d 100644 --- a/bacula/src/cats/make_sqlite_tables.in +++ b/bacula/src/cats/make_sqlite_tables.in @@ -51,10 +51,10 @@ CREATE TABLE Job ( JobId INTEGER, Job VARCHAR(128) NOT NULL, Name VARCHAR(128) NOT NULL, - Type CHAR NOT NULL, - Level CHAR NOT NULL, + Type CHAR(1) NOT NULL, + Level CHAR(1) NOT NULL, ClientId INTEGER REFERENCES Client DEFAULT 0, - JobStatus CHAR NOT NULL, + JobStatus CHAR(1) NOT NULL, SchedTime DATETIME NOT NULL, StartTime DATETIME DEFAULT 0, EndTime DATETIME DEFAULT 0, @@ -80,10 +80,10 @@ CREATE TABLE JobHistory ( JobId INTEGER, Job VARCHAR(128) NOT NULL, Name VARCHAR(128) NOT NULL, - Type CHAR NOT NULL, - Level CHAR NOT NULL, + Type CHAR(1) NOT NULL, + Level CHAR(1) NOT NULL, ClientId INTEGER REFERENCES Client DEFAULT 0, - JobStatus CHAR NOT NULL, + JobStatus CHAR(1) NOT NULL, SchedTime DATETIME NOT NULL, StartTime DATETIME DEFAULT 0, EndTime DATETIME DEFAULT 0, diff --git a/bacula/src/version.h b/bacula/src/version.h index c26d6cf5b0..9cc93ba25f 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.5.17" -#define BDATE "25 October 2008" -#define LSMDATE "25Oct08" +#define BDATE "28 October 2008" +#define LSMDATE "28Oct08" #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n" #define BYEAR "2008" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 40ebfd943f..93cd89bd92 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -10,6 +10,8 @@ filepattern (restore with regex in bsr) mixed priorities General: +28Oct08 +kes Apply Joao's patch to SQLite tables to make chars work. 27Oct08 ebl Fix #1175 About update slots that don't reset InChanger flag when slot is empty. -- 2.39.5