From 62d6d1c0839eceee82e07db767f361543ce97d44 Mon Sep 17 00:00:00 2001 From: Mattias Michaux Date: Wed, 25 May 2016 00:13:34 +0200 Subject: [PATCH] Fixed tests for loosened MysqlColumnNameOrAlias validation. --- tests/phpunit/CRM/Utils/TypeTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/CRM/Utils/TypeTest.php b/tests/phpunit/CRM/Utils/TypeTest.php index 0bd51b3ff6..3b6a853cec 100644 --- a/tests/phpunit/CRM/Utils/TypeTest.php +++ b/tests/phpunit/CRM/Utils/TypeTest.php @@ -40,8 +40,9 @@ class CRM_Utils_TypeTest extends CiviUnitTestCase { array('civicrm_column_name', 'MysqlColumnNameOrAlias', 'civicrm_column_name'), array('table.civicrm_column_name', 'MysqlColumnNameOrAlias', 'table.civicrm_column_name'), array('table.civicrm_column_name.toomanydots', 'MysqlColumnNameOrAlias', NULL), - array('Home-street_address', 'MysqlColumnNameOrAlias', NULL), + array('Home-street_address', 'MysqlColumnNameOrAlias', 'Home-street_address'), array('`Home-street_address`', 'MysqlColumnNameOrAlias', '`Home-street_address`'), + array('`Home-street_address', 'MysqlColumnNameOrAlias', NULL), array('table.`Home-street_address`', 'MysqlColumnNameOrAlias', 'table.`Home-street_address`'), array('`table-alias`.`Home-street_address`', 'MysqlColumnNameOrAlias', '`table-alias`.`Home-street_address`'), array('`table-alias`.column', 'MysqlColumnNameOrAlias', '`table-alias`.column'), @@ -98,8 +99,9 @@ class CRM_Utils_TypeTest extends CiviUnitTestCase { array('civicrm_column_name', 'MysqlColumnNameOrAlias', '`civicrm_column_name`'), array('table.civicrm_column_name', 'MysqlColumnNameOrAlias', '`table`.`civicrm_column_name`'), array('table.civicrm_column_name.toomanydots', 'MysqlColumnNameOrAlias', NULL), - array('Home-street_address', 'MysqlColumnNameOrAlias', NULL), + array('Home-street_address', 'MysqlColumnNameOrAlias', '`Home-street_address`'), array('`Home-street_address`', 'MysqlColumnNameOrAlias', '`Home-street_address`'), + array('`Home-street_address', 'MysqlColumnNameOrAlias', NULL), array('column_name, sleep(5)', 'MysqlColumnNameOrAlias', NULL), array('asc', 'MysqlOrderByDirection', 'asc'), array('DESC', 'MysqlOrderByDirection', 'desc'), -- 2.25.1