From b724ff389e6550aedd49cd2ef809837e62b6ecb9 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 21 Mar 2008 13:39:33 +0000 Subject: [PATCH] ebl Change VersionId from 10 to 11 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6655 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/cats.h | 10 +++++----- bacula/src/cats/drop_mysql_tables.in | 1 + bacula/src/cats/drop_postgresql_tables.in | 1 + bacula/src/cats/grant_postgresql_privileges.in | 1 + bacula/src/cats/grant_sqlite_privileges.in | 2 +- bacula/src/cats/make_mysql_tables.in | 2 +- bacula/src/cats/make_postgresql_tables.in | 2 +- bacula/src/cats/make_sqlite3_tables.in | 2 +- bacula/src/cats/make_sqlite_tables.in | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h index 7d7e94e7c0..22e4f538eb 100644 --- a/bacula/src/cats/cats.h +++ b/bacula/src/cats/cats.h @@ -87,7 +87,7 @@ typedef int (DB_RESULT_HANDLER)(void *, int, char **); #if defined(BUILDING_CATS) #ifdef HAVE_SQLITE -#define BDB_VERSION 10 +#define BDB_VERSION 11 #include @@ -207,7 +207,7 @@ extern const char* my_sqlite_batch_fill_path_query; #ifdef HAVE_SQLITE3 -#define BDB_VERSION 10 +#define BDB_VERSION 11 #include @@ -333,7 +333,7 @@ extern const char* my_sqlite_batch_fill_path_query; #ifdef HAVE_MYSQL -#define BDB_VERSION 10 +#define BDB_VERSION 11 #include @@ -415,7 +415,7 @@ extern void my_mysql_free_result(B_DB *mdb); #ifdef HAVE_POSTGRESQL -#define BDB_VERSION 10 +#define BDB_VERSION 11 #include @@ -529,7 +529,7 @@ extern const char* my_pg_batch_fill_path_query; #ifdef HAVE_DBI -#define BDB_VERSION 10 +#define BDB_VERSION 11 #include diff --git a/bacula/src/cats/drop_mysql_tables.in b/bacula/src/cats/drop_mysql_tables.in index e291759cbd..4e543ea379 100644 --- a/bacula/src/cats/drop_mysql_tables.in +++ b/bacula/src/cats/drop_mysql_tables.in @@ -16,6 +16,7 @@ DROP TABLE IF EXISTS MediaType; DROP TABLE IF EXISTS File; DROP TABLE IF EXISTS Client; DROP TABLE IF EXISTS Job; +DROP TABLE IF EXISTS JobStat; DROP TABLE IF EXISTS Media; DROP TABLE IF EXISTS JobMedia; DROP TABLE IF EXISTS Pool; diff --git a/bacula/src/cats/drop_postgresql_tables.in b/bacula/src/cats/drop_postgresql_tables.in index a0da7e391e..7bc4acfc42 100644 --- a/bacula/src/cats/drop_postgresql_tables.in +++ b/bacula/src/cats/drop_postgresql_tables.in @@ -11,6 +11,7 @@ drop table basefiles; drop table jobmedia; drop table file; drop table job; +drop table jobstat; drop table media; drop table client; drop table pool; diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in index ab582e859f..3be65e7c07 100644 --- a/bacula/src/cats/grant_postgresql_privileges.in +++ b/bacula/src/cats/grant_postgresql_privileges.in @@ -32,6 +32,7 @@ grant all on status to ${USER}; grant all on location to ${USER}; grant all on locationlog to ${USER}; grant all on log to ${USER}; +grant all on jobstat to ${USER}; -- for sequences on those tables diff --git a/bacula/src/cats/grant_sqlite_privileges.in b/bacula/src/cats/grant_sqlite_privileges.in index 15d45474e3..452975ee58 100644 --- a/bacula/src/cats/grant_sqlite_privileges.in +++ b/bacula/src/cats/grant_sqlite_privileges.in @@ -4,4 +4,4 @@ # bindir=@SQL_BINDIR@ -# nothing to do here \ No newline at end of file +# nothing to do here diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in index 32a5b4d984..665dea4299 100644 --- a/bacula/src/cats/make_mysql_tables.in +++ b/bacula/src/cats/make_mysql_tables.in @@ -336,7 +336,7 @@ CREATE TABLE Version ( ); -- Initialize Version -INSERT INTO Version (VersionId) VALUES (10); +INSERT INTO Version (VersionId) VALUES (11); END-OF-DATA then diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in index d63e2de699..dbafefe527 100644 --- a/bacula/src/cats/make_postgresql_tables.in +++ b/bacula/src/cats/make_postgresql_tables.in @@ -372,7 +372,7 @@ INSERT INTO Status (JobStatus,JobStatusLong) VALUES INSERT INTO Status (JobStatus,JobStatusLong) VALUES ('i', 'Doing batch insert file records'); -INSERT INTO Version (VersionId) VALUES (10); +INSERT INTO Version (VersionId) VALUES (11); -- Make sure we have appropriate permissions diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in index aea3628f6e..9d1900d847 100644 --- a/bacula/src/cats/make_sqlite3_tables.in +++ b/bacula/src/cats/make_sqlite3_tables.in @@ -357,7 +357,7 @@ INSERT INTO Status (JobStatus,JobStatusLong) VALUES -- Initialize Version -INSERT INTO Version (VersionId) VALUES (10); +INSERT INTO Version (VersionId) VALUES (11); PRAGMA default_cache_size = 100000; diff --git a/bacula/src/cats/make_sqlite_tables.in b/bacula/src/cats/make_sqlite_tables.in index 6173a56a59..b9880fb551 100644 --- a/bacula/src/cats/make_sqlite_tables.in +++ b/bacula/src/cats/make_sqlite_tables.in @@ -357,7 +357,7 @@ INSERT INTO Status (JobStatus,JobStatusLong) VALUES -- Initialize Version -INSERT INTO Version (VersionId) VALUES (10); +INSERT INTO Version (VersionId) VALUES (11); PRAGMA default_synchronous = OFF; -- 2.39.5