Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes, Postgres improved support

Browse Source
This commit is contained in:
Roman Hergenreder
2020-06-25 16:54:58 +02:00
parent 2bbc895496
commit a0b935c082
19 changed files with 350 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Driver/SQL/MySQL.class.php
View File

@@ -173,7 +173,7 @@ class MySQL extends SQL {
$leftColumn = $this->columnName($key);
if ($value instanceof Column) {
$columnName = $this->columnName($value->getName());
$updateValues[] = "$leftColumn=$columnName";
$updateValues[] = "$leftColumn=VALUES($columnName)";
} else if($value instanceof Add) {
$columnName = $this->columnName($value->getColumn());
$operator = $value->getOperator();

2
core/Driver/SQL/PostgreSQL.class.php
View File

@@ -139,7 +139,7 @@ class PostgreSQL extends SQL {
$leftColumn = $this->columnName($key);
if ($value instanceof Column) {
$columnName = $this->columnName($value->getName());
$updateValues[] = "$leftColumn=$columnName";
$updateValues[] = "$leftColumn=EXCLUDED.$columnName";
} else if ($value instanceof Add) {
$columnName = $this->columnName($value->getColumn());
$operator = $value->getOperator();

8
core/Driver/SQL/SQL.class.php
View File

@@ -215,7 +215,9 @@ abstract class SQL {
}
public function executeTruncate(Truncate $truncate) {
return $this->execute("TRUNCATE " . $truncate->getTable());
$query = "TRUNCATE " . $this->tableName($truncate->getTable());
if ($truncate->dump) { var_dump($query); }
return $this->execute($query);
}
public function executeUpdate(Update $update) {
@@ -391,4 +393,8 @@ abstract class SQL {
}
public abstract function getStatus();
public function parseBool($val) : bool {
return in_array($val, array(true, 1, '1', 't', 'true', 'TRUE'));
}
}