Skip to content

fixes #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 4, 2015
Merged

fixes #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e45c95
Trim whitespaces in the code
avbdr Aug 4, 2015
a590ab3
Expand onDuplicate test
avbdr Aug 4, 2015
bd30f30
OnDuplicate and Insert functions refactoring. BugFix for id field
avbdr Aug 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 81 additions & 109 deletions MysqliDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class MysqliDb
protected static $_instance;
/**
* Table prefix
*
*
* @var string
*/
public static $prefix = '';
Expand Down Expand Up @@ -54,7 +54,7 @@ class MysqliDb
*
* @var array
*/
protected $_join = array();
protected $_join = array();
/**
* An array that holds where conditions 'fieldname' => 'value'
*
Expand All @@ -64,11 +64,11 @@ class MysqliDb
/**
* Dynamic type list for order by condition value
*/
protected $_orderBy = array();
protected $_orderBy = array();
/**
* Dynamic type list for group by condition value
*/
protected $_groupBy = array();
protected $_groupBy = array();
/**
* Dynamic array that holds a combination of where condition/table data value types and parameter references
*
Expand All @@ -79,13 +79,13 @@ class MysqliDb
* Variable which holds an amount of returned rows during get/getOne/select queries
*
* @var string
*/
*/
public $count = 0;
/**
* Variable which holds an amount of returned rows during get/getOne/select queries with withTotalCount()
*
* @var string
*/
*/
public $totalCount = 0;
/**
* Variable which holds last statement error
Expand Down Expand Up @@ -113,7 +113,7 @@ class MysqliDb
protected $isSubQuery = false;

/**
* Name of the auto increment column
* Name of the auto increment column
*
*/
protected $_lastInsertId = null;
Expand Down Expand Up @@ -240,7 +240,7 @@ protected function reset()
$this->_where = array();
$this->_join = array();
$this->_orderBy = array();
$this->_groupBy = array();
$this->_groupBy = array();
$this->_bindParams = array(''); // Create the empty 0 index
$this->_query = null;
$this->_queryOptions = array();
Expand Down Expand Up @@ -281,10 +281,10 @@ public function ObjectBuilder () {
$this->returnType = 'Object';
return $this;
}

/**
* Method to set a prefix
*
*
* @param string $prefix Contains a tableprefix
*/
public function setPrefix($prefix = '')
Expand Down Expand Up @@ -399,7 +399,7 @@ public function get($tableName, $numRows = null, $columns = '*')
if (empty ($columns))
$columns = '*';

