From 9b65c036a01371649c813351c062ec214abd1047 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 29 Aug 2016 09:55:50 +1000 Subject: [PATCH] Update transaction test to run against core and to work on either mysql or mysqli depending on what the dsn setting is --- tests/phpunit/CRM/Core/TransactionTest.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/CRM/Core/TransactionTest.php b/tests/phpunit/CRM/Core/TransactionTest.php index 60a9312284..a589c932e2 100644 --- a/tests/phpunit/CRM/Core/TransactionTest.php +++ b/tests/phpunit/CRM/Core/TransactionTest.php @@ -362,7 +362,16 @@ class CRM_Core_TransactionTest extends CiviUnitTestCase { if ($insert == 'sql-insert') { $r = CRM_Core_DAO::executeQuery("INSERT INTO civicrm_contact(first_name,last_name) VALUES ('ff', 'll')"); - $cid = mysqli_insert_id($r->getConnection()->connection); + $mysqlFunction = strstr(CRM_Core_Config::singleton()->dsn, 'mysqli') ? 'mysqli_insert_id' : 'mysql_insert_id'; + if ($mysqlFunction == 'mysql_insert_id' && phpversion() >= 7) { + CRM_Core_Exception('Current DSN in compatible with the PHP version, need to update to use mysqli'); + } + if ($mysqlFunction == 'mysqli_insert_id') { + $cid = mysqli_insert_id($r->getConnection()->connection); + } + else { + $cid = mysql_insert_id(); + } } elseif ($insert == 'bao-create') { $params = array( -- 2.25.1