Merge remote-tracking branch 'origin/main' into feat-query-lib

# Conflicts:
#	composer.lock
#	src/Database/Adapter.php
#	src/Database/Adapter/MariaDB.php
#	src/Database/Adapter/Mongo.php
#	src/Database/Adapter/Pool.php
#	src/Database/Adapter/Postgres.php
#	src/Database/Adapter/SQL.php
#	src/Database/Adapter/SQLite.php
#	src/Database/Database.php
#	src/Database/Document.php
#	src/Database/Mirror.php
#	src/Database/PDO.php
#	src/Database/Validator/Operator.php
#	src/Database/Validator/Query/Filter.php
#	src/Database/Validator/Sequence.php
#	src/Database/Validator/Structure.php
#	tests/e2e/Adapter/Scopes/CollectionTests.php
#	tests/e2e/Adapter/Scopes/DocumentTests.php
#	tests/e2e/Adapter/Scopes/GeneralTests.php

Author: abnegate

bin/cli.php

@@ -3,7 +3,7 @@
 require_once '/usr/src/code/vendor/autoload.php';
 
 use Utopia\CLI\CLI;
-use Utopia\CLI\Console;
+use Utopia\Console;
 
 ini_set('memory_limit', '-1');
 

bin/tasks/index.php

@@ -8,7 +8,7 @@
 use Utopia\Cache\Adapter\None as NoCache;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
-use Utopia\CLI\Console;
+use Utopia\Console;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Adapter\Postgres;

bin/tasks/load.php

@@ -6,7 +6,7 @@
 use Swoole\Database\PDOPool;
 use Utopia\Cache\Adapter\None as NoCache;
 use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
+use Utopia\Console;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Adapter\Postgres;

bin/tasks/operators.php

@@ -18,7 +18,7 @@
 
 use Utopia\Cache\Adapter\None as NoCache;
 use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
+use Utopia\Console;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Adapter\Postgres;

bin/tasks/query.php

@@ -9,7 +9,7 @@
 use Utopia\Cache\Adapter\None as NoCache;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
-use Utopia\CLI\Console;
+use Utopia\Console;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Adapter\Postgres;

bin/tasks/relationships.php

@@ -9,7 +9,7 @@
 use Swoole\Database\PDOPool;
 use Utopia\Cache\Adapter\None as NoCache;
 use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
+use Utopia\Console;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Adapter\Postgres;

composer.json

@@ -38,7 +38,8 @@
         "ext-pdo": "*",
         "ext-mongodb": "*",
         "ext-mbstring": "*",
-        "utopia-php/framework": "0.33.*",
+        "utopia-php/validators": "0.2.*",
+        "utopia-php/console": "0.1.*",
         "utopia-php/cache": "1.*",
         "utopia-php/pools": "1.*",
         "utopia-php/mongo": "1.*",
@@ -50,7 +51,7 @@
         "phpunit/phpunit": "^12.0",
         "brianium/paratest": "^7.7",
         "swoole/ide-helper": "5.1.3",
-        "utopia-php/cli": "0.14.*",
+        "utopia-php/cli": "0.22.*",
         "laravel/pint": "*",
         "phpstan/phpstan": "^2.0",
         "rregeer/phpunit-coverage-check": "0.3.*"

src/Database/Adapter.php

@@ -37,7 +37,7 @@ abstract class Adapter implements Feature\Attributes, Feature\Collections, Featu
 
     protected bool $sharedTables = false;
 
-    protected ?int $tenant = null;
+    protected int|string|null $tenant = null;
 
     protected bool $tenantPerDocument = false;
 
@@ -235,7 +235,7 @@ public function getSharedTables(): bool
      *
      * Set tenant to use if tables are shared
      */
-    public function setTenant(?int $tenant): bool
+    public function setTenant(int|string|null $tenant): bool
     {
         $this->tenant = $tenant;
 
@@ -247,7 +247,7 @@ public function setTenant(?int $tenant): bool
      *
      * Get tenant to use for shared tables
      */
-    public function getTenant(): ?int
+    public function getTenant(): int|string|null
     {
         return $this->tenant;
     }
@@ -938,6 +938,19 @@ public function getSchemaAttributes(string $collection): array
         return [];
     }
 
