hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2457 Update test program

Browse Source
This commit is contained in:
Johan Wikman
2019-05-02 15:13:11 +03:00
parent 3a5a8b13b9
commit 3fa1f0773e
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxscale-system-test/cnf/maxscale.cnf.template.masking_auto_firewall
View File

@ -23,6 +23,7 @@ module=masking
rules=/home/vagrant/masking_auto_firewall.json rules=/home/vagrant/masking_auto_firewall.json
warn_type_mismatch=always warn_type_mismatch=always
large_payload=ignore large_payload=ignore
treat_string_arg_as_field=false
[RWS] [RWS]
type=service type=service

36
maxscale-system-test/masking_auto_firewall.cpp
View File

@ -74,8 +74,6 @@ void test_one_ps(TestConnections& test, const char* zQuery, Expect expect)
void run(TestConnections& test) void run(TestConnections& test)
{ {
init(test);
MYSQL* pMysql = test.maxscales->conn_rwsplit[0]; MYSQL* pMysql = test.maxscales->conn_rwsplit[0];
int rv; int rv;
@ -130,6 +128,38 @@ void run(TestConnections& test)
test_one(test, "select * FROM (select * from masking_auto_firewall) tbl", Expect::FAILURE); test_one(test, "select * FROM (select * from masking_auto_firewall) tbl", Expect::FAILURE);
} }
void run_ansi_quotes(TestConnections& test)
{
// This SHOULD go through as we have 'treat_string_arg_as_field=false"
test_one(test, "select concat(\"a\") from masking_auto_firewall", Expect::SUCCESS);
Connection c = test.maxscales->rwsplit();
c.connect();
test.expect(c.query("SET @@SQL_MODE = CONCAT(@@SQL_MODE, ',ANSI_QUOTES')"),
"Could not turn on 'ANSI_QUOTES'");
// This SHOULD still go through as we still have 'treat_string_arg_as_field=false"
test_one(test, "select concat(\"a\") from masking_auto_firewall", Expect::SUCCESS);
// Let's turn on 'treat_string_arg_as_field=true'
test.maxscales->ssh_node(0,
"sed -i -e "
"'s/treat_string_arg_as_field=false/treat_string_arg_as_field=true/' "
"/etc/maxscale.cnf",
true);
// and restart MaxScale
test.maxscales->restart();
// This should NOT go through as we have 'treat_string_arg_as_field=true" and ANSI_QUOTES.
test_one(test, "select concat(\"a\") from masking_auto_firewall", Expect::FAILURE);
// Have to reconnect as we restarted MaxScale.
c.connect();
test.expect(c.query("SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ANSI_QUOTES', '')"),
"Could not turn off 'ANSI_QUOTES'");
}
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -151,7 +181,9 @@ int main(int argc, char* argv[])
if (test.maxscales->connect_rwsplit() == 0) if (test.maxscales->connect_rwsplit() == 0)
{ {
init(test);
run(test); run(test);
run_ansi_quotes(test);
} }
else else
{ {