$column = is_array($columns) ? implode(', ', $columns) : $columns;
$column = is_array($columns) ? implode(', ', $columns) : $columns;
$this->_tableName = self::$prefix . $tableName;
$this->_query = 'SELECT ' . implode(' ', $this->_queryOptions) . ' ' .
$column . " FROM " . $this->_tableName;
Expand All @@ -423,7 +423,7 @@ public function get($tableName, $numRows = null, $columns = '*')
*
* @return array Contains the returned rows from the select query.
*/
public function getOne($tableName, $columns = '*')
public function getOne($tableName, $columns = '*')
{
$res = $this->get ($tableName, 1, $columns);

Expand All @@ -444,7 +444,7 @@ public function getOne($tableName, $columns = '*')
*
* @return string Contains the value of a returned column.
*/
public function getValue($tableName, $column)
public function getValue($tableName, $column)
{
$res = $this->ArrayBuilder()->get ($tableName, 1, "{$column} as retval");

Expand Down Expand Up @@ -563,12 +563,12 @@ public function where($whereProp, $whereValue = 'DBNULL', $operator = '=', $cond
return $this;
}

/**
* This function store update column's name and column name of the
/**
* This function store update column's name and column name of the
* autoincrement column
*
*
* @param Array Variable with values
* @param String Variable value
* @param String Variable value
*/
public function onDuplicate($_updateColumns, $_lastInsertId = null)
{
Expand Down Expand Up @@ -632,7 +632,7 @@ public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields
$orderbyDirection = strtoupper (trim ($orderbyDirection));
$orderByField = preg_replace ("/[^-a-z0-9\.\(\),_`]+/i",'', $orderByField);

// Add table prefix to orderByField if needed.
// Add table prefix to orderByField if needed.
//FIXME: We are adding prefix only if table is enclosed into `` to distinguish aliases
// from table names
$orderByField = preg_replace('/(\`)([`a-zA-Z0-9_]*\.)/', '\1' . self::$prefix. '\2', $orderByField);
Expand All @@ -650,7 +650,7 @@ public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields

$this->_orderBy[$orderByField] = $orderbyDirection;
return $this;
}
}

/**
* This method allows you to specify multiple (method chaining optional) GROUP BY statements for SQL queries.
Expand All @@ -667,7 +667,7 @@ public function groupBy($groupByField)

$this->_groupBy[] = $groupByField;
return $this;
}
}

/**
* This methods returns the ID of the last inserted item
Expand Down Expand Up @@ -805,57 +805,6 @@ private function _buildInsert ($tableName, $insertData, $operation)
return true;
}

/**
* Helper function to add variables into the query statement
*
* @param Array Variable with values
*/
protected function _buildDuplicate($tableData)
{
if (is_array($this->_updateColumns) && !empty($this->_updateColumns)) {
$this->_query .= " on duplicate key update ";
if ($this->_lastInsertId) {
$this->_lastQuery .= $this->_lastInsertId."=LAST_INSERT_ID(".$this->_lastInsertId."),";
$this->_lastInsertId = null;
}

foreach ($this->_updateColumns as $column) {
$this->_query .= "`" . $column . "` = ";

// Simple value
if (!is_array ($tableData[$column])) {
$this->_bindParam($tableData[$column]);
$this->_query .= '?, ';
continue;
}

// Function value
$arr = $tableData[$column];
$key = key($arr);
$val = $arr[$key];
switch ($key) {
case '[I]':
$this->_query .= $column . $val . ", ";
break;
case '[F]':
$this->_query .= $val[0] . ", ";
if (!empty ($val[1]))
$this->_bindParams ($val[1]);
break;
case '[N]':
if ($val == null)
$this->_query .= "!" . $column . ", ";
else
$this->_query .= "!" . $val . ", ";
break;
default:
die ("Wrong operation");
}
}
$this->_query = rtrim($this->_query, ', ');
}
}

/**
* Abstraction method that will compile the WHERE statement,
* any passed update data, and the desired rows.
Expand All @@ -870,12 +819,12 @@ protected function _buildDuplicate($tableData)
protected function _buildQuery($numRows = null, $tableData = null)
{
$this->_buildJoin();
$this->_buildTableData ($tableData);
$this->_buildInsertQuery ($tableData);
$this->_buildWhere();
$this->_buildGroupBy();
$this->_buildOrderBy();
$this->_buildLimit ($numRows);
$this->_buildDuplicate($tableData);
$this->_buildOnDuplicate($tableData);

$this->_lastQuery = $this->replacePlaceHolders ($this->_query, $this->_bindParams);

Expand Down Expand Up @@ -912,7 +861,7 @@ protected function _dynamicBindResults(mysqli_stmt $stmt)

// if $meta is false yet sqlstate is true, there's no sql error but the query is
// most likely an update/insert/delete which doesn't produce any results
if(!$meta && $stmt->sqlstate) {
if(!$meta && $stmt->sqlstate) {
return array();
}

Expand Down Expand Up @@ -996,20 +945,9 @@ protected function _buildJoin () {
}
}

/**
* Abstraction method that will build an INSERT or UPDATE part of the query
*/
protected function _buildTableData ($tableData) {
if (!is_array ($tableData))
return;

$isInsert = preg_match ('/^[INSERT|REPLACE]/', $this->_query);
if ($isInsert)
$this->_query .= ' (`' . implode(array_keys($tableData), '`, `') . '`) VALUES (';
else
$this->_query .= " SET ";

foreach ($tableData as $column => $value) {
public function _buildDataPairs ($tableData, $tableColumns, $isInsert) {
foreach ($tableColumns as $column) {
$value = $tableData[$column];
if (!$isInsert)
$this->_query .= "`" . $column . "` = ";

Expand All @@ -1021,7 +959,7 @@ protected function _buildTableData ($tableData) {

// Simple value
if (!is_array ($value)) {
$this->_bindParam ($value);
$this->_bindParam($value);
$this->_query .= '?, ';
continue;
}
Expand All @@ -1030,25 +968,59 @@ protected function _buildTableData ($tableData) {
$key = key ($value);
$val = $value[$key];
switch ($key) {
case '[I]':
$this->_query .= $column . $val . ", ";
break;
case '[F]':
$this->_query .= $val[0] . ", ";
if (!empty ($val[1]))
$this->_bindParams ($val[1]);
break;
case '[N]':
if ($val == null)
$this->_query .= "!" . $column . ", ";
else
$this->_query .= "!" . $val . ", ";
break;
default:
die ("Wrong operation");
case '[I]':
$this->_query .= $column . $val . ", ";
break;
case '[F]':
$this->_query .= $val[0] . ", ";
if (!empty ($val[1]))
$this->_bindParams ($val[1]);
break;
case '[N]':
if ($val == null)
$this->_query .= "!" . $column . ", ";
else
$this->_query .= "!" . $val . ", ";
break;
default:
die ("Wrong operation");
}
}
$this->_query = rtrim ($this->_query, ', ');
$this->_query = rtrim($this->_query, ', ');
}

/**
* Helper function to add variables into the query statement
*
* @param Array Variable with values
*/
protected function _buildOnDuplicate($tableData)
{
if (is_array($this->_updateColumns) && !empty($this->_updateColumns)) {
$this->_query .= " on duplicate key update ";
if ($this->_lastInsertId)
$this->_query .= $this->_lastInsertId . "=LAST_INSERT_ID (".$this->_lastInsertId."), ";

$this->_buildDataPairs ($tableData, $this->_updateColumns, false);
}
}

/**
* Abstraction method that will build an INSERT or UPDATE part of the query
*/
protected function _buildInsertQuery ($tableData) {
if (!is_array ($tableData))
return;

$isInsert = preg_match ('/^[INSERT|REPLACE]/', $this->_query);
$dataColumns = array_keys ($tableData);
if ($isInsert)
$this->_query .= ' (`' . implode ($dataColumns, '`, `') . '`) VALUES (';
else
$this->_query .= " SET ";

$this->_buildDataPairs ($tableData, $dataColumns, $isInsert);

if ($isInsert)
$this->_query .= ')';
}
Expand Down Expand Up @@ -1234,7 +1206,7 @@ public function getLastQuery () {

/**
* Method returns mysql error
*
*
* @return string
*/
public function getLastError () {
Expand All @@ -1246,7 +1218,7 @@ public function getLastError () {
/**
* Mostly internal method to get query and its params out of subquery object
* after get() and getAll()
*
*
* @return array
*/
public function getSubQuery () {
Expand Down Expand Up @@ -1321,7 +1293,7 @@ public function inc($num = 1) {
public function dec ($num = 1) {
return Array ("[I]" => "-" . (int)$num);
}

/**
* Method generates change boolean function call
* @param string column name. null by default
Expand Down
Loading