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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-01 11:31:49 +03:00
parent 4276514e27 738ae9178b
commit e659c6cc73
15 changed files with 200 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ socket=default
type=filter
module=masking
rules=/###access_homedir###/masking_rules.json
require_fully_parsed=false
[server1]
type=server

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

@ -121,13 +121,13 @@ void run(TestConnections& test)
test_one(test, "select 1 UNION select * FROM masking_auto_firewall", Expect::FAILURE);
// This SHOULD succeed as a masked column is not used in the statment.
test_one(test, "select * FROM (select b from masking_auto_firewall)", Expect::SUCCESS);
test_one(test, "select * FROM (select b from masking_auto_firewall) tbl", Expect::SUCCESS);
// This SHOULD succeed as a masked column is not used in the statment.
test_one(test, "select * FROM (select a as b from masking_auto_firewall)", Expect::FAILURE);
test_one(test, "select * FROM (select a as b from masking_auto_firewall) tbl", Expect::FAILURE);
// This SHOULD succeed as '*' is used in the statment.
test_one(test, "select * FROM (select * from masking_auto_firewall)", Expect::FAILURE);
test_one(test, "select * FROM (select * from masking_auto_firewall) tbl", Expect::FAILURE);
}
}