fix: restore (int) cast on getDatabasesDB tenant to match cloud

Merge remote-tracking branch 'origin/1.9.x' into bump-database-version2
fix: restore full CI matrix and revert test/endpoint changes to 1.9.x
2026-05-26 13:51:13 +00:00 · 2026-04-02 12:11:24 +02:00 · 2026-04-02 10:10:03 +02:00 · 2026-04-02 10:09:36 +02:00 · 2026-04-02 06:53:05 +02:00 · 2026-04-02 06:26:55 +02:00
6 changed files with 90 additions and 20 deletions
@@ -459,6 +459,10 @@ jobs:
          _APP_BROWSER_HOST: http://invalid-browser/v1
          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
+          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
+          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'documentsdb_db_main' || '' }}
+          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
+          _APP_DATABASE_VECTORSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'vectorsdb_db_main' || '' }}
        run: |
          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
@@ -533,6 +537,10 @@ jobs:
          _APP_OPTIONS_ABUSE: enabled
          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
+          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
+          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'documentsdb_db_main' || '' }}
+          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
+          _APP_DATABASE_VECTORSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'vectorsdb_db_main' || '' }}
        run: |
          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
@@ -590,6 +598,10 @@ jobs:
        env:
          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
+          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
+          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'documentsdb_db_main' || '' }}
+          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
+          _APP_DATABASE_VECTORSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'vectorsdb_db_main' || '' }}
        run: |
          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
