Update

manyou-io · Sep 11, 2023 · df4687e · df4687e
1 parent 0f20ad2
commit df4687e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/packages/mango/Doctrine/Query.php b/packages/mango/Doctrine/Query.php
@@ -910,6 +910,10 @@ public function where(mixed ...$expressions): self
     {
         $where = [];
         foreach ($expressions as $matchColumn => $expression) {
+            if ($expression === null) {
+                continue;
+            }
+
             if (is_string($matchColumn)) {
                 if (is_array($expression)) {
                     $expression = $this->in($matchColumn, $expression);

diff --git a/packages/mango/Doctrine/SchemaProvider.php b/packages/mango/Doctrine/SchemaProvider.php
@@ -17,6 +17,7 @@
 use Throwable;
 use UnexpectedValueException;
 
+use function array_keys;
 use function array_map;
 use function array_merge;
 use function implode;
@@ -219,4 +220,10 @@ public function onConflictDoUpdate(Query $insert, array $conflict, array $update
 
         return $rowNum;
     }
+
+    public function upsertLock(string $table, array $data): void
+    {
+        $q = $this->createQuery();
+        $this->onConflictDoUpdate($q->insert($table, $data), array_keys($data), $data);
+    }
 }
diff --git a/packages/mango/Scheduler/Doctrine/Table/ScheduledMessagesTable.php b/packages/mango/Scheduler/Doctrine/Table/ScheduledMessagesTable.php
@@ -4,7 +4,6 @@
 
 namespace Mango\Scheduler\Doctrine\Table;
 
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Mango\Doctrine\Schema\TableBuilder;
 use Mango\Doctrine\Table;