From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Sat, 29 Aug 2020 23:55:44 +0000 (+0200)
Subject: auth: add test for gmysql with stored procedures
X-Git-Tag: rec-4.5.0-alpha0~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca32c9e0698fb39a1dd53e3a45ce58bfdd96d53b;p=thirdparty%2Fpdns.git

auth: add test for gmysql with stored procedures
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 300568cfd0..3ea55f4484 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -746,6 +746,8 @@ jobs:
           context: gmysql-nsec3-optout-both
       - auth-regress:
           context: gmysql-nsec3-narrow
+      - auth-regress:
+          context: gmysql_sp-both
 
   test-auth-regress-gpgsql:
     resource_class: small
diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index e85c6d8dcb..a0f084926a 100644
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -1,7 +1,7 @@
 source ./backends/gsql-common
 
 case $context in
-	gmysql-nodnssec | gmysql | gmysql-nsec3 | gmysql-nsec3-optout | gmysql-nsec3-narrow)
+	gmysql-nodnssec | gmysql | gmysql-nsec3 | gmysql-nsec3-optout | gmysql-nsec3-narrow | gmysql_sp)
 		[ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest
 		[ -z "$GMYSQLUSER" ] && GMYSQLUSER=root
 		[ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost
@@ -33,3 +33,17 @@ __EOF__
 	*)
 		nocontext=yes
 esac
+
+if [[ "$context" = "gmysql_sp" ]]; then
+    cat >> pdns-gmysql.conf << __EOF__
+gmysql-basic-query=CALL basic_query(?, ?)
+__EOF__
+    mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \
+        "$GMYSQLDB" << __EOF__
+DELIMITER //
+CREATE PROCEDURE basic_query(incoming_type varchar(10), incoming_name varchar(255))
+BEGIN
+SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and type=incoming_type and name=incoming_name;
+END//
+__EOF__
+fi
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index f5f2fb5a54..714aec8080 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -44,7 +44,7 @@ Usage: ./start-test-stop <port> [<context>] [wait|nowait] [<cachettl>] [<specifi
 context is one of:
 bind bind-dnssec bind-dnssec-nsec3 bind-dnssec-nsec3-optout bind-dnssec-nsec3-narrow
 geoip geoip-nsec3-narrow
-gmysql-nodnssec gmysql gmysql-nsec3 gmysql-nsec3-optout gmysql-nsec3-narrow
+gmysql-nodnssec gmysql gmysql-nsec3 gmysql-nsec3-optout gmysql-nsec3-narrow gmysql_sp
 godbc_mssql-nodnssec godbc_mssql godbc_mssql-nsec3 godbc_mssql-nsec3-optout godbc_mssql-nsec3-narrow
 godbc_sqlite3-nodnssec godbc_sqlite3 godbc_sqlite3-nsec3 godbc_sqlite3-nsec3-optout godbc_sqlite3-narrow
 gpgsql-nodnssec gpgsql gpgsql-nsec3 gpgsql-nsec3-optout gpgsql-nsec3-narrow