Merge pull request #448 from utopia-php/fix-add-escapes-for-rename

Fix non-quoted newKey in MariaDB and add newKey filtering for postgres # Conflicts: # composer.lock
utopia-php · Sep 10, 2024 · 36a0e89 · 36a0e89
1 parent 24b29bc
commit 36a0e89
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 8 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Database/Adapter/MariaDB.php b/src/Database/Adapter/MariaDB.php
@@ -322,7 +322,7 @@ public function updateAttribute(string $collection, string $id, string $type, in
         $type = $this->getSQLType($type, $size, $signed, $array);
 
         if (!empty($newKey)) {
-            $sql = "ALTER TABLE {$this->getSQLTable($name)} CHANGE COLUMN `{$id}` {$newKey} {$type};";
+            $sql = "ALTER TABLE {$this->getSQLTable($name)} CHANGE COLUMN `{$id}` `{$newKey}` {$type};";
         } else {
             $sql = "ALTER TABLE {$this->getSQLTable($name)} MODIFY `{$id}` {$type};";
         }

diff --git a/src/Database/Adapter/Postgres.php b/src/Database/Adapter/Postgres.php
@@ -351,6 +351,7 @@ public function updateAttribute(string $collection, string $id, string $type, in
     {
         $name = $this->filter($collection);
         $id = $this->filter($id);
+        $newKey = empty($newKey) ? null : $this->filter($newKey);
         $type = $this->getSQLType($type, $size, $signed, $array);
 
         if ($type == 'TIMESTAMP(3)') {

diff --git a/tests/e2e/Adapter/Base.php b/tests/e2e/Adapter/Base.php
@@ -5899,6 +5899,18 @@ public function testUpdateAttributeRename(): void
         } catch (\Exception $e) {
             $this->assertInstanceOf(StructureException::class, $e);
         }
+
+        // Check new key filtering
+        static::getDatabase()->updateAttribute(
+            collection: 'rename_test',
+            id: 'renamed',
+            newKey: 'renamed-test',
+        );
+
+        $doc = static::getDatabase()->getDocument('rename_test', $doc->getId());
+
+        $this->assertEquals('string', $doc->getAttribute('renamed-test'));
+        $this->assertArrayNotHasKey('renamed', $doc->getAttributes());
     }
 
     public function createRandomString(int $length = 10): string