Fix syntax and tests

diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php
index 3ec0fad1ee5ea2902c0bf9a3e48e712a520852ce..a390e7de3d64ef4eb7bb318be26545629f380645 100644 (file)
--- a/CRM/Core/BAO/SchemaHandler.php
+++ b/CRM/Core/BAO/SchemaHandler.php
@@ -589,7 +589,7 @@ MODIFY      {$columnName} varchar( $length )
    */
   public static function checkIfFieldExists($tableName, $columnName) {
     $result = CRM_Core_DAO::executeQuery(
-      "SHOW COLUMNS FROM $tableName LIKE ' %1 '",
+      "SHOW COLUMNS FROM $tableName LIKE %1",
       array(1 => array($columnName, 'String'))
     );
     if ($result->fetch()) {

diff --git a/tests/phpunit/CRM/Core/BAO/SchemaHandlerTest.php b/tests/phpunit/CRM/Core/BAO/SchemaHandlerTest.php
index 57f1d763bc8f89d58db8e13a488dcd5c0f38f1ea..00a86bbc2d734da680cc8654b8a0129dd1e286b4 100644 (file)
--- a/tests/phpunit/CRM/Core/BAO/SchemaHandlerTest.php
+++ b/tests/phpunit/CRM/Core/BAO/SchemaHandlerTest.php
@@ -128,7 +128,7 @@ class CRM_Core_BAO_SchemaHandlerTest extends CiviUnitTestCase {
   public function columnTests() {
     $columns = array();
     $columns[] = array('civicrm_contribution', 'total_amount');
-    $columns[] = array('civicrm_contact', 'from_name');
+    $columns[] = array('civicrm_contact', 'first_name');
     $columns[] = array('civicrm_contact', 'xxxx');
     return $columns;
   }