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

MXS-1702: Process comments when canonicalizing

Browse Source 
The canonicalization process now strips non-executable comments from the
SQL and replaces all constants in executable comments.

Enabled the comment test and updated expected output of the select and
alter tests.
This commit is contained in:
Markus Mäkelä
2018-03-16 15:29:55 +02:00
parent 9fe25c8003
commit e4efc29297
4 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/test/canonical_tests/CMakeLists.txt
View File

@ -22,13 +22,12 @@ add_test(NAME test_canonical_alter COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest
${CMAKE_CURRENT_SOURCE_DIR}/alter.expected
$<TARGET_FILE:canonizer>)
# TODO: Fix comment removal
# add_test(NAME test_canonical_comment COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest.sh
# ${CMAKE_CURRENT_BINARY_DIR}/test.log
# ${CMAKE_CURRENT_SOURCE_DIR}/comment.sql
# ${CMAKE_CURRENT_BINARY_DIR}/comment.output
# ${CMAKE_CURRENT_SOURCE_DIR}/comment.expected
# $<TARGET_FILE:canonizer>)
add_test(NAME test_canonical_comment COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest.sh
${CMAKE_CURRENT_BINARY_DIR}/test.log
${CMAKE_CURRENT_SOURCE_DIR}/comment.sql
${CMAKE_CURRENT_BINARY_DIR}/comment.output
${CMAKE_CURRENT_SOURCE_DIR}/comment.expected
$<TARGET_FILE:canonizer>)
add_test(NAME test_canonical_whitespace COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/canontest.sh
${CMAKE_CURRENT_BINARY_DIR}/test.log

4
server/core/test/canonical_tests/alter.expected
View File

@ -1,7 +1,7 @@
ALTER DATABASE `` DEFAULT CHARACTER SET latin2;
ALTER DATABASE `#mysql50#../` UPGRADE DATA DIRECTORY NAME;
ALTER DATABASE `#mysql50#../..` UPGRADE DATA DIRECTORY NAME; # a comment
ALTER DATABASE `#mysql51#not-yet` UPGRADE DATA DIRECTORY NAME; # a comment with backticks `this should work`
ALTER DATABASE `#mysql50#../..` UPGRADE DATA DIRECTORY NAME;
ALTER DATABASE `#mysql51#not-yet` UPGRADE DATA DIRECTORY NAME;
ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
ALTER DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY ? HOUR;
ALTER EVENT e1 COMMENT ?;

2
server/core/test/canonical_tests/select.expected
View File

@ -46,7 +46,7 @@ SELECT v1.a, v2. b FROM v1 LEFT OUTER JOIN v2 ON (v1.a=v2.b) AND (v1.a >= ?) GRO
SELECT v1.f4 FROM v1 WHERE f1<>? OR f2<>? AND f4=? AND (f2<>? OR f3<>? AND f5<>? OR f4 LIKE ?);
select v1.r_object_id, v2.users_names from v1, v2where (v1.group_name=?) and v2.r_object_id=v1.r_object_idorder by users_names;
SELECT v2 FROM t1 WHERE v1 IN (?, ?, ?, ? ) AND i = ?;
select ? as ?;# this should be removed
select ? as ?;
SELECT @@tx_isolation;
select @ujis4 = CONVERT(@utf84 USING ujis);
SELECT @user_var;