Fix Id type in MySQL make/update script

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index a5f2c02bb5a32273f3e1ac12a91a006dd479fabe..92c318eb2843752eda2b396bea8ac8b274f825db 100644 (file)
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -34,28 +34,28 @@ USE ${db_name};
 
 CREATE TABLE TagJob
 (
-   JobId integer not null,
+   JobId INTEGER UNSIGNED not null,
    Tag   TINYBLOB    not null,
    primary key (JobId, Tag(255))
 );
 
 CREATE TABLE TagClient
 (
-   ClientId integer not null,
+   ClientId INTEGER UNSIGNED not null,
    Tag      TINYBLOB    not null,
    primary key (ClientId, Tag(255))
 );
 
 CREATE TABLE TagMedia
 (
-   MediaId integer not null,
+   MediaId INTEGER UNSIGNED not null,
    Tag      TINYBLOB   not null,
    primary key (MediaId, Tag(255))
 );
 
 CREATE TABLE TagObject
 (
-   ObjectId integer not null,
+   ObjectId INTEGER UNSIGNED not null,
    Tag      TINYBLOB    not null,
    primary key (ObjectId, Tag(255))
 );
@@ -64,7 +64,7 @@ CREATE TABLE Object
 (
    ObjectId     BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
 
-   JobId        integer  not null,
+   JobId        INTEGER UNSIGNED  not null,
    Path         BLOB NOT NULL,
    Filename     BLOB NOT NULL,
    PluginName   TINYBLOB NOT NULL,

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index c920c8fdd184b512330e7f03b942902c2bc7fd7f..5efb2bde1a4c7358fcfe6b86d2075a31f2162c1d 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -10,9 +10,8 @@ echo "This script will update a Bacula MySQL database"
 echo " from any from version 12-15 or 1014-1021 to version 1022"
 echo " which is needed to convert from any Bacula Enterprise"
 echo " version 4.0.x or later to version 12.4.x"
-echo " or Bacula Community versions 5.0.x, 5.2.x, 7.4.x, 9.0.x or"
-echo " Enterprise versions 6.0.x, 6.2.x, 6.4.x, 6.6.x,"
-echo " 8.x, 10.0, 10.2 to Enterprise version 12.4.x"
+echo " or Bacula Community versions 5.0.x, 5.2.x, 7.4.x, 9.x.x to"
+echo " Community version 11.0"
 echo " "
 echo "Depending on the current version of your catalog, you may"
 echo " have to run this script multiple times"
@@ -77,7 +76,7 @@ CREATE TABLE RestoreObject (
    ObjectIndex INTEGER DEFAULT 0,
    ObjectType INTEGER DEFAULT 0,
    FileIndex INTEGER UNSIGNED DEFAULT 0,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
+   JobId INTEGER UNSIGNED NOT NULL,
    ObjectCompression INTEGER DEFAULT 0,
    PRIMARY KEY(RestoreObjectId),
    INDEX (JobId)
@@ -170,8 +169,8 @@ DROP INDEX JobId_2 on File;
 CREATE TABLE file_temp (
    FileId BIGINT UNSIGNED NOT NULL,
    FileIndex INTEGER UNSIGNED DEFAULT 0,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   PathId INTEGER UNSIGNED NOT NULL REFERENCES Path,
+   JobId INTEGER UNSIGNED NOT NULL,
+   PathId INTEGER UNSIGNED NOT NULL,
    Filename BLOB NOT NULL,
    DeltaSeq SMALLINT UNSIGNED DEFAULT 0,
    MarkId INTEGER UNSIGNED DEFAULT 0,
@@ -220,8 +219,8 @@ DROP INDEX JobId_2 on File;
 CREATE TABLE file_temp (
    FileId BIGINT UNSIGNED NOT NULL,
    FileIndex INTEGER UNSIGNED DEFAULT 0,
-   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
-   PathId INTEGER UNSIGNED NOT NULL REFERENCES Path,
+   JobId INTEGER UNSIGNED NOT NULL,
+   PathId INTEGER UNSIGNED NOT NULL,
    Filename BLOB NOT NULL,
    DeltaSeq SMALLINT UNSIGNED DEFAULT 0,
    MarkId INTEGER UNSIGNED DEFAULT 0,
@@ -254,7 +253,7 @@ CREATE TABLE Snapshot (
   Name           TINYBLOB NOT NULL,
   CreateTDate    BIGINT   NOT NULL,
   CreateDate     DATETIME NOT NULL,
-  ClientId       INTEGER DEFAULT 0,
+  ClientId       INTEGER UNSIGNED DEFAULT 0,
   Volume         TINYBLOB NOT NULL,
   Device         TINYBLOB NOT NULL,
   Type           TINYBLOB NOT NULL,
@@ -420,28 +419,28 @@ USE ${db_name};
 
 CREATE TABLE TagJob
 (
-   JobId integer not null,
+   JobId INTEGER UNSIGNED not null,
    Tag   TINYBLOB    not null,
    primary key (JobId, Tag(255))
 );
 
 CREATE TABLE TagClient
 (
-   ClientId integer not null,
+   ClientId INTEGER UNSIGNED not null,
    Tag      TINYBLOB    not null,
    primary key (ClientId, Tag(255))
 );
 
 CREATE TABLE TagMedia
 (
-   MediaId integer not null,
+   MediaId INTEGER UNSIGNED not null,
    Tag      TINYBLOB   not null,
    primary key (MediaId, Tag(255))
 );
 
 CREATE TABLE TagObject
 (
-   ObjectId integer not null,
+   ObjectId INTEGER UNSIGNED not null,
    Tag      TINYBLOB    not null,
    primary key (ObjectId, Tag(255))
 );
@@ -450,7 +449,7 @@ CREATE TABLE Object
 (
    ObjectId     BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
 
-   JobId        integer  not null,
+   JobId        INTEGER UNSIGNED  not null,
    Path         BLOB NOT NULL,
    Filename     BLOB NOT NULL,
    PluginName   TINYBLOB NOT NULL,