Skip to content

Commit

Permalink
Merge pull request #473 from avbdr/master
Browse files Browse the repository at this point in the history
reword prepere() error. Fix for tableExists. Bump for 2.6 release
  • Loading branch information
avbdr committed May 10, 2016
2 parents 3df726d + e3c63d0 commit 1b9bad8
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions MysqliDb.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 1b9bad8

Please sign in to comment.