Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"php": ">=8.1",
"twig/twig": "3.*",
"monolog/monolog": "2.*",
"dragonmantank/cron-expression": "^3.3"
"dragonmantank/cron-expression": "^3.3",
"brick/geo": "^0.11.0"
},

"require-dev": {
Expand Down
37 changes: 32 additions & 5 deletions src/Wave/DB.php
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,21 @@ public static function insert(Model &$object) {
);

try {
$connection->prepare($sql)->execute($params);
$statement = $connection->prepare($sql);
foreach($params as $name => $param){
if(is_array($param)){
$statement->bindValue($name+1, ...$param);
} else {
$statement->bindValue($name+1, $param);
}
}

$statement->execute();
} catch (\PDOException $e){
throw $connection->getDriverClass()::convertException($e);
}


$primary_key = $object::_getPrimaryKey();
if($primary_key !== null && count($primary_key) === 1) {
$column = current($primary_key);
Expand Down Expand Up @@ -518,9 +529,17 @@ public static function update(Model &$object) {
implode(',', $updates),
implode(' AND ', $criteria)
);
$connection->prepare($sql)->execute($params);

return true;
$statement = $connection->prepare($sql);
foreach($params as $name => $param){
if(is_array($param)){
$statement->bindValue($name+1, ...$param);
} else {
$statement->bindValue($name+1, $param);
}
}

return $statement->execute();
}

/**
Expand Down Expand Up @@ -549,12 +568,20 @@ public static function delete(Model &$object) {
$database->escape($object::_getTableName()),
implode(' AND ', $criteria)
);
$connection->prepare($sql)->execute($params);

$statement = $connection->prepare($sql);
foreach($params as $name => $param){
if(is_array($param)){
$statement->bindValue($name+1, ...$param);
} else {
$statement->bindValue($name+1, $param);
}
}
$statement->execute();
$object->_setLoaded(false);

return true;
}


}
}
1 change: 1 addition & 0 deletions src/Wave/DB/Column.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Column {
const TYPE_FLOAT = 5;
const TYPE_DATE = 6;
const TYPE_JSON = 7;
const TYPE_GEOMETRY = 8;

/** @var Table $table */
private $table;
Expand Down
6 changes: 6 additions & 0 deletions src/Wave/DB/Driver/AbstractDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Wave\DB\Driver;

use Brick\Geo\Geometry;
use Wave\DB\Column;

abstract class AbstractDriver
Expand All @@ -14,6 +15,8 @@ public static function valueToSQL($value)
return $value ? 1 : 0;
case $value instanceof \DateTimeInterface:
return $value->format('Y-m-d H:i:s');
case $value instanceof Geometry:
return [$value->asBinary(), \PDO::PARAM_LOB];
case is_object($value) || is_array($value):
return json_encode($value);

Expand Down Expand Up @@ -49,6 +52,9 @@ public static function valueFromSQL($value, array $field_data)
case Column::TYPE_JSON:
return json_decode($value);

case Column::TYPE_GEOMETRY:
return Geometry::fromBinary($value);

case Column::TYPE_DATE:
case Column::TYPE_TIMESTAMP:
if ($value == 'CURRENT_TIMESTAMP') {
Expand Down
3 changes: 3 additions & 0 deletions src/Wave/DB/Driver/MySQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ public static function translateSQLDataType($type)
case 'json' :
return DB\Column::TYPE_JSON;

case 'geometry' :
return DB\Column::TYPE_GEOMETRY;

default:
return DB\Column::TYPE_UNKNOWN;
}
Expand Down
3 changes: 3 additions & 0 deletions src/Wave/DB/Driver/PostgreSQL.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ public static function translateSQLDataType($type)
case 'json' :
return DB\Column::TYPE_JSON;

case 'geometry' :
return DB\Column::TYPE_GEOMETRY;

default:
return DB\Column::TYPE_UNKNOWN;
}
Expand Down