projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd78a9a)
Fixed tests for loosened MysqlColumnNameOrAlias validation.
authorMattias Michaux <mattias.michaux@gmail.com>
Tue, 24 May 2016 22:13:34 +0000 (00:13 +0200)
committerMattias Michaux <mattias.michaux@gmail.com>
Tue, 24 May 2016 22:13:34 +0000 (00:13 +0200)
tests/phpunit/CRM/Utils/TypeTest.php patch | blob | blame | history

diff --git a/tests/phpunit/CRM/Utils/TypeTest.php b/tests/phpunit/CRM/Utils/TypeTest.php
index 0bd51b3ff6970c0db1b4d6de63b441b9f2cd3cc1..3b6a853cecb59310480ea3d7a331146b43aabd61 100644 (file)
--- 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'),