Commit 1b9bad88 authored by Alexander Butenko's avatar Alexander Butenko

Merge pull request #473 from avbdr/master

reword prepere() error. Fix for tableExists. Bump for 2.6 release
parents 3df726de e3c63d00
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* @copyright Copyright (c) 2010 * @copyright Copyright (c) 2010
* @license http://opensource.org/licenses/gpl-3.0.html GNU Public License * @license http://opensource.org/licenses/gpl-3.0.html GNU Public License
* @link http://github.com/joshcam/PHP-MySQLi-Database-Class * @link http://github.com/joshcam/PHP-MySQLi-Database-Class
* @version 2.6-master * @version 2.6
*/ */
class MysqliDb class MysqliDb
...@@ -1493,7 +1493,7 @@ class MysqliDb ...@@ -1493,7 +1493,7 @@ class MysqliDb
protected function _prepareQuery() protected function _prepareQuery()
{ {
if (!$stmt = $this->mysqli()->prepare($this->_query)) { 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(); $this->reset();
throw new Exception($msg); throw new Exception($msg);
} }
...@@ -1868,11 +1868,10 @@ class MysqliDb ...@@ -1868,11 +1868,10 @@ class MysqliDb
return false; return false;
} }
array_walk($tables, function (&$value, $key) { foreach ($tables as $i => $value)
$value = self::$prefix . $value; $tables[$i] = self::$prefix . $value;
});
$this->where('table_schema', $this->db); $this->where('table_schema', $this->db);
$this->where('table_name', $tables, 'IN'); $this->where('table_name', $tables, 'in');
$this->get('information_schema.tables', $count); $this->get('information_schema.tables', $count);
return $this->count == $count; return $this->count == $count;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment