mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge branch 'main' of https://github.com/appwrite/appwrite into bump-database-7.3.4
This commit is contained in:
commit
e169501c11
20 files changed
+509
-21
No files matched your search
@@ -41,6 +41,7 @@ _APP_CONSOLE_GITHUB_APP_ID=
|
||||
_APP_CONSOLE_GITHUB_SECRET=
|
||||
_APP_CONSOLE_GITLAB_APP_ID=
|
||||
_APP_CONSOLE_GITLAB_SECRET=
|
||||
_APP_CONSOLE_GITLAB_ENDPOINT=
|
||||
_APP_CONSOLE_BITBUCKET_APP_ID=
|
||||
_APP_CONSOLE_BITBUCKET_SECRET=
|
||||
_APP_CONSOLE_GOOGLE_APP_ID=
|
||||
@@ -181,6 +182,7 @@ _APP_VCS_GITEA_BROWSER_ENDPOINT=http://localhost:9515
|
||||
_APP_VCS_GITEA_CLIENT_ID=
|
||||
_APP_VCS_GITEA_CLIENT_SECRET=
|
||||
_APP_VCS_GITEA_WEBHOOK_SECRET=gitea-webhook-secret
|
||||
_APP_VCS_GITLAB_ENDPOINT=
|
||||
_APP_VCS_GITLAB_CLIENT_ID=
|
||||
_APP_VCS_GITLAB_CLIENT_SECRET=
|
||||
_APP_VCS_GITLAB_WEBHOOK_SECRET=
|
||||
|
||||
@@ -59,7 +59,13 @@ $console = [
|
||||
'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
|
||||
'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', ''),
|
||||
'gitlabEnabled' => true,
|
||||
'gitlabSecret' => System::getEnv('_APP_CONSOLE_GITLAB_SECRET', ''),
|
||||
// Auth\OAuth2\Gitlab reads its endpoint out of a JSON-encoded secret, so
|
||||
// _APP_CONSOLE_GITLAB_ENDPOINT travels with the credential. Stays empty when
|
||||
// unconfigured so account.php keeps reporting the provider as disabled.
|
||||
'gitlabSecret' => empty(System::getEnv('_APP_CONSOLE_GITLAB_SECRET', '')) ? '' : \json_encode([
|
||||
'clientSecret' => System::getEnv('_APP_CONSOLE_GITLAB_SECRET', ''),
|
||||
'endpoint' => System::getEnv('_APP_CONSOLE_GITLAB_ENDPOINT', 'https://gitlab.com'),
|
||||
]),
|
||||
'gitlabAppid' => System::getEnv('_APP_CONSOLE_GITLAB_APP_ID', ''),
|
||||
'bitbucketEnabled' => true,
|
||||
'bitbucketSecret' => System::getEnv('_APP_CONSOLE_BITBUCKET_SECRET', ''),
|
||||
|
||||
@@ -295,6 +295,15 @@ return [
|
||||
'question' => '',
|
||||
'filter' => ''
|
||||
],
|
||||
[
|
||||
'name' => '_APP_CONSOLE_GITLAB_ENDPOINT',
|
||||
'description' => 'URL of the GitLab instance used for signing in to the Appwrite console, for self-hosted GitLab. Defaults to https://gitlab.com when unset. This is separate from _APP_VCS_GITLAB_ENDPOINT, which powers repository integration rather than console sign-in.',
|
||||
'introduction' => '2.0.0',
|
||||
'default' => '',
|
||||
'required' => false,
|
||||
'question' => '',
|
||||
'filter' => ''
|
||||
],
|
||||
[
|
||||
'name' => '_APP_CONSOLE_BITBUCKET_APP_ID',
|
||||
'description' => 'Bitbucket OAuth consumer key used for signing in to the Appwrite console. You can find it in your Bitbucket workspace settings under OAuth consumers. This is separate from _APP_VCS_BITBUCKET_CLIENT_ID, which powers repository integration rather than console sign-in.',
|
||||
@@ -1572,6 +1581,15 @@ return [
|
||||
'question' => '',
|
||||
'filter' => ''
|
||||
],
|
||||
[
|
||||
'name' => '_APP_VCS_GITLAB_ENDPOINT',
|
||||
'description' => 'URL of your self-hosted GitLab instance, reachable from the Appwrite server and the browser. Defaults to https://gitlab.com when unset.',
|
||||
'introduction' => '2.0.0',
|
||||
'default' => '',
|
||||
'required' => false,
|
||||
'question' => '',
|
||||
'filter' => ''
|
||||
],
|
||||
[
|
||||
'name' => '_APP_VCS_GITLAB_CLIENT_ID',
|
||||
'description' => 'GitLab OAuth2 application client ID. You can generate one in your GitLab instance under Settings > Applications.',
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@ use Appwrite\Auth\OAuth2\Bitbucket as OAuth2Bitbucket;
|
||||
use Appwrite\Auth\OAuth2\Gitea as OAuth2Gitea;
|
||||
use Appwrite\Auth\OAuth2\Github as OAuth2Github;
|
||||
use Appwrite\Auth\OAuth2\Gitlab as OAuth2Gitlab;
|
||||
use Utopia\System\System;
|
||||
use Utopia\VCS\Adapter\Git\Bitbucket;
|
||||
use Utopia\VCS\Adapter\Git\Gitea;
|
||||
use Utopia\VCS\Adapter\Git\GitHub;
|
||||
@@ -55,8 +56,8 @@ return [
|
||||
'clientSecret' => $clientSecret,
|
||||
'endpoint' => $endpoint,
|
||||
]), ''),
|
||||
// Only official gitlab.com is supported -- fixed, not configurable.
|
||||
'endpoint' => 'https://gitlab.com',
|
||||
// Defaults to gitlab.com; self-hosted installs point _APP_VCS_GITLAB_ENDPOINT at their own instance.
|
||||
'endpoint' => System::getEnv('_APP_VCS_GITLAB_ENDPOINT', 'https://gitlab.com'),
|
||||
'variables' => [
|
||||
'clientId' => ['required' => true, 'envVariable' => '_APP_VCS_GITLAB_CLIENT_ID'],
|
||||
'clientSecret' => ['required' => true, 'envVariable' => '_APP_VCS_GITLAB_CLIENT_SECRET'],
|
||||
|
||||
@@ -582,7 +582,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
|
||||
$runtimeEntrypoint = match ($version) {
|
||||
'v2' => '',
|
||||
default => "cp /tmp/code.* /mnt/code/ && nohup helpers/start.sh \"$startCommand\"",
|
||||
default => "nohup helpers/start.sh \"$startCommand\"",
|
||||
};
|
||||
|
||||
$entrypoint = match ($type) {
|
||||
|
||||
+6
-2
@@ -103,6 +103,7 @@ services:
|
||||
- _APP_CONSOLE_GITHUB_SECRET
|
||||
- _APP_CONSOLE_GITLAB_APP_ID
|
||||
- _APP_CONSOLE_GITLAB_SECRET
|
||||
- _APP_CONSOLE_GITLAB_ENDPOINT
|
||||
- _APP_CONSOLE_BITBUCKET_APP_ID
|
||||
- _APP_CONSOLE_BITBUCKET_SECRET
|
||||
- _APP_CONSOLE_GOOGLE_APP_ID
|
||||
@@ -229,6 +230,7 @@ services:
|
||||
- _APP_VCS_GITEA_CLIENT_ID
|
||||
- _APP_VCS_GITEA_CLIENT_SECRET
|
||||
- _APP_VCS_GITEA_WEBHOOK_SECRET
|
||||
- _APP_VCS_GITLAB_ENDPOINT
|
||||
- _APP_VCS_GITLAB_CLIENT_ID
|
||||
- _APP_VCS_GITLAB_CLIENT_SECRET
|
||||
- _APP_VCS_GITLAB_WEBHOOK_SECRET
|
||||
@@ -482,6 +484,7 @@ services:
|
||||
- _APP_VCS_GITEA_CLIENT_ID
|
||||
- _APP_VCS_GITEA_CLIENT_SECRET
|
||||
- _APP_VCS_GITEA_WEBHOOK_SECRET
|
||||
- _APP_VCS_GITLAB_ENDPOINT
|
||||
- _APP_VCS_GITLAB_CLIENT_ID
|
||||
- _APP_VCS_GITLAB_CLIENT_SECRET
|
||||
- _APP_VCS_GITLAB_WEBHOOK_SECRET
|
||||
@@ -824,6 +827,7 @@ services:
|
||||
- _APP_VCS_GITEA_CLIENT_ID
|
||||
- _APP_VCS_GITEA_CLIENT_SECRET
|
||||
- _APP_VCS_GITEA_WEBHOOK_SECRET
|
||||
- _APP_VCS_GITLAB_ENDPOINT
|
||||
- _APP_VCS_GITLAB_CLIENT_ID
|
||||
- _APP_VCS_GITLAB_CLIENT_SECRET
|
||||
- _APP_VCS_GITLAB_WEBHOOK_SECRET
|
||||
@@ -1621,7 +1625,7 @@ services:
|
||||
max-file: "5"
|
||||
max-size: 10m
|
||||
stop_signal: SIGINT
|
||||
image: openruntimes/executor:0.25.4
|
||||
image: openruntimes/executor:0.29.0
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- appwrite
|
||||
@@ -1667,7 +1671,7 @@ services:
|
||||
# One image carrying every orchestrator control plane. Appwrite drives the
|
||||
# jobs plane today; the per-plane images exist for Kubernetes, where each
|
||||
# scales, fails and gets RBAC on its own.
|
||||
image: ghcr.io/open-runtimes/orchestrator/orchestrator:1.8.3
|
||||
image: ghcr.io/open-runtimes/orchestrator/orchestrator:1.9.2
|
||||
restart: unless-stopped
|
||||
user: root
|
||||
networks:
|
||||
|
||||
@@ -11,8 +11,9 @@ use Appwrite\Auth\OAuth2;
|
||||
* Shared with the "Sign in with GitLab" account-login OAuth2 provider, which
|
||||
* stores its secret as JSON ({"clientSecret": "...", "endpoint": "..."}) to
|
||||
* support self-hosted GitLab per-project. The VCS flow (see app/config/vcs.php)
|
||||
* only supports official gitlab.com, but still encodes to that same JSON
|
||||
* shape so getAppSecret()/getEndpoint() stay correct for both consumers.
|
||||
* and the console project (see app/config/console.php) encode to that same JSON
|
||||
* shape, taking their endpoint from _APP_VCS_GITLAB_ENDPOINT and
|
||||
* _APP_CONSOLE_GITLAB_ENDPOINT respectively.
|
||||
*/
|
||||
class Gitlab extends OAuth2
|
||||
{
|
||||
@@ -230,7 +231,8 @@ class Gitlab extends OAuth2
|
||||
}
|
||||
|
||||
/**
|
||||
* Decode the JSON stored in appSecret
|
||||
* Decode the JSON stored in appSecret.
|
||||
* Falls back to treating the raw string as the client secret for backwards compatibility.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
@@ -239,8 +241,13 @@ class Gitlab extends OAuth2
|
||||
try {
|
||||
$secret = \json_decode($this->appSecret, true, 512, JSON_THROW_ON_ERROR);
|
||||
} catch (\Throwable $th) {
|
||||
throw new \Exception('Invalid secret');
|
||||
return ['clientSecret' => $this->appSecret];
|
||||
}
|
||||
|
||||
if (!\is_array($secret)) {
|
||||
return ['clientSecret' => $this->appSecret];
|
||||
}
|
||||
|
||||
return $secret;
|
||||
}
|
||||
|
||||
@@ -255,6 +262,6 @@ class Gitlab extends OAuth2
|
||||
$defaultEndpoint = 'https://gitlab.com';
|
||||
$secret = $this->getAppSecret();
|
||||
$endpoint = $secret['endpoint'] ?? $defaultEndpoint;
|
||||
return empty($endpoint) ? $defaultEndpoint : $endpoint;
|
||||
return empty($endpoint) ? $defaultEndpoint : \rtrim($endpoint, '/');
|
||||
}
|
||||
}
|
||||
+4
-1
@@ -94,7 +94,10 @@ class Create extends Action
|
||||
throw new Exception($this->getInvalidValueException(), $validator->getDescription());
|
||||
}
|
||||
|
||||
$size = $max > 2147483647 ? 8 : 4;
|
||||
// The 4 byte column only holds a range that fits INT32. min counts: a
|
||||
// column bounded below -2147483648 has to be able to store that value,
|
||||
// and with min left out the bound is PHP_INT_MIN.
|
||||
$size = $min >= -2147483648 && $max <= 2147483647 ? 4 : 8;
|
||||
|
||||
$attribute = $this->createAttribute($databaseId, $collectionId, new Document([
|
||||
'key' => $key,
|
||||
|
||||
@@ -297,16 +297,24 @@ class Create extends Action
|
||||
$formatOptions = ['elements' => $attribute['elements']];
|
||||
}
|
||||
|
||||
if (isset($attribute['min']) || isset($attribute['max'])) {
|
||||
// The dedicated endpoints store a range on every numeric attribute, falling
|
||||
// back to the full width of the type, so omitting min/max here has to produce
|
||||
// the same document rather than one with no range at all.
|
||||
if (\in_array($type, [Database::VAR_INTEGER, Database::VAR_BIGINT, Database::VAR_FLOAT])) {
|
||||
$isFloat = $type === Database::VAR_FLOAT;
|
||||
|
||||
$format = match($type) {
|
||||
Database::VAR_INTEGER => APP_DATABASE_ATTRIBUTE_INT_RANGE,
|
||||
Database::VAR_BIGINT => APP_DATABASE_ATTRIBUTE_BIGINT_RANGE,
|
||||
default => APP_DATABASE_ATTRIBUTE_FLOAT_RANGE,
|
||||
};
|
||||
|
||||
$min = $attribute['min'] ?? ($isFloat ? -\PHP_FLOAT_MAX : \PHP_INT_MIN);
|
||||
$max = $attribute['max'] ?? ($isFloat ? \PHP_FLOAT_MAX : \PHP_INT_MAX);
|
||||
|
||||
$formatOptions = [
|
||||
'min' => $attribute['min'] ?? ($type === Database::VAR_INTEGER || $type === Database::VAR_BIGINT ? \PHP_INT_MIN : -\PHP_FLOAT_MAX),
|
||||
'max' => $attribute['max'] ?? ($type === Database::VAR_INTEGER || $type === Database::VAR_BIGINT ? \PHP_INT_MAX : \PHP_FLOAT_MAX),
|
||||
'min' => $isFloat ? \floatval($min) : $min,
|
||||
'max' => $isFloat ? \floatval($max) : $max,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -95,8 +95,8 @@ class XList extends Action
|
||||
|
||||
\array_push(
|
||||
$queries,
|
||||
Query::equal('databaseId', [$databaseId]),
|
||||
Query::equal('collectionId', [$collectionId]),
|
||||
Query::equal('databaseInternalId', [$database->getSequence()]),
|
||||
Query::equal('collectionInternalId', [$collection->getSequence()]),
|
||||
);
|
||||
|
||||
$cursor = Query::getCursorQueries($queries, false);
|
||||
|
||||
@@ -429,7 +429,7 @@ class Create extends Base
|
||||
$command = Deployments::startCommand($deployment, $runtime['startCommand']);
|
||||
|
||||
$source = $deployment->getAttribute('buildPath', '');
|
||||
$command = $version === 'v2' ? '' : "cp /tmp/code.* /mnt/code/ && nohup helpers/start.sh \"$command\"";
|
||||
$command = $version === 'v2' ? '' : "nohup helpers/start.sh \"$command\"";
|
||||
try {
|
||||
$executionResponse = $executor->createExecution(
|
||||
projectId: $project->getId(),
|
||||
|
||||
@@ -31,7 +31,7 @@ class Get extends Base
|
||||
System::getEnv('_APP_VCS_GITLAB_CLIENT_ID', ''),
|
||||
\json_encode([
|
||||
'clientSecret' => System::getEnv('_APP_VCS_GITLAB_CLIENT_SECRET', ''),
|
||||
'endpoint' => 'https://gitlab.com',
|
||||
'endpoint' => System::getEnv('_APP_VCS_GITLAB_ENDPOINT', 'https://gitlab.com'),
|
||||
]),
|
||||
$callback,
|
||||
$state,
|
||||
|
||||
@@ -30,7 +30,7 @@ class Get extends Base
|
||||
System::getEnv('_APP_VCS_GITLAB_CLIENT_ID', ''),
|
||||
\json_encode([
|
||||
'clientSecret' => System::getEnv('_APP_VCS_GITLAB_CLIENT_SECRET', ''),
|
||||
'endpoint' => 'https://gitlab.com',
|
||||
'endpoint' => System::getEnv('_APP_VCS_GITLAB_ENDPOINT', 'https://gitlab.com'),
|
||||
]),
|
||||
$callback
|
||||
);
|
||||
|
||||
@@ -685,7 +685,7 @@ class Functions extends Action
|
||||
$command = Deployments::startCommand($deployment, $runtime['startCommand']);
|
||||
|
||||
$source = $deployment->getAttribute('buildPath', '');
|
||||
$command = $version === 'v2' ? '' : "cp /tmp/code.* /mnt/code/ && nohup helpers/start.sh \"$command\"";
|
||||
$command = $version === 'v2' ? '' : "nohup helpers/start.sh \"$command\"";
|
||||
try {
|
||||
$executionResponse = $executor->createExecution(
|
||||
projectId: $project->getId(),
|
||||
|
||||
@@ -32,6 +32,13 @@ final class Build
|
||||
$buildDuration = (int) $deployment->getAttribute('buildDuration', 0) * 1000;
|
||||
$mbSeconds = (int) ($memory * $deployment->getAttribute('buildDuration', 0) * $cpus);
|
||||
|
||||
// Without a start stamp buildDuration falls back to wall clock since the
|
||||
// deployment was created, which would bill queue wait as build compute.
|
||||
if (empty($deployment->getAttribute('buildStartedAt'))) {
|
||||
$buildDuration = 0;
|
||||
$mbSeconds = 0;
|
||||
}
|
||||
|
||||
// Per-resource breakdown now travels as resource dimensions on the
|
||||
// Context (resolved to resourceType + resourceId in the usage pipeline)
|
||||
// instead of per-{resourceInternalId} metric-name templates.
|
||||
|
||||
@@ -22,6 +22,10 @@ class Attribute
|
||||
Database::VAR_TEXT => 65535,
|
||||
Database::VAR_MEDIUMTEXT => 16777215,
|
||||
Database::VAR_LONGTEXT => 2147483647,
|
||||
// Bytes, the widths createBigIntColumn and createFloatColumn hardcode.
|
||||
// Every adapter maps these two types without consulting the size.
|
||||
Database::VAR_BIGINT => 8,
|
||||
Database::VAR_FLOAT => 0,
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -91,6 +95,18 @@ class Attribute
|
||||
$size = self::FORMAT_SIZES[$format] ?? $size;
|
||||
}
|
||||
|
||||
if ($type === Database::VAR_INTEGER) {
|
||||
// Same width createIntegerColumn picks. That endpoint takes no size at
|
||||
// all, so a size sent inline is ignored rather than left to promise a
|
||||
// range the column cannot hold: the 4 byte column only holds a range
|
||||
// that fits INT32, and a bound left out means the int64 edge, which
|
||||
// does not.
|
||||
$min = $attribute['min'] ?? \PHP_INT_MIN;
|
||||
$max = $attribute['max'] ?? \PHP_INT_MAX;
|
||||
$fitsInt32 = \is_int($min) && \is_int($max) && $min >= -2147483648 && $max <= 2147483647;
|
||||
$size = $fitsInt32 ? 4 : 8;
|
||||
}
|
||||
|
||||
return [
|
||||
'type' => $type,
|
||||
'format' => $format,
|
||||
|
||||
@@ -8,6 +8,8 @@ use Utopia\Database\Validator\Datetime as DatetimeValidator;
|
||||
use Utopia\Database\Validator\Key;
|
||||
use Utopia\Emails\Validator\Email;
|
||||
use Utopia\Validator;
|
||||
use Utopia\Validator\FloatValidator;
|
||||
use Utopia\Validator\Integer;
|
||||
use Utopia\Validator\IP;
|
||||
use Utopia\Validator\Range;
|
||||
use Utopia\Validator\Text;
|
||||
@@ -204,6 +206,21 @@ class Attributes extends Validator
|
||||
return false;
|
||||
}
|
||||
|
||||
// The dedicated endpoints bound these with Integer(false, 64) / FloatValidator.
|
||||
// Without the same check a JSON number past PHP_INT_MAX decodes to a float and is
|
||||
// stored verbatim, so an int64 bound round-tripped through a client that cannot
|
||||
// hold it lands in formatOptions as 9.223372036854776e+18.
|
||||
$boundValidator = $type === Database::VAR_FLOAT
|
||||
? new FloatValidator()
|
||||
: new Integer(false, 64);
|
||||
|
||||
foreach (['min', 'max'] as $bound) {
|
||||
if (isset($attribute[$bound]) && !$boundValidator->isValid($attribute[$bound])) {
|
||||
$this->message = "Attribute '" . $attribute['key'] . "': " . $bound . ' is invalid. ' . $boundValidator->getDescription();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// If both are set, validate ordering
|
||||
if (isset($attribute['min']) && isset($attribute['max']) && $attribute['min'] > $attribute['max']) {
|
||||
$this->message = "Attribute '" . $attribute['key'] . "': minimum value must be less than or equal to maximum value";
|
||||
|
||||
@@ -1223,6 +1223,177 @@ trait DatabasesBase
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An inline numeric definition on create collection has to produce the same
|
||||
* document the dedicated endpoints write: the full width of the type when no
|
||||
* bounds are given, on a column wide enough to hold it.
|
||||
*/
|
||||
public function testCreateCollectionInlineNumericRange(): void
|
||||
{
|
||||
if (!$this->getSupportForAttributes()) {
|
||||
$this->markTestSkipped('Attributes are not supported by this database adapter');
|
||||
}
|
||||
|
||||
$data = $this->setupDatabase();
|
||||
$databaseId = $data['databaseId'];
|
||||
$headers = [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
];
|
||||
$schemaResource = $this->getSchemaResource();
|
||||
|
||||
$container = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), $headers, [
|
||||
$this->getContainerIdParam() => ID::unique(),
|
||||
'name' => 'Counters',
|
||||
'permissions' => [
|
||||
Permission::create(Role::any()),
|
||||
Permission::read(Role::any()),
|
||||
],
|
||||
$schemaResource => [
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER],
|
||||
['key' => 'total', 'type' => Database::VAR_BIGINT],
|
||||
['key' => 'ratio', 'type' => Database::VAR_FLOAT],
|
||||
['key' => 'bounded', 'type' => Database::VAR_INTEGER, 'min' => 0, 'max' => 100],
|
||||
// The numeric endpoints take no size, so this one cannot narrow the
|
||||
// column below the int64 range the definition still declares
|
||||
['key' => 'sized', 'type' => Database::VAR_INTEGER, 'size' => 4],
|
||||
],
|
||||
]);
|
||||
|
||||
$this->assertEquals(201, $container['headers']['status-code']);
|
||||
$containerId = $container['body']['$id'];
|
||||
|
||||
$schema = $this->client->call(Client::METHOD_GET, $this->getSchemaUrl($databaseId, $containerId), $headers);
|
||||
|
||||
$this->assertEquals(200, $schema['headers']['status-code']);
|
||||
|
||||
$byKey = [];
|
||||
foreach ($schema['body'][$schemaResource] as $attribute) {
|
||||
$byKey[$attribute['key']] = $attribute;
|
||||
}
|
||||
|
||||
$this->assertSame(\PHP_INT_MIN, $byKey['sized']['min']);
|
||||
$this->assertSame(\PHP_INT_MAX, $byKey['sized']['max']);
|
||||
$this->assertSame(\PHP_INT_MIN, $byKey['counter']['min']);
|
||||
$this->assertSame(\PHP_INT_MAX, $byKey['counter']['max']);
|
||||
$this->assertSame(\PHP_INT_MIN, $byKey['total']['min']);
|
||||
$this->assertSame(\PHP_INT_MAX, $byKey['total']['max']);
|
||||
$this->assertSame(-\PHP_FLOAT_MAX, $byKey['ratio']['min']);
|
||||
$this->assertSame(\PHP_FLOAT_MAX, $byKey['ratio']['max']);
|
||||
|
||||
// A bound that was asked for is kept as asked for
|
||||
$this->assertSame(0, $byKey['bounded']['min']);
|
||||
$this->assertSame(100, $byKey['bounded']['max']);
|
||||
|
||||
// The bounds are only honest if the column is that wide. 5e9 overflows the
|
||||
// 4 byte column an implied INT32 range would have produced.
|
||||
$record = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $containerId), $headers, [
|
||||
$this->getRecordIdParam() => ID::unique(),
|
||||
'data' => [
|
||||
'counter' => 5000000000,
|
||||
'total' => \PHP_INT_MAX,
|
||||
'sized' => 5000000000,
|
||||
],
|
||||
]);
|
||||
|
||||
$this->assertEquals(201, $record['headers']['status-code']);
|
||||
$this->assertSame(5000000000, $record['body']['counter']);
|
||||
$this->assertSame(\PHP_INT_MAX, $record['body']['total']);
|
||||
$this->assertSame(5000000000, $record['body']['sized']);
|
||||
|
||||
// A value outside a declared bound is still refused
|
||||
$rejected = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $containerId), $headers, [
|
||||
$this->getRecordIdParam() => ID::unique(),
|
||||
'data' => ['bounded' => 101],
|
||||
]);
|
||||
|
||||
$this->assertEquals(400, $rejected['headers']['status-code']);
|
||||
|
||||
// Same type, same collection, through the dedicated endpoint: the two paths
|
||||
// have to agree on what "no bounds" means
|
||||
$dedicated = $this->client->call(Client::METHOD_POST, $this->getSchemaUrl($databaseId, $containerId, 'integer'), $headers, [
|
||||
'key' => 'dedicated',
|
||||
'required' => false,
|
||||
]);
|
||||
|
||||
$this->assertEquals(202, $dedicated['headers']['status-code']);
|
||||
$this->assertSame($byKey['counter']['min'], $dedicated['body']['min']);
|
||||
$this->assertSame($byKey['counter']['max'], $dedicated['body']['max']);
|
||||
}
|
||||
|
||||
/**
|
||||
* A JSON number past PHP_INT_MAX decodes to a float. The dedicated endpoints
|
||||
* refuse it; an inline definition used to store it, leaving formatOptions
|
||||
* holding 9.223372036854776e+18 on a column typed as an integer.
|
||||
*/
|
||||
public function testCreateCollectionInlineBoundBeyondInt64(): void
|
||||
{
|
||||
if (!$this->getSupportForAttributes()) {
|
||||
$this->markTestSkipped('Attributes are not supported by this database adapter');
|
||||
}
|
||||
|
||||
$data = $this->setupDatabase();
|
||||
$databaseId = $data['databaseId'];
|
||||
$headers = [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
];
|
||||
$schemaResource = $this->getSchemaResource();
|
||||
$containerId = ID::unique();
|
||||
|
||||
$container = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), $headers, [
|
||||
$this->getContainerIdParam() => $containerId,
|
||||
'name' => 'Overflowing Bounds',
|
||||
$schemaResource => [
|
||||
// What a client that cannot hold an int64 sends back after reading
|
||||
// the default bounds off an existing column
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'min' => -9223372036854776000, 'max' => 9223372036854776000],
|
||||
],
|
||||
]);
|
||||
|
||||
$this->assertEquals(400, $container['headers']['status-code']);
|
||||
$this->assertStringContainsString("Attribute 'counter'", (string) $container['body']['message']);
|
||||
|
||||
// The rejected definition must not leave a collection behind
|
||||
$missing = $this->client->call(Client::METHOD_GET, $this->getContainerUrl($databaseId, $containerId), $headers);
|
||||
$this->assertEquals(404, $missing['headers']['status-code']);
|
||||
|
||||
// A bound sent as a string is not an integer either
|
||||
$stringBound = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), $headers, [
|
||||
$this->getContainerIdParam() => ID::unique(),
|
||||
'name' => 'String Bounds',
|
||||
$schemaResource => [
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'max' => '9223372036854776000'],
|
||||
],
|
||||
]);
|
||||
|
||||
$this->assertEquals(400, $stringBound['headers']['status-code']);
|
||||
$this->assertStringContainsString("Attribute 'counter'", (string) $stringBound['body']['message']);
|
||||
|
||||
// The dedicated endpoint is the reference: it refuses the same bound
|
||||
$valid = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), $headers, [
|
||||
$this->getContainerIdParam() => ID::unique(),
|
||||
'name' => 'Dedicated Bounds',
|
||||
]);
|
||||
|
||||
$this->assertEquals(201, $valid['headers']['status-code']);
|
||||
|
||||
$attribute = $this->client->call(Client::METHOD_POST, $this->getSchemaUrl($databaseId, $valid['body']['$id'], 'integer'), $headers, [
|
||||
'key' => 'counter',
|
||||
'required' => false,
|
||||
'max' => 9223372036854776000,
|
||||
]);
|
||||
|
||||
$this->assertEquals(400, $attribute['headers']['status-code']);
|
||||
|
||||
$schema = $this->client->call(Client::METHOD_GET, $this->getSchemaUrl($databaseId, $valid['body']['$id']), $headers);
|
||||
|
||||
$this->assertEquals(200, $schema['headers']['status-code']);
|
||||
$this->assertEquals(0, $schema['body']['total']);
|
||||
}
|
||||
|
||||
public function testListAttributes(): void
|
||||
{
|
||||
if (!$this->getSupportForAttributes()) {
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Tests\Unit\Platform\Modules\Databases\Http;
|
||||
|
||||
use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Indexes\XList;
|
||||
use Appwrite\Utopia\Response;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Utopia\Database\Database;
|
||||
use Utopia\Database\Document;
|
||||
use Utopia\Database\Query;
|
||||
use Utopia\Database\Validator\Authorization;
|
||||
|
||||
require_once __DIR__ . '/../../../../../../app/init.php';
|
||||
require_once __DIR__ . '/../../../../../../src/Appwrite/Platform/Modules/Databases/Constants.php';
|
||||
|
||||
final class IndexesListTest extends TestCase
|
||||
{
|
||||
private const string DATABASE_ID = 'rv109a-vdb-ded';
|
||||
private const string COLLECTION_ID = 'vectors';
|
||||
|
||||
/**
|
||||
* Index metadata rows are keyed by the database and collection sequences, and a
|
||||
* recreated database keeps its id while taking a new sequence. Listing by the id
|
||||
* strings therefore surfaces every earlier incarnation's rows next to the live
|
||||
* ones; a stale `processing` row from a torn-down incarnation then reads as an
|
||||
* index that never became available (r30 PR-95 on rv109a-vdb-ded).
|
||||
*/
|
||||
public function testListsOnlyTheLiveIncarnationOfARecreatedDatabase(): void
|
||||
{
|
||||
$database = new Document([
|
||||
'$id' => self::DATABASE_ID,
|
||||
'$sequence' => '148569',
|
||||
'type' => DATABASE_TYPE_VECTORSDB,
|
||||
]);
|
||||
$collection = new Document([
|
||||
'$id' => self::COLLECTION_ID,
|
||||
'$sequence' => '1',
|
||||
'attributes' => [],
|
||||
'indexes' => [],
|
||||
]);
|
||||
$records = [
|
||||
$this->index('148001', 'processing'),
|
||||
$this->index('148569', 'available'),
|
||||
];
|
||||
|
||||
$matching = static fn (array $queries): array => \array_values(\array_filter(
|
||||
$records,
|
||||
static fn (Document $record): bool => self::satisfies($record, $queries),
|
||||
));
|
||||
|
||||
$dbForProject = $this->createStub(Database::class);
|
||||
$dbForProject->method('getDocument')->willReturnCallback(
|
||||
static fn (string $collectionId, string $id): Document => match ($collectionId) {
|
||||
'databases' => $database,
|
||||
'database_148569' => $collection,
|
||||
default => new Document(),
|
||||
}
|
||||
);
|
||||
$dbForProject->method('find')->willReturnCallback(
|
||||
static fn (string $collectionId, array $queries): array => $matching($queries)
|
||||
);
|
||||
$dbForProject->method('count')->willReturnCallback(
|
||||
static fn (string $collectionId, array $queries): int => \count($matching($queries))
|
||||
);
|
||||
|
||||
$authorization = $this->createStub(Authorization::class);
|
||||
$authorization->method('skip')->willReturnCallback(static fn (callable $callback): mixed => $callback());
|
||||
|
||||
$listed = null;
|
||||
$response = $this->createMock(Response::class);
|
||||
$response->expects($this->once())
|
||||
->method('dynamic')
|
||||
->willReturnCallback(static function (Document $document) use (&$listed): void {
|
||||
$listed = $document;
|
||||
});
|
||||
|
||||
(new XList())->action(self::DATABASE_ID, self::COLLECTION_ID, [], true, $response, $dbForProject, $authorization);
|
||||
|
||||
$this->assertInstanceOf(Document::class, $listed);
|
||||
$this->assertSame(1, $listed->getAttribute('total'), 'total must count only the live incarnation');
|
||||
$this->assertSame(
|
||||
['148569_1_idx_embeddings'],
|
||||
\array_map(static fn (Document $index): string => $index->getId(), $listed->getAttribute('indexes')),
|
||||
'a torn-down incarnation of the same database id must not be listed'
|
||||
);
|
||||
}
|
||||
|
||||
private function index(string $databaseSequence, string $status): Document
|
||||
{
|
||||
return new Document([
|
||||
'$id' => $databaseSequence . '_1_idx_embeddings',
|
||||
'key' => 'idx_embeddings',
|
||||
'status' => $status,
|
||||
'databaseInternalId' => $databaseSequence,
|
||||
'databaseId' => self::DATABASE_ID,
|
||||
'collectionInternalId' => '1',
|
||||
'collectionId' => self::COLLECTION_ID,
|
||||
'type' => 'hnsw_cosine',
|
||||
'attributes' => ['embeddings'],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<Query> $queries
|
||||
*/
|
||||
private static function satisfies(Document $record, array $queries): bool
|
||||
{
|
||||
foreach ($queries as $query) {
|
||||
if ($query->getMethod() !== Query::TYPE_EQUAL) {
|
||||
continue;
|
||||
}
|
||||
if (!\in_array($record->getAttribute($query->getAttribute()), $query->getValues(), true)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -120,6 +120,113 @@ final class AttributesTest extends TestCase
|
||||
['type' => Database::VAR_STRING, 'format' => APP_DATABASE_ATTRIBUTE_ENUM, 'size' => Database::LENGTH_KEY],
|
||||
Attribute::resolve(['key' => 'enum', 'type' => APP_DATABASE_ATTRIBUTE_ENUM])
|
||||
);
|
||||
|
||||
// createIntegerColumn sizes the column off max, defaulting to the int64
|
||||
// range, and createBigIntColumn is always 8 bytes
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'max' => 3000000000])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 4],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'min' => 0, 'max' => 100])
|
||||
);
|
||||
|
||||
// Both edges of the declared range have to be storable. A max on its own
|
||||
// leaves min at PHP_INT_MIN, and a min below INT32 needs the wide column
|
||||
// however small max is.
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'max' => 100])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'min' => -5000000000, 'max' => 100])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 4],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'min' => -2147483648, 'max' => 2147483647])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_BIGINT, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'total', 'type' => Database::VAR_BIGINT])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_FLOAT, 'format' => '', 'size' => 0],
|
||||
Attribute::resolve(['key' => 'ratio', 'type' => Database::VAR_FLOAT])
|
||||
);
|
||||
|
||||
// None of the numeric endpoints takes a size. A size sent inline must not
|
||||
// narrow the column below the range the same definition declares.
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'size' => 4])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_INTEGER, 'format' => '', 'size' => 4],
|
||||
Attribute::resolve(['key' => 'counter', 'type' => Database::VAR_INTEGER, 'size' => 8, 'min' => 0, 'max' => 100])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_BIGINT, 'format' => '', 'size' => 8],
|
||||
Attribute::resolve(['key' => 'total', 'type' => Database::VAR_BIGINT, 'size' => 4])
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
['type' => Database::VAR_FLOAT, 'format' => '', 'size' => 0],
|
||||
Attribute::resolve(['key' => 'ratio', 'type' => Database::VAR_FLOAT, 'size' => 4])
|
||||
);
|
||||
}
|
||||
|
||||
public function testNumericBoundsMustFitTheType(): void
|
||||
{
|
||||
$this->assertTrue($this->object->isValid([
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'min' => 0, 'max' => 100],
|
||||
['key' => 'total', 'type' => Database::VAR_BIGINT, 'min' => \PHP_INT_MIN, 'max' => \PHP_INT_MAX],
|
||||
['key' => 'ratio', 'type' => Database::VAR_FLOAT, 'min' => -1.5, 'max' => 1.5],
|
||||
]), $this->object->getDescription());
|
||||
|
||||
// 9223372036854776000 is what a client that rounds an int64 to a double
|
||||
// sends back after reading the default bounds off an existing column. PHP
|
||||
// decodes it as a float, and storing it leaves an integer column bounded
|
||||
// by 9.223372036854776e+18.
|
||||
$this->assertFalse($this->object->isValid([
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'min' => -9223372036854776000, 'max' => 9223372036854776000],
|
||||
]));
|
||||
$this->assertStringContainsString("Attribute 'counter': min is invalid", $this->object->getDescription());
|
||||
|
||||
$this->assertFalse($this->object->isValid([
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'max' => 9223372036854776000],
|
||||
]));
|
||||
$this->assertStringContainsString("Attribute 'counter': max is invalid", $this->object->getDescription());
|
||||
|
||||
$this->assertFalse($this->object->isValid([
|
||||
['key' => 'total', 'type' => Database::VAR_BIGINT, 'max' => 9223372036854776000],
|
||||
]));
|
||||
|
||||
$this->assertFalse($this->object->isValid([
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'max' => 1.5],
|
||||
]));
|
||||
|
||||
$this->assertFalse($this->object->isValid([
|
||||
['key' => 'counter', 'type' => Database::VAR_INTEGER, 'max' => '100'],
|
||||
]));
|
||||
|
||||
// A float column carries the same bound as a double, which is what it is
|
||||
$this->assertTrue($this->object->isValid([
|
||||
['key' => 'ratio', 'type' => Database::VAR_FLOAT, 'max' => 9223372036854776000],
|
||||
]), $this->object->getDescription());
|
||||
}
|
||||
|
||||
public function testResolveKeepsExplicitSize(): void
|
||||
|
||||
Reference in new issue
Block a user