Merge pull request #1046 from utopia-php/fix-dotted-attribute-keys

fix(sql): filter dotted attribute keys in batch create and upsert

Author: HarshMN2345

src/Database/Adapter/SQL.php

@@ -924,7 +924,7 @@ private function buildDocumentsInsert(string $name, array $documents, array $spa
         $spatialMap = \array_fill_keys($spatialAttributes, true);
 
         foreach ($spatialAttributes as $spatialColumn) {
-            $builder->insertColumnExpression($spatialColumn, $this->getSpatialGeometryFromText('?'));
+            $builder->insertColumnExpression($this->filter($spatialColumn), $this->getSpatialGeometryFromText('?'));
         }
 
         $intBools = $this->supports(Capability::IntegerBooleans);
@@ -3912,6 +3912,9 @@ protected function executeUpsertBatch(
     ): void {
         $builder = $this->dialectBuilder()->into($this->getTableRaw($name));
 
+        $spatialAttributes = \array_map($this->filter(...), $spatialAttributes);
+        $operators = \array_combine(\array_map($this->filter(...), \array_keys($operators)), $operators);
+
         foreach ($spatialAttributes as $spatialColumn) {
             $builder->insertColumnExpression($spatialColumn, $this->getSpatialGeometryFromText('?'));
         }
@@ -3956,11 +3959,14 @@ protected function executeUpsertBatch(
 
             $currentRegularAttributes = $this->decorateRow($currentRegularAttributes, $document);
 
-            foreach (\array_keys($currentRegularAttributes) as $column) {
+            $row = [];
+            foreach ($currentRegularAttributes as $column => $value) {
+                $column = $this->filter($column);
+                $row[$column] = $value;
                 $allColumnNames[$column] = true;
             }
 
-            $documentsData[] = $currentRegularAttributes;
+            $documentsData[] = $row;
         }
 
         foreach (\array_keys($operators) as $column) {
@@ -6550,7 +6556,7 @@ protected function buildDocumentRow(Document $document, array $attributeKeys, ar
             if ($intBools && ! isset($spatialMap[$key])) {
                 $value = (\is_bool($value)) ? (int) $value : $value;
             }
-            $row[$key] = $value;
+            $row[$this->filter($key)] = $value;
         }
 
         return $row;

tests/e2e/Adapter/Scopes/AttributeTests.php

@@ -519,6 +519,32 @@ public function testDottedAttributeKeysInGroups(): void
         $database->deleteCollection($collection);
     }
 
+    public function testDottedAttributeKeysInBatchWrites(): void
+    {
+        $database = $this->getDatabase();
+        if (! $database->getAdapter()->hasFeature(Feature\Upserts::class)) {
+            $this->expectNotToPerformAssertions();
+
+            return;
+        }
+
+        $collection = $this->createDottedKeyCollection($database);
+
+        $database->createDocuments($collection, [
+            new Document(['$id' => 'e', 'dots.name' => 'x', 'dots.score' => 7]),
+            new Document(['$id' => 'f', 'dots.name' => 'x', 'dots.score' => 11]),
+        ]);
+        $database->getAuthorization()->skip(fn (): int => $database->upsertDocuments($collection, [
+            new Document(['$id' => 'e', 'dots.name' => 'y', 'dots.score' => 7]),
+            new Document(['$id' => 'g', 'dots.name' => 'y', 'dots.score' => 13]),
+        ]));
+
+        $this->assertSame(['e', 'g'], $this->sortedIds($database->find($collection, [Query::equal('dots.name', ['y'])])));
+        $this->assertSame(['f'], $this->sortedIds($database->find($collection, [Query::equal('dots.name', ['x'])])));
+
+        $database->deleteCollection($collection);
+    }
+
     /**
      * @param  array<string, mixed>  $group
      */