+    /**
+     * Get the physical schema indexes for a collection from the database engine.
+     *
+     * Returns physical index definitions from the database schema.
+     *
+     * @param string $collection The collection identifier.
+     * @return array<Document>
+     */
+    public function getSchemaIndexes(string $collection): array
+    {
+        return [];
+    }
+
     /**
      * Get the expected column type for a given attribute type.
      *

src/Database/Adapter/MariaDB.php

@@ -1808,6 +1808,58 @@ protected function getSearchRelevanceRaw(Query $query, string $alias): ?array
         ];
     }
 
+    public function getSupportForSchemaIndexes(): bool
+    {
+        return true;
+    }
+
+    public function getSchemaIndexes(string $collection): array
+    {
+        $schema = $this->getDatabase();
+        $collection = $this->getNamespace() . '_' . $this->filter($collection);
+
+        try {
+            $stmt = $this->getPDO()->prepare('
+                SELECT
+                    INDEX_NAME as indexName,
+                    COLUMN_NAME as columnName,
+                    NON_UNIQUE as nonUnique,
+                    SEQ_IN_INDEX as seqInIndex,
+                    INDEX_TYPE as indexType,
+                    SUB_PART as subPart
+                FROM INFORMATION_SCHEMA.STATISTICS
+                WHERE TABLE_SCHEMA = :schema AND TABLE_NAME = :table
+                ORDER BY INDEX_NAME, SEQ_IN_INDEX
+            ');
+            $stmt->bindParam(':schema', $schema);
+            $stmt->bindParam(':table', $collection);
+            $stmt->execute();
+            $rows = $stmt->fetchAll();
+            $stmt->closeCursor();
+
+            $grouped = [];
+            foreach ($rows as $row) {
+                $name = $row['indexName'];
+                if (!isset($grouped[$name])) {
+                    $grouped[$name] = [
+                        '$id' => $name,
+                        'indexName' => $name,
+                        'indexType' => $row['indexType'],
+                        'nonUnique' => (int)$row['nonUnique'],
+                        'columns' => [],
+                        'lengths' => [],
+                    ];
+                }
+                $grouped[$name]['columns'][] = $row['columnName'];
+                $grouped[$name]['lengths'][] = $row['subPart'] !== null ? (int)$row['subPart'] : null;
+            }
+
+            return \array_map(fn ($idx) => new Document($idx), \array_values($grouped));
+        } catch (PDOException $e) {
+            throw new DatabaseException('Failed to get schema indexes', $e->getCode(), $e);
+        }
+    }
+
     protected function processException(PDOException $e): Exception
     {
         if ($e->getCode() === '22007' && isset($e->errorInfo[1]) && $e->errorInfo[1] === 1366) {

src/Database/Adapter/Mongo.php

@@ -542,8 +542,10 @@ public function createCollection(string $name, array $attributes = [], array $in
     {
         $id = $this->getNamespace().'_'.$this->filter($name);
 
-        // For metadata collections outside transactions, check if exists first
-        if (! $this->inTransaction && $name === Database::METADATA && $this->exists($this->getNamespace(), $name)) {
+        // In shared-tables mode or for metadata, the physical collection may
+        // already exist for another tenant. Return early to avoid a
+        // "Collection Exists" exception from the client.
+        if (! $this->inTransaction && ($this->getSharedTables() || $name === Database::METADATA) && $this->exists($this->getNamespace(), $name)) {
             return true;
         }
 
@@ -560,6 +562,16 @@ public function createCollection(string $name, array $attributes = [], array $in
             if ($e instanceof DuplicateException) {
                 return true;
             }
+            // Client throws code-0 "Collection Exists" when its pre-check
+            // finds the collection. In shared-tables/metadata context this
+            // is a no-op; otherwise re-throw as DuplicateException so
+            // Database::createCollection() can run orphan reconciliation.
+            if ($e->getCode() === 0 && stripos($e->getMessage(), 'Collection Exists') !== false) {
+                if ($this->getSharedTables() || $name === Database::METADATA) {
+                    return true;
+                }
+                throw new DuplicateException('Collection already exists', $e->getCode(), $e);
+            }
             throw $e;
         }