Add Size to Email/Attachment metadata

diff --git a/bacula/src/cats/cats.c b/bacula/src/cats/cats.c
index d95ca2fa6305c32c261138ef25ba5edbccb0bf26..8e102be1537d90ef65a02b2173490f6dee07f9c1 100644 (file)
--- a/bacula/src/cats/cats.c
+++ b/bacula/src/cats/cats.c
@@ -459,6 +459,7 @@ static struct json_sql email_json_v1[] = {
    SAME_KW("EmailSubject", OT_STRING),
    SAME_KW("EmailTags", OT_STRING),
    SAME_KW("EmailTo", OT_STRING),
+   SAME_KW("EmailSize", OT_INT),
    SAME_KW("EmailHasAttachment", OT_INT),
    SAME_KW("Plugin", OT_STRING),
    {NULL, NULL, OT_END}
@@ -482,6 +483,7 @@ static struct json_sql email_attachment_json_v1[] = {
    //SAME_KW("AttachmentId", OT_STRING),
    SAME_KW("AttachmentIsInline", OT_BOOL),
    SAME_KW("AttachmentName", OT_STRING),
+   SAME_KW("AttachmentSize", OT_INT),
    SAME_KW("Plugin", OT_STRING),
    {NULL, NULL, OT_END}
 };

diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 45c1d8e2eaeed965cc859a8d847fed763e35bad6..599e4bd303073383fd55449432ccbcac315c5cef 100644 (file)
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -36,26 +36,27 @@ USE ${db_name};
 
 CREATE TABLE MetaEmail
 (
-    EmailTenant       TINYBLOB,
-    EmailOwner        TINYBLOB,
-    EmailId           TINYBLOB,
-    EmailTime         DATETIME,
-    EmailTags         BLOB,
-    EmailSubject      BLOB,
-    EmailFolderName   BLOB,
-    EmailFrom         TINYBLOB,
-    EmailTo           BLOB,
-    EmailCc           BLOB,
-    EmailInternetMessageId TINYBLOB,
-    EmailBodyPreview  BLOB,
-    EmailImportance   TINYBLOB,
-    EmailConversationId    TINYBLOB,
-    EmailIsRead       TINYINT,
-    EmailIsDraft      TINYINT,
-    EmailHasAttachement TINYINT,
-    Plugin       TINYBLOB,
-    FileIndex    int,
-    JobId        int
+    EmailTenant                TINYBLOB,
+    EmailOwner                 TINYBLOB,
+    EmailId                    TINYBLOB,
+    EmailTime                  DATETIME,
+    EmailTags                  BLOB,
+    EmailSubject               BLOB,
+    EmailFolderName            BLOB,
+    EmailFrom                  TINYBLOB,
+    EmailTo                    BLOB,
+    EmailCc                    BLOB,
+    EmailInternetMessageId     TINYBLOB,
+    EmailBodyPreview           BLOB,
+    EmailImportance            TINYBLOB,
+    EmailConversationId        TINYBLOB,
+    EmailIsRead                TINYINT,
+    EmailIsDraft               TINYINT,
+    EmailHasAttachment                 TINYINT,
+    EmailSize                          INTEGER,
+    Plugin                             TINYBLOB,
+    FileIndex                          INTEGER,
+    JobId                              INTEGER
 );
 
 CREATE INDEX meta_emailowner ON MetaEmail (EmailTenant, EmailOwner);
@@ -69,21 +70,22 @@ CREATE INDEX meta_emailto ON MetaEmail (EmailTo);
 CREATE INDEX meta_emailfrom ON MetaEmail (EmailFrom);
 CREATE INDEX meta_emailcc ON MetaEmail (EmailCc);
 CREATE INDEX meta_emailisread on MetaEmail (EmailIsRead);
-CREATE INDEX meta_emailhasattachement on MetaEmail (EmailHasAttachement);
+CREATE INDEX meta_emailhasattachment on MetaEmail (EmailHasAttachment);
 CREATE INDEX meta_emailfileindex_jobid on MetaEmail (Jobid, FileIndex);
 
-CREATE TABLE MetaAttachement
+CREATE TABLE MetaAttachment
 {
-    AttachementName     BLOB,
-    AttachementEmailId  TINYBLOB,
-    AttachementContentType TINYBLOB,
-    AttachementIsInline SMALLINT,
-    Plugin       TINYBLOB,
-    FileIndex    INTEGER,
-    JobId        INTEGER
+    AttachmentName                     BLOB,
+    AttachmentEmailId                  TINYBLOB,
+    AttachmentContentType      TINYBLOB,
+    AttachmentIsInline                 SMALLINT,
+    AttachmentSize                     INTEGER,
+    Plugin                             TINYBLOB,
+    FileIndex                          INTEGER,
+    JobId                              INTEGER
 };
 
-CREATE INDEX meta_attachementemailid ON MetaAttachement USING HASH (AttachementEmailId);
+CREATE INDEX meta_attachmentemailid ON MetaAttachment USING HASH (AttachmentEmailId);
 
 CREATE TABLE TagJob
 (

diff --git a/bacula/src/cats/make_postgresql_tables.in b/bacula/src/cats/make_postgresql_tables.in
index b37dcd54db489ba07f1a7c84280e5cb285a26610..6313998148b186dcc13a88238644d3f8edeadf28 100644 (file)
--- a/bacula/src/cats/make_postgresql_tables.in
+++ b/bacula/src/cats/make_postgresql_tables.in
@@ -20,26 +20,27 @@ psql -f - -d ${db_name} $* <<END-OF-DATA
 
 CREATE TABLE MetaEmail
 (
-    EmailTenant       text,
-    EmailOwner        text,
-    EmailId           text,
-    EmailTime timestamp without time zone,
-    EmailTags         text,
-    EmailSubject      text,
-    EmailFolderName   text,
-    EmailFrom         text,
-    EmailTo           text,
-    EmailCc           text,
-    EmailInternetMessageId text,  -- no index
-    EmailBodyPreview  text,
-    EmailImportance   text,
-    EmailConversationId    text,
-    EmailIsRead       smallint,
-    EmailIsDraft      smallint,
-    EmailHasAttachment smallint,
-    Plugin       text,
-    FileIndex    int,
-    JobId        int
+    EmailTenant                text,
+    EmailOwner                 text,
+    EmailId                    text,
+    EmailTime                          timestamp without time zone,
+    EmailTags                  text,
+    EmailSubject               text,
+    EmailFolderName            text,
+    EmailFrom                  text,
+    EmailTo                    text,
+    EmailCc                        text,
+    EmailInternetMessageId     text,  -- no index
+    EmailBodyPreview           text,
+    EmailImportance            text,
+    EmailConversationId        text,
+    EmailIsRead                smallint,
+    EmailIsDraft               smallint,
+    EmailHasAttachment         smallint,
+    EmailSize                          integer,
+    Plugin                             text,
+    FileIndex                                  int,
+    JobId                              int
 );
 
 -- Need to add postgresql-contrib to the dependency list
@@ -74,13 +75,14 @@ CREATE INDEX meta_emailfileindex_jobid on MetaEmail (Jobid, FileIndex);
 
 CREATE TABLE MetaAttachment
 (
-    AttachmentName     text,
-    AttachmentEmailId  text,
-    AttachmentContentType text,
-    AttachmentIsInline smallint,
-    Plugin       text,
-    FileIndex    int,
-    JobId        int
+    AttachmentName                     text,
+    AttachmentEmailId                  text,
+    AttachmentContentType      text,
+    AttachmentIsInline                 smallint,
+    AttachmentSize             int,
+    Plugin                             text,
+    FileIndex                          int,
+    JobId                              int
 );
 
 CREATE INDEX meta_attachmentemailid ON MetaAttachment USING HASH (AttachmentEmailId);