Adding upstream version 3.8.1.upstream/3.8.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 99 insertions, 0 deletions

diff --git a/test/functional/data/schema_2/data.rspamd.sql b/test/functional/data/schema_2/data.rspamd.sql
new file mode 100644
index 0000000..5bcfd24
--- /dev/null
+++ b/test/functional/data/schema_2/data.rspamd.sql
@@ -0,0 +1,56 @@
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+(toDate(now()),'2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
+('2017-08-21','2018-08-21 11:24:15','example.com','example.com','127.0.0.0',0.9,0,1312,'unknown','unknown','unknown','unknown','unknown','unknown',0,'no action','rssfeeds','rssfeeds','','','','',[],[],[],[],[],[],[],'','\0\0','',[],[],[],'b3e5e01c86a8fd8a9bc5a66d033cc32e'),
diff --git a/test/functional/data/schema_2/schema.sql b/test/functional/data/schema_2/schema.sql
new file mode 100644
index 0000000..a0df35a
--- /dev/null
+++ b/test/functional/data/schema_2/schema.sql
@@ -0,0 +1,43 @@
+CREATE TABLE rspamd
+(
+    Date Date,
+    TS DateTime,
+    From String,
+    MimeFrom String,
+    IP String,
+    Score Float64,
+    NRcpt UInt8,
+    Size UInt32,
+    IsWhitelist Enum8('blacklist' = 0, 'whitelist' = 1, 'unknown' = 2) DEFAULT CAST('unknown' AS Enum8('blacklist' = 0, 'whitelist' = 1, 'unknown' = 2)),
+    IsBayes Enum8('ham' = 0, 'spam' = 1, 'unknown' = 2) DEFAULT CAST('unknown' AS Enum8('ham' = 0, 'spam' = 1, 'unknown' = 2)),
+    IsFuzzy Enum8('whitelist' = 0, 'deny' = 1, 'unknown' = 2) DEFAULT CAST('unknown' AS Enum8('whitelist' = 0, 'deny' = 1, 'unknown' = 2)),
+    IsFann Enum8('ham' = 0, 'spam' = 1, 'unknown' = 2) DEFAULT CAST('unknown' AS Enum8('ham' = 0, 'spam' = 1, 'unknown' = 2)),
+    IsDkim Enum8('reject' = 0, 'allow' = 1, 'unknown' = 2) DEFAULT CAST('unknown' AS Enum8('reject' = 0, 'allow' = 1, 'unknown' = 2)),
+    IsDmarc Enum8('reject' = 0, 'allow' = 1, 'unknown' = 2) DEFAULT CAST('unknown' AS Enum8('reject' = 0, 'allow' = 1, 'unknown' = 2)),
+    NUrls Int32,
+    Action Enum8('reject' = 0, 'rewrite subject' = 1, 'add header' = 2, 'greylist' = 3, 'no action' = 4, 'soft reject' = 5) DEFAULT CAST('no action' AS Enum8('reject' = 0, 'rewrite subject' = 1, 'add header' = 2, 'greylist' = 3, 'no action' = 4, 'soft reject' = 5)),
+    FromUser String,
+    MimeUser String,
+    RcptUser String,
+    RcptDomain String,
+    ListId String,
+    Subject String,
+    `Attachments.FileName` Array(String),
+    `Attachments.ContentType` Array(String),
+    `Attachments.Length` Array(UInt32),
+    `Attachments.Digest` Array(FixedString(16)),
+    `Urls.Tld` Array(String),
+    `Urls.Url` Array(String),
+    Emails Array(String),
+    ASN String,
+    Country FixedString(2),
+    IPNet String,
+    `Symbols.Names` Array(String),
+    `Symbols.Scores` Array(Float64),
+    `Symbols.Options` Array(String),
+    Digest FixedString(32)
+) ENGINE = MergeTree(Date, (TS, From), 8192);
+
+CREATE TABLE rspamd_version ( Version UInt32) ENGINE = TinyLog;
+
+INSERT INTO rspamd_version (Version) Values (3);
\ No newline at end of file