From: Michal Rakowski Date: Wed, 1 Dec 2021 10:57:25 +0000 (+0100) Subject: catalog: update mysql 'meta' tables with Primary Key X-Git-Tag: Beta-15.0.0~731 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=745fad5ddc9477bb45b1ddc6af7c769664974eb0;p=thirdparty%2Fbacula.git catalog: update mysql 'meta' tables with Primary Key Scripts were adjusted to work with MySQL v8.0.27 --- diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in index ab45b23cf..6c7004404 100644 --- a/bacula/src/cats/make_mysql_tables.in +++ b/bacula/src/cats/make_mysql_tables.in @@ -37,27 +37,28 @@ USE ${db_name}; CREATE TABLE MetaEmail ( EmailPKId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication - EmailTenant TINYTEXT, - EmailOwner TINYTEXT, - EmailId TINYTEXT, + EmailTenant VARCHAR(255), + EmailOwner VARCHAR(255), + EmailId VARCHAR(255), EmailTime DATETIME, EmailTags TEXT, EmailSubject TEXT, EmailFolderName TEXT, - EmailFrom TINYTEXT, + EmailFrom VARCHAR(255), EmailTo TEXT, EmailCc TEXT, - EmailInternetMessageId TINYTEXT, + EmailInternetMessageId VARCHAR(255), EmailBodyPreview TEXT, - EmailImportance TINYTEXT, - EmailConversationId TINYTEXT, + EmailImportance VARCHAR(255), + EmailConversationId VARCHAR(255), EmailIsRead TINYINT, EmailIsDraft TINYINT, EmailHasAttachment TINYINT, EmailSize INTEGER, - Plugin TINYTEXT, + Plugin VARCHAR(255), FileIndex INTEGER, - JobId INTEGER + JobId INTEGER, + PRIMARY KEY(EmailPKId) ); -- Requires TEXT instead of BLOB @@ -73,19 +74,20 @@ CREATE INDEX meta_emailhasattachment on MetaEmail (EmailHasAttachment); CREATE INDEX meta_emailjobid on MetaEmail (Jobid); CREATE TABLE MetaAttachment -{ +( AttachmentPKId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication - AttachmentTenant TINYTEXT, - AttachmentOwner TINYTEXT, + AttachmentTenant VARCHAR(255), + AttachmentOwner VARCHAR(255), AttachmentName TEXT, - AttachmentEmailId TINYTEXT, - AttachmentContentType TINYTEXT, + AttachmentEmailId VARCHAR(255), + AttachmentContentType VARCHAR(255), AttachmentIsInline SMALLINT, AttachmentSize INTEGER, - Plugin TINYTEXT, + Plugin VARCHAR(255), FileIndex INTEGER, - JobId INTEGER -}; + JobId INTEGER, + PRIMARY KEY(AttachmentPKId) +); CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,AttachmentOwner); CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId); @@ -477,7 +479,7 @@ CREATE TABLE Client ( ClientId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, Name TINYBLOB NOT NULL, Uname TINYBLOB NOT NULL, /* full uname -a of client */ - Plugins TINYBLOB DEFAULT '', + Plugins VARCHAR(255) DEFAULT '', AutoPrune TINYINT DEFAULT 0, FileRetention BIGINT UNSIGNED DEFAULT 0, JobRetention BIGINT UNSIGNED DEFAULT 0, diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in index 71225d9bb..e29e4e011 100644 --- a/bacula/src/cats/update_mysql_tables.in +++ b/bacula/src/cats/update_mysql_tables.in @@ -570,27 +570,28 @@ ALTER TABLE Client ADD COLUMN Plugins TINYBLOB DEFAULT ''; CREATE TABLE MetaEmail ( EmailPKId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication - EmailTenant TINYTEXT, - EmailOwner TINYTEXT, - EmailId TINYTEXT, + EmailTenant VARCHAR(255), + EmailOwner VARCHAR(255), + EmailId VARCHAR(255), EmailTime DATETIME, EmailTags TEXT, EmailSubject TEXT, EmailFolderName TEXT, - EmailFrom TINYTEXT, + EmailFrom VARCHAR(255), EmailTo TEXT, EmailCc TEXT, - EmailInternetMessageId TINYTEXT, + EmailInternetMessageId VARCHAR(255), EmailBodyPreview TEXT, - EmailImportance TINYTEXT, - EmailConversationId TINYTEXT, + EmailImportance VARCHAR(255), + EmailConversationId VARCHAR(255), EmailIsRead TINYINT, EmailIsDraft TINYINT, EmailHasAttachment TINYINT, EmailSize INTEGER, - Plugin TINYTEXT, + Plugin VARCHAR(255), FileIndex INTEGER, - JobId INTEGER + JobId INTEGER, + PRIMARY KEY(EmailPKId) ); -- Requires TEXT instead of BLOB @@ -606,19 +607,20 @@ CREATE INDEX meta_emailhasattachment on MetaEmail (EmailHasAttachment); CREATE INDEX meta_emailjobid on MetaEmail (Jobid); CREATE TABLE MetaAttachment -{ +( AttachmentPKId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication - AttachmentTenant TINYTEXT, - AttachmentOwner TINYTEXT, + AttachmentTenant VARCHAR(255), + AttachmentOwner VARCHAR(255), AttachmentName TEXT, - AttachmentEmailId TINYTEXT, - AttachmentContentType TINYTEXT, + AttachmentEmailId VARCHAR(255), + AttachmentContentType VARCHAR(255), AttachmentIsInline SMALLINT, AttachmentSize INTEGER, - Plugin TINYTEXT, + Plugin VARCHAR(255), FileIndex INTEGER, - JobId INTEGER -}; + JobId INTEGER, + PRIMARY KEY(AttachmentPKId) +); CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,AttachmentOwner); CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId); diff --git a/bacula/updatedb/update_mysql_tables_1024_to_1025.in b/bacula/updatedb/update_mysql_tables_1024_to_1025.in index c6125c464..f5eb53d7f 100644 --- a/bacula/updatedb/update_mysql_tables_1024_to_1025.in +++ b/bacula/updatedb/update_mysql_tables_1024_to_1025.in @@ -33,27 +33,28 @@ ALTER TABLE Client ADD COLUMN Plugins TINYBLOB DEFAULT ''; CREATE TABLE MetaEmail ( EmailPKId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication - EmailTenant TINYTEXT, - EmailOwner TINYTEXT, - EmailId TINYTEXT, + EmailTenant VARCHAR(255), + EmailOwner VARCHAR(255), + EmailId VARCHAR(255), EmailTime DATETIME, EmailTags TEXT, EmailSubject TEXT, EmailFolderName TEXT, - EmailFrom TINYTEXT, + EmailFrom VARCHAR(255), EmailTo TEXT, EmailCc TEXT, - EmailInternetMessageId TINYTEXT, + EmailInternetMessageId VARCHAR(255), EmailBodyPreview TEXT, - EmailImportance TINYTEXT, - EmailConversationId TINYTEXT, + EmailImportance VARCHAR(255), + EmailConversationId VARCHAR(255), EmailIsRead TINYINT, EmailIsDraft TINYINT, EmailHasAttachment TINYINT, EmailSize INTEGER, - Plugin TINYTEXT, + Plugin VARCHAR(255), FileIndex INTEGER, - JobId INTEGER + JobId INTEGER, + PRIMARY KEY(EmailPKId) ); -- Requires TEXT instead of BLOB @@ -69,19 +70,20 @@ CREATE INDEX meta_emailhasattachment on MetaEmail (EmailHasAttachment); CREATE INDEX meta_emailjobid on MetaEmail (Jobid); CREATE TABLE MetaAttachment -{ +( AttachmentPKId BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, -- Used for replication - AttachmentTenant TINYTEXT, - AttachmentOwner TINYTEXT, + AttachmentTenant VARCHAR(255), + AttachmentOwner VARCHAR(255), AttachmentName TEXT, - AttachmentEmailId TINYTEXT, - AttachmentContentType TINYTEXT, + AttachmentEmailId VARCHAR(255), + AttachmentContentType VARCHAR(255), AttachmentIsInline SMALLINT, AttachmentSize INTEGER, - Plugin TINYTEXT, + Plugin VARCHAR(255), FileIndex INTEGER, - JobId INTEGER -}; + JobId INTEGER, + PRIMARY KEY(AttachmentPKId) +); CREATE INDEX meta_attachmentowner ON MetaAttachment (AttachmentTenant,AttachmentOwner); CREATE INDEX meta_attachmentemailid ON MetaAttachment (AttachmentEmailId);