Skip to content

Lock supported #1025

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

Open
runchance wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Lock supported #1025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 53 additions & 6 deletions src/Medoo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,14 @@ class Medoo
*/
public $errorInfo = null;


/**
* The array of lockSql.
*
* @var array|null
*/
protected $lockSql = null;

/**
* Connect the database.
*
Expand Down Expand Up @@ -553,7 +561,6 @@ public function exec(string $statement, array $map = [], callable $callback = nu
foreach ($map as $key => $value) {
$statement->bindValue($key, $value[0], $value[1]);
}

if (is_callable($callback)) {
$this->pdo->beginTransaction();
$callback($statement);
Expand Down Expand Up @@ -1018,10 +1025,10 @@ protected function dataImplode(array $data, array &$map, string $conjunctor): st
protected function whereClause($where, array &$map): string
{
$clause = '';

$this->lockSql = null;
if (is_array($where)) {
$conditions = array_diff_key($where, array_flip(
['GROUP', 'ORDER', 'HAVING', 'LIMIT', 'LIKE', 'MATCH']
['GROUP', 'ORDER', 'HAVING', 'LIMIT', 'LIKE', 'MATCH', 'LOCK']
));

if (!empty($conditions)) {
Expand Down Expand Up @@ -1142,6 +1149,32 @@ protected function whereClause($where, array &$map): string
}
}
}

if (isset($where['LOCK'])) {
$lock = '';
if (is_bool($where['LOCK'])) {
$lock = $where['LOCK'] ? 'FOR UPDATE' : '';
switch($this->type){
case 'mssql':
$lock = '';
$this->lockSql = $where['LOCK'] ? 'WITH(rowlock,updlock,holdlock)' : '';
break;
case 'oracle':
$lock = $where['LOCK'] ? 'FOR UPDATE NOWAIT' : '';
break;
}
}else{
if (is_string($where['LOCK']) && !empty($where['LOCK'])) {
if($this->type==='mssql'){
$this->lockSql = $where['LOCK'] ? 'WITH('.trim($lock).')' : '';
}else{
$lock = trim($lock);
}
}
}
$clause .= $lock ? ' ' . $lock : '';
}

} elseif ($raw = $this->buildRaw($where, $map)) {
$clause .= ' ' . $raw;
}
Expand Down Expand Up @@ -1178,7 +1211,7 @@ protected function selectContext(
$table = $this->tableQuote($table);
$tableQuery = $table;
}

$isJoin = $this->isJoin($join);

if ($isJoin) {
Expand Down Expand Up @@ -1221,8 +1254,22 @@ protected function selectContext(
} else {
$column = $this->columnPush($columns, $map, true, $isJoin);
}

return 'SELECT ' . $column . ' FROM ' . $tableQuery . $this->whereClause($where, $map);
$whereClause = $this->whereClause($where, $map);
if($this->lockSql){
$explode = explode(' ',$tableQuery);
if(count($explode)==1){
$tableQuery.= $this->lockSql ? ' '.$this->lockSql : '';
}else{
if($this->lockSql){
if($explode[1]=='AS'){
$tableQuery = str_replace($explode[0].' AS '.$explode[2],$explode[0].' AS '.$explode[2].' '.$this->lockSql,$tableQuery);
}else{
$tableQuery = str_replace($explode[0].' ',$explode[0].' '.$this->lockSql,$tableQuery);
}
}
}
}
return 'SELECT ' . $column . ' FROM ' . $tableQuery . $whereClause;
}

/**
Expand Down