Adding upstream version 8.2402.0.upstream/8.2402.0

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

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/clickhouse-wrong-quotation-marks.sh b/tests/clickhouse-wrong-quotation-marks.sh
new file mode 100755
index 0000000..618aafe
--- /dev/null
+++ b/tests/clickhouse-wrong-quotation-marks.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# add 2018-12-19 by Pascal Withopf, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+generate_conf
+add_conf '
+module(load="../plugins/imtcp/.libs/imtcp")
+module(load="../plugins/omclickhouse/.libs/omclickhouse")
+input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port")
+
+
+template(name="outfmt" option.stdsql="on" type="string" string="INSERT INTO rsyslog.quotation (id, severity, message) VALUES ( 1, '
+add_conf "%syslogseverity%, '%msg%')"
+add_conf '")
+
+
+:syslogtag, contains, "tag" action(type="omclickhouse" server="localhost"
+					port="8443" bulkmode="off"
+					user="default" pwd="" template="outfmt")
+'
+
+clickhouse-client --query="CREATE TABLE IF NOT EXISTS rsyslog.quotation ( id Int32, severity Int8, message String ) ENGINE = MergeTree() PARTITION BY severity Order By id"
+
+startup
+tcpflood -m1 -M "\"<130>Mar 10 01:00:00 172.20.245.8 tag:it's a test\""
+shutdown_when_empty
+wait_shutdown
+clickhouse-client --query="SELECT id, severity, message FROM rsyslog.quotation" > $RSYSLOG_OUT_LOG
+
+export EXPECTED="1	2	it\\'s a test"
+cmp_exact $RSYSLOG_OUT_LOG
+
+clickhouse-client --query="DROP TABLE rsyslog.quotation"
+exit_test