Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/1.8.x' into documents-db-api

Browse Source
This commit is contained in:
ArnabChatterjee20k
2025-10-02 18:56:48 +05:30
parent 422fd8b157 eff3e4bda2
commit 6bf9693146
5 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+12 -12
View File
@@ -3792,16 +3792,16 @@
},
{
"name": "utopia-php/database",
"version": "dev-attributes-fix-schemaless",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/database.git",
"reference": "4103174f0d99f1d1761312e320e92bda22647ba2"
"reference": "56efe4daaf23abb753553acffccdcc04cd6178c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/database/zipball/4103174f0d99f1d1761312e320e92bda22647ba2",
"reference": "4103174f0d99f1d1761312e320e92bda22647ba2",
"url": "https://api.github.com/repos/utopia-php/database/zipball/56efe4daaf23abb753553acffccdcc04cd6178c9",
"reference": "56efe4daaf23abb753553acffccdcc04cd6178c9",
"shasum": ""
},
"require": {
@@ -3844,9 +3844,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/database/issues",
"source": "https://github.com/utopia-php/database/tree/attributes-fix-schemaless"
"source": "https://github.com/utopia-php/database/tree/1.5.1"
},
"time": "2025-09-30T13:10:04+00:00"
"time": "2025-10-01T04:44:14+00:00"
},
{
"name": "utopia-php/detector",
@@ -5224,16 +5224,16 @@
"packages-dev": [
{
"name": "appwrite/sdk-generator",
"version": "1.4.0",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator.git",
"reference": "3583fa6fddb1d1a902b37ff2048527a5827fc008"
"reference": "07a7d6276bd684b49469ad7b9e8c3c962121c6fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/3583fa6fddb1d1a902b37ff2048527a5827fc008",
"reference": "3583fa6fddb1d1a902b37ff2048527a5827fc008",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/07a7d6276bd684b49469ad7b9e8c3c962121c6fd",
"reference": "07a7d6276bd684b49469ad7b9e8c3c962121c6fd",
"shasum": ""
},
"require": {
@@ -5269,9 +5269,9 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/1.4.0"
"source": "https://github.com/appwrite/sdk-generator/tree/1.4.2"
},
"time": "2025-09-23T02:27:10+00:00"
"time": "2025-10-01T03:23:04+00:00"
},
{
"name": "doctrine/annotations",
src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
+1 -4
View File
@@ -108,10 +108,7 @@ class XList extends Action
$audit = new Audit($dbForProject);
$type = $this->getCollectionsEventsContext();
$context = $this->getContext();
$resource = match ($context) {
ROWS => "database/$databaseId/grid/$type/$collectionId/$context/{$document->getId()}",
default => "database/$databaseId/$type/$collectionId/$context/{$document->getId()}",
};
$resource = "database/$databaseId/$type/$collectionId/$context/{$document->getId()}";
$logs = $audit->getLogsByResource($resource, $queries);
src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
+1 -5
View File
@@ -104,11 +104,7 @@ class XList extends Action
$audit = new Audit($dbForProject);
$context = $this->getContext();
$resource = match ($context) {
TABLES => "database/$databaseId/grid/$context/$collectionId",
default => "database/$databaseId/$context/$collectionId",
};
$resource = "database/$databaseId/$context/$collectionId";
$logs = $audit->getLogsByResource($resource, $queries);
$output = [];
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+4 -3
View File
@@ -686,6 +686,7 @@ class Builds extends Action
if ($version === 'v2') {
$command = 'tar -zxf /tmp/code.tar.gz -C /usr/code && cd /usr/local/src/ && ./build.sh';
} else {
$outputDirectory = $deployment->getAttribute('buildOutput') ?? $resource->getAttribute('outputDirectory');
if ($resource->getCollection() === 'sites') {
$listFilesCommand = '';
@@ -693,8 +694,8 @@ class Builds extends Action
$listFilesCommand .= 'echo "{APPWRITE_DETECTION_SEPARATOR_START}" && cd /usr/local/build';
// Enter output directory, if set
if (!empty($resource->getAttribute('outputDirectory', ''))) {
$listFilesCommand .= ' && cd ' . \escapeshellarg($resource->getAttribute('outputDirectory', ''));
if (!empty($outputDirectory)) {
$listFilesCommand .= ' && cd ' . \escapeshellarg($outputDirectory);
}
// Print files, and end separation
@@ -725,7 +726,7 @@ class Builds extends Action
destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
variables: $vars,
command: $command,
outputDirectory: $resource->getAttribute('outputDirectory', '')
outputDirectory: $outputDirectory ?? ''
);
Console::log('createRuntime finished');
tests/resources/functions/log-error-truncation/index.js
+15 -2
View File
@@ -2,8 +2,21 @@ module.exports = async(context) => {
// Create a string that is 1000001 characters long (exceeds the 1000000 limit)
const longString = 'z' + 'a'.repeat(1000000);
context.log(longString);
context.error(longString);
// Split the string into chunks of 8000 characters (max limit for each log and error)
const chunkSize = 8000;
const chunks = [];
for (let i = 0; i < longString.length; i += chunkSize) {
chunks.push(longString.slice(i, i + chunkSize));
}
chunks.forEach((chunk, index) => {
context.log(chunk);
});
chunks.forEach((chunk, index) => {
context.error(chunk);
});
return context.res.json({
motto: 'Build like a team of hundreds_',