From adf7f19df7be7ad15034e2ef910f52ca7c4d740a Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 8 Apr 2021 19:24:17 +0200 Subject: [PATCH] bugfix --- core/Driver/SQL/MySQL.class.php | 3 ++- core/Driver/SQL/Query/Insert.class.php | 5 ----- core/Driver/SQL/SQL.class.php | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/Driver/SQL/MySQL.class.php b/core/Driver/SQL/MySQL.class.php index ddbe4cd..a17cf39 100644 --- a/core/Driver/SQL/MySQL.class.php +++ b/core/Driver/SQL/MySQL.class.php @@ -347,7 +347,8 @@ class MySQL extends SQL { if ($param instanceof CurrentTable) { $values[] = $this->getUnsafeValue($trigger->getTable()); } else { - $values[] = $this->columnName("NEW." . $param->getName()); + $prefix = ($trigger->getEvent() !== "DELETE" ? "NEW." : "OLD."); + $values[] = $this->columnName($prefix . $param->getName()); } } diff --git a/core/Driver/SQL/Query/Insert.class.php b/core/Driver/SQL/Query/Insert.class.php index 89c5504..46235d8 100644 --- a/core/Driver/SQL/Query/Insert.class.php +++ b/core/Driver/SQL/Query/Insert.class.php @@ -37,11 +37,6 @@ class Insert extends Query { return $this; } - public function execute() { - $fetchResult = !empty($this->sql->getReturning($this->returning)); - return $this->sql->executeQuery($this, $fetchResult); - } - public function getTableName(): string { return $this->tableName; } public function getColumns(): array { return $this->columns; } public function getRows(): array { return $this->rows; } diff --git a/core/Driver/SQL/SQL.class.php b/core/Driver/SQL/SQL.class.php index d0c743d..b97bf8c 100644 --- a/core/Driver/SQL/SQL.class.php +++ b/core/Driver/SQL/SQL.class.php @@ -129,7 +129,7 @@ abstract class SQL { // fetch generated serial ids for Insert statements $generatedColumn = ($query instanceof Insert ? $query->getReturning() : null); - if($success && $fetchResult && $generatedColumn) { + if($success && $generatedColumn) { $this->fetchReturning($res, $generatedColumn); }