Skip to content

Support manual transaction and make sure only one transaction active #106

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
swznd wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Support manual transaction and make sure only one transaction active #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ec999e
add manual transaction and make sure only one transaction active
swznd Dec 22, 2015
18d7d4c
fix indentation
swznd Dec 22, 2015
2e996ba
ondulicate
swznd Jan 14, 2016
67754d5
fix duplicate function
swznd Jan 14, 2016
80788a2
fast fix: space raw where
swznd Jan 14, 2016
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
6 changes: 2 additions & 4 deletions src/Pixie/QueryBuilder/Adapters/BaseAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public function replace($statements, array $data)
{
return $this->doInsert($statements, $data, 'REPLACE');
}

/**
* Build fields assignment part of SET ... or ON DUBLICATE KEY UPDATE ... statements
*
Expand All @@ -224,7 +224,6 @@ private function getUpdateStatement($data)
{
$bindings = array();
$statement = '';

foreach ($data as $key => $value) {
if ($value instanceof Raw) {
$statement .= $this->wrapSanitizer($key) . '=' . $value . ',';
Expand All @@ -233,7 +232,6 @@ private function getUpdateStatement($data)
$bindings[] = $value;
}
}

$statement = trim($statement, ',');
return array($statement, $bindings);
}
Expand Down Expand Up @@ -406,7 +404,7 @@ protected function buildCriteria($statements, $bindValues = true)
break;
}
} elseif ($value instanceof Raw) {
$criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value";
$criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value ";
} else {
// Usual where like criteria

Expand Down
67 changes: 59 additions & 8 deletions src/Pixie/QueryBuilder/QueryBuilderHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class QueryBuilderHandler
* @var array
*/
protected $fetchParameters = array(\PDO::FETCH_OBJ);

/**
* @var integer
*/
protected $transactions = 0;

/**
* @param null|\Pixie\Connection $connection
Expand Down Expand Up @@ -788,20 +793,66 @@ public function join($table, $key, $operator = null, $value = null, $type = 'inn

return $this;
}

public function transaction(\Closure $callback)

/**
* @return void
*/
public function beginTransaction()
{
try {
++$this->transactions;

if ($this->transactions === 1) {
$this->pdo->beginTransaction();

$callback($this);
}
}

/**
* @return void
*/
public function commit()
{
if ($this->transactions === 1) {
$this->pdo->commit();
}

--$this->transactions;
}

/**
* @return void
*/
public function rollback()
{
if ($this->transactions == 1) {
$this->transactions = 0;
$this->pdo->rollBack();
}
else {
--$this->transactions;
}
}

/**
* @param \Closure $callback
*
* @return mixed
*
* @throws \Exception
*/
public function transaction(\Closure $callback)
{
try {
$this->beginTransaction();

return true;
$result = $callback($this);
$this->commit();
} catch (\Exception $e) {
$this->pdo->rollBack();
return false;
$this->rollback();

throw $e;
}

return $result;
}

/**
Expand Down