From e3c63d004f6433a10782dcb777f574cf631b3e1c Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Tue, 10 May 2016 17:21:38 +0300 Subject: [PATCH] reword prepere() error. Fix for tableExists. Bump for 2.6 release --- MysqliDb.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/MysqliDb.php b/MysqliDb.php index 4f9d5f32..c467292c 100644 --- a/MysqliDb.php +++ b/MysqliDb.php @@ -10,7 +10,7 @@ * @copyright Copyright (c) 2010 * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License * @link http://github.com/joshcam/PHP-MySQLi-Database-Class - * @version 2.6-master + * @version 2.6 */ class MysqliDb @@ -1493,7 +1493,7 @@ protected function _buildLimit($numRows) protected function _prepareQuery() { if (!$stmt = $this->mysqli()->prepare($this->_query)) { - $msg = "Problem preparing query ($this->_query) " . $this->mysqli()->error; + $msg = $this->mysqli()->error . " query: " . $this->_query; $this->reset(); throw new Exception($msg); } @@ -1868,11 +1868,10 @@ public function tableExists($tables) return false; } - array_walk($tables, function (&$value, $key) { - $value = self::$prefix . $value; - }); + foreach ($tables as $i => $value) + $tables[$i] = self::$prefix . $value; $this->where('table_schema', $this->db); - $this->where('table_name', $tables, 'IN'); + $this->where('table_name', $tables, 'in'); $this->get('information_schema.tables', $count); return $this->count == $count; }