@@ -888,7 +888,6 @@ Http::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authori
 }, ['pools', 'cache', 'authorization']);

 Http::setResource('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, UsageContext $usage, Authorization $authorization) {
-
    return function (Document $database) use ($pools, $cache, $project, $request, $usage, $authorization): Database {
        $databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
        $databaseType = $database->getAttribute('type', '');
@@ -907,11 +906,12 @@ Http::setResource('getDatabasesDB', function (Group $pools, Cache $cache, Docume
            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
        }

-        $pool = $pools->get($databaseDSN->getHost());
+        $databaseHost = $databaseDSN->getHost();
+        $pool = $pools->get($databaseHost);

        $adapter = new DatabasePool($pool);
        $database = new Database($adapter, $cache);
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+        $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));

        $database
            ->setDatabase(APP_DATABASE)
@@ -922,7 +922,28 @@ Http::setResource('getDatabasesDB', function (Group $pools, Cache $cache, Docume
            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
        // inside pools authorization needs to be set first
        $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
-        if (\in_array($dsn->getHost(), $sharedTables)) {
+
+        // For separate pools (documentsdb/vectorsdb), check their own shared tables config.
+        // If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
+        if ($databaseHost !== $dsn->getHost()) {
+            $dbTypeSharedTables = match ($databaseType) {
+                DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
+                VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
+                default => [],
+            };
+
+            if (\in_array($databaseHost, $dbTypeSharedTables)) {
+                $database
+                    ->setSharedTables(true)
+                    ->setTenant((int)$project->getSequence())
+                    ->setNamespace($dsn->getParam('namespace'));
+            } else {
+                $database
+                    ->setSharedTables(false)
+                    ->setTenant(null)
+                    ->setNamespace('_' . $project->getSequence());
+            }
+        } elseif (\in_array($dsn->getHost(), $sharedTables)) {
            $database
                ->setSharedTables(true)
                ->setTenant((int)$project->getSequence())
@@ -246,7 +246,8 @@ Server::setResource('getDatabasesDB', function (Cache $cache, Registry $register
        }

        $pools = $register->get('pools');
-        $pool = $pools->get($databaseDSN->getHost());
+        $databaseHost = $databaseDSN->getHost();
+        $pool = $pools->get($databaseHost);

        $adapter = new DatabasePool($pool);
        $database = new Database($adapter, $cache);
@@ -255,9 +256,29 @@ Server::setResource('getDatabasesDB', function (Cache $cache, Registry $register
            ->setAuthorization($authorization);
        $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);

-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+        $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));

-        if (\in_array($dsn->getHost(), $sharedTables, true)) {
+        // For separate pools (documentsdb/vectorsdb), check their own shared tables config.
+        // If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
+        if ($databaseHost !== $dsn->getHost()) {
+            $dbTypeSharedTables = match ($databaseType) {
+                DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
+                VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
+                default => [],
+            };
+
+            if (\in_array($databaseHost, $dbTypeSharedTables)) {
+                $database
+                    ->setSharedTables(true)
+                    ->setTenant((int) $projectDocument->getSequence())
+                    ->setNamespace($dsn->getParam('namespace'));
+            } else {
+                $database
+                    ->setSharedTables(false)
+                    ->setTenant(null)
+                    ->setNamespace('_' . $projectDocument->getSequence());
+            }
+        } elseif (\in_array($dsn->getHost(), $sharedTables, true)) {
            $database
                ->setSharedTables(true)
                ->setTenant((int) $projectDocument->getSequence())
@@ -3850,16 +3850,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "5.3.17",
+            "version": "5.3.19",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "cff2b6ed63d3291b74110d086e16ff089fe05993"
+                "reference": "72ee1614c37e37c7fdd9d4dc87f1f7cdfa1ca691"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/cff2b6ed63d3291b74110d086e16ff089fe05993",
-                "reference": "cff2b6ed63d3291b74110d086e16ff089fe05993",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/72ee1614c37e37c7fdd9d4dc87f1f7cdfa1ca691",
+                "reference": "72ee1614c37e37c7fdd9d4dc87f1f7cdfa1ca691",
                "shasum": ""
            },
            "require": {
@@ -3903,9 +3903,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/5.3.17"
+                "source": "https://github.com/utopia-php/database/tree/5.3.19"
            },
-            "time": "2026-03-20T01:18:52+00:00"
+            "time": "2026-03-31T15:52:08+00:00"
        },
        {
            "name": "utopia-php/detector",
@@ -61,16 +61,16 @@ class Create extends Action
                $databaseKeys = System::getEnv('_APP_DATABASE_DOCUMENTSDB_KEYS', '');
                $databaseOverride = System::getEnv('_APP_DATABASE_DOCUMENTSDB_OVERRIDE');
                $dbScheme = System::getEnv('_APP_DB_HOST_DOCUMENTSDB', 'mongodb');
-                $databaseSharedTables = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''));
-                $databaseSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1', ''));
+                $databaseSharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', '')));
+                $databaseSharedTablesV1 = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1', '')));
                break;
            case VECTORSDB:
                $databases = Config::getParam('pools-vectorsdb', []);
                $databaseKeys = System::getEnv('_APP_DATABASE_VECTORSDB_KEYS', '');
                $databaseOverride = System::getEnv('_APP_DATABASE_VECTORSDB_OVERRIDE');
                $dbScheme = System::getEnv('_APP_DB_HOST_VECTORSDB', 'postgresql');
-                $databaseSharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''));
-                $databaseSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES_V1', ''));
+                $databaseSharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', '')));
+                $databaseSharedTablesV1 = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES_V1', '')));
                break;
            default:
                // legacy/tablesdb
@@ -108,7 +108,7 @@ class Create extends Action
        if ($index !== false) {
            $selectedDsn = $databases[$index];
        } else {
-            if (!empty($dsn)) {
+            if (!empty($dsn) && !empty($databaseSharedTables)) {
                $beforeFilter = \array_values($databases);
                if ($isSharedTablesV1) {
                    $databases = array_filter($databases, fn ($value) => \in_array($value, $databaseSharedTablesV1));
@@ -118,7 +118,10 @@ class Create extends Action
                    $databases = array_filter($databases, fn ($value) => !\in_array($value, $databaseSharedTables));
                }
            }
-            $selectedDsn = !empty($databases) ? $databases[array_rand($databases)] : '';
+            if (empty($databases)) {
+                throw new Exception(Exception::GENERAL_SERVER_ERROR, "No {$databasetype} database pool available for the current shared-tables mode");
+            }
+            $selectedDsn = $databases[array_rand($databases)];
        }

        if (\in_array($selectedDsn, $databaseSharedTables)) {
@@ -3039,8 +3039,21 @@ class RealtimeCustomClientTest extends Scope

        $this->assertEquals(200, $update['headers']['status-code']);

-        $event = json_decode($client->receive(), true);
+        // Drain WebSocket messages until the .update event arrives.
+        // Earlier events (e.g. a late-arriving .create from the row seed above) are skipped.
+        $updateEvent = "tablesdb.{$databaseId}.tables.{$tableId}.rows.{$rowId}.update";
+        $event = null;
+        $deadline = \time() + 10;
+        while (\time() < $deadline) {
+            $raw = $client->receive();
+            $msg = json_decode($raw, true);
+            if (($msg['type'] ?? '') === 'event' && \in_array($updateEvent, $msg['data']['events'] ?? [])) {
+                $event = $msg;
+                break;
+            }
+        }

+        $this->assertNotNull($event, 'Timed out waiting for the row update event');
        $this->assertArrayHasKey('type', $event);
        $this->assertArrayHasKey('data', $event);
        $this->assertEquals('event', $event['type']);
Author	SHA1	Message	Date
Prem Palanisamy	995b1c76ca	fix: restore (int) cast on getDatabasesDB tenant to match cloud	2026-04-02 12:11:24 +02:00
Prem Palanisamy	a071c715bc	Merge remote-tracking branch 'origin/1.9.x' into bump-database-version2	2026-04-02 10:10:03 +02:00
Prem Palanisamy	52981e0164	fix: restore full CI matrix and revert test/endpoint changes to 1.9.x	2026-04-02 10:09:36 +02:00
Prem Palanisamy	cb9d3869f0	Merge remote-tracking branch 'origin/1.9.x' into bump-database-version2 # Conflicts: # src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php	2026-04-02 06:53:05 +02:00
Prem Palanisamy	d17ae517d3	fix: replace exists+create with try/catch for vectorsdb metadata init	2026-04-02 06:26:55 +02:00
Prem Palanisamy	25d9891f2b	fix: use email probe in JSON export test, format fixes, add requireAdapter skips to Databases VectorsDB/DocumentsDB tests	2026-04-02 04:39:56 +02:00
Prem Palanisamy	8c9f9c6f58	fix: inherit project shared tables for separate pools, skip cross-engine migration tests	2026-04-02 02:05:10 +02:00
Prem Palanisamy	c322cc3ffe	Merge remote-tracking branch 'origin/1.9.x' into bump-database-version # Conflicts: # src/Appwrite/Event/Message/Usage.php	2026-04-01 17:34:13 +02:00
Prem Palanisamy	d9eb69aa47	Merge remote-tracking branch 'origin/1.9.x' into bump-database-version	2026-04-01 10:41:39 +02:00
Prem Palanisamy	7f9ce1ca85	Merge remote-tracking branch 'origin/1.9.x' into bump-database-version	2026-04-01 07:37:57 +02:00
Prem Palanisamy	168166b9c1	bump utopia-php/database to 5.3.19 and fix shared-mode CI failures - Bump utopia-php/database from 5.3.17 to 5.3.19 - Remove invalid (int) cast on tenant sequence in shared tables mode - Fix DSN construction for documentsdb/vectorsdb: filter empty strings from explode(), skip pool filtering when shared tables env vars unset, fail fast when no pool found - Use dedicated mode for separate database pools in getDatabasesDB since shared tables can't work across engines (PostgreSQL integer _tenant vs MongoDB UUID tenant). Auto-init schema on first use. - Add documentsdb/vectorsdb shared tables env vars to CI workflow - Fix testChannelTablesDBRowUpdate race condition with deterministic event drain loop	2026-03-31 21:24:22 +02:00