auth: add test for gmysql with stored procedures

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 300568cfd09166afbc0350677482b78844ae60e6..3ea55f4484e4a9f01b25b10158b337695d371759 100644 (file)
--- 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 e85c6d8dcbfb95a6367830099b3d98738e5c222b..a0f084926a7e88c98306e165cdea06d3903ae916 100644 (file)
--- 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 f5f2fb5a54d50358aae520ef63b2aad3ab359607..714aec80808a1e12030ceb6fa365b1a925badcea 100755 (executable)
--- 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