From f9ee52b0ecbfd2916af0b87520dd30dda91b41b8 Mon Sep 17 00:00:00 2001 From: ArnabChatterjee20k Date: Tue, 4 Nov 2025 17:13:36 +0530 Subject: [PATCH 1/5] updated database --- composer.json | 2 +- composer.lock | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 3b974e0..8532d9e 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "ext-curl": "*", "ext-openssl": "*", "appwrite/appwrite": "15.*", - "utopia-php/database": "3.*", + "utopia-php/database": "dev-dat-851", "utopia-php/storage": "0.18.*", "utopia-php/dsn": "0.2.*", "utopia-php/console": "0.0.*" diff --git a/composer.lock b/composer.lock index f2963fa..f404b6e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8b2b0894b94d976f09044c200956961a", + "content-hash": "5be49868a8b5e46b7c8870d462b79670", "packages": [ { "name": "appwrite/appwrite", @@ -2209,16 +2209,16 @@ }, { "name": "utopia-php/database", - "version": "3.0.2", + "version": "dev-dat-851", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "b92554e2e7b3b00f0f0acb2b53c6a11e1349b81e" + "reference": "7290a34e44a83cfd58078be22b481533a5859b37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/b92554e2e7b3b00f0f0acb2b53c6a11e1349b81e", - "reference": "b92554e2e7b3b00f0f0acb2b53c6a11e1349b81e", + "url": "https://api.github.com/repos/utopia-php/database/zipball/7290a34e44a83cfd58078be22b481533a5859b37", + "reference": "7290a34e44a83cfd58078be22b481533a5859b37", "shasum": "" }, "require": { @@ -2261,9 +2261,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/3.0.2" + "source": "https://github.com/utopia-php/database/tree/dat-851" }, - "time": "2025-10-20T23:58:56+00:00" + "time": "2025-11-04T11:34:18+00:00" }, { "name": "utopia-php/dsn", @@ -4916,7 +4916,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "utopia-php/database": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From acceba4fb87bea524d6e8befc1b46be3001e7e04 Mon Sep 17 00:00:00 2001 From: ArnabChatterjee20k Date: Tue, 4 Nov 2025 17:14:52 +0530 Subject: [PATCH 2/5] updated database --- composer.json | 2 +- composer.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 8532d9e..3b974e0 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "ext-curl": "*", "ext-openssl": "*", "appwrite/appwrite": "15.*", - "utopia-php/database": "dev-dat-851", + "utopia-php/database": "3.*", "utopia-php/storage": "0.18.*", "utopia-php/dsn": "0.2.*", "utopia-php/console": "0.0.*" diff --git a/composer.lock b/composer.lock index f404b6e..a18bfab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5be49868a8b5e46b7c8870d462b79670", + "content-hash": "8b2b0894b94d976f09044c200956961a", "packages": [ { "name": "appwrite/appwrite", @@ -2209,16 +2209,16 @@ }, { "name": "utopia-php/database", - "version": "dev-dat-851", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "7290a34e44a83cfd58078be22b481533a5859b37" + "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/7290a34e44a83cfd58078be22b481533a5859b37", - "reference": "7290a34e44a83cfd58078be22b481533a5859b37", + "url": "https://api.github.com/repos/utopia-php/database/zipball/b38cc9887a8fefedcb9a962168dd6f28b7082fc1", + "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1", "shasum": "" }, "require": { @@ -2261,9 +2261,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/dat-851" + "source": "https://github.com/utopia-php/database/tree/3.1.3" }, - "time": "2025-11-04T11:34:18+00:00" + "time": "2025-11-04T11:41:54+00:00" }, { "name": "utopia-php/dsn", @@ -4916,9 +4916,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "utopia-php/database": 20 - }, + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { From 1fd6cc20184c580fba2c66d1308785a0872ee7b7 Mon Sep 17 00:00:00 2001 From: ArnabChatterjee20k Date: Tue, 4 Nov 2025 17:16:37 +0530 Subject: [PATCH 3/5] resolved merge conflicts --- composer.lock | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/composer.lock b/composer.lock index 3504249..a18bfab 100644 --- a/composer.lock +++ b/composer.lock @@ -2209,7 +2209,6 @@ }, { "name": "utopia-php/database", -<<<<<<< HEAD "version": "3.1.3", "source": { "type": "git", @@ -2220,18 +2219,6 @@ "type": "zip", "url": "https://api.github.com/repos/utopia-php/database/zipball/b38cc9887a8fefedcb9a962168dd6f28b7082fc1", "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1", -======= - "version": "3.0.4", - "source": { - "type": "git", - "url": "https://github.com/utopia-php/database.git", - "reference": "a83997d5555d6cd873b829a2459292211c6ab13f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/a83997d5555d6cd873b829a2459292211c6ab13f", - "reference": "a83997d5555d6cd873b829a2459292211c6ab13f", ->>>>>>> upstream/main "shasum": "" }, "require": { @@ -2274,15 +2261,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", -<<<<<<< HEAD "source": "https://github.com/utopia-php/database/tree/3.1.3" }, "time": "2025-11-04T11:41:54+00:00" -======= - "source": "https://github.com/utopia-php/database/tree/3.0.4" - }, - "time": "2025-10-28T08:21:21+00:00" ->>>>>>> upstream/main }, { "name": "utopia-php/dsn", From 9970d4f5427a6d1d2d36fe459b7d690231aa14d2 Mon Sep 17 00:00:00 2001 From: ArnabChatterjee20k Date: Tue, 4 Nov 2025 17:18:27 +0530 Subject: [PATCH 4/5] resolved merge conflicts --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 96d7d17..e013187 100644 --- a/composer.lock +++ b/composer.lock @@ -2209,16 +2209,16 @@ }, { "name": "utopia-php/database", - "version": "3.1.3", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1" + "reference": "da9d021b2722abdf4df08a739126f1be2707cf6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/b38cc9887a8fefedcb9a962168dd6f28b7082fc1", - "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1", + "url": "https://api.github.com/repos/utopia-php/database/zipball/da9d021b2722abdf4df08a739126f1be2707cf6d", + "reference": "da9d021b2722abdf4df08a739126f1be2707cf6d", "shasum": "" }, "require": { @@ -2261,9 +2261,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/3.1.3" + "source": "https://github.com/utopia-php/database/tree/4.0.0" }, - "time": "2025-11-04T11:41:54+00:00" + "time": "2025-11-04T10:55:46+00:00" }, { "name": "utopia-php/dsn", @@ -4916,7 +4916,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -4927,5 +4927,5 @@ "platform-dev": { "ext-pdo": "*" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } From fa459022b214a31726975cfa75fd2a15c64c1e5c Mon Sep 17 00:00:00 2001 From: ArnabChatterjee20k Date: Tue, 4 Nov 2025 17:28:20 +0530 Subject: [PATCH 5/5] updated db version --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index fb941b7..3b974e0 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "ext-curl": "*", "ext-openssl": "*", "appwrite/appwrite": "15.*", - "utopia-php/database": "4.*", + "utopia-php/database": "3.*", "utopia-php/storage": "0.18.*", "utopia-php/dsn": "0.2.*", "utopia-php/console": "0.0.*" diff --git a/composer.lock b/composer.lock index e013187..3ecc572 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9c8bb5977268bd76bf2f06af3d75f974", + "content-hash": "8b2b0894b94d976f09044c200956961a", "packages": [ { "name": "appwrite/appwrite", @@ -2209,16 +2209,16 @@ }, { "name": "utopia-php/database", - "version": "4.0.0", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "da9d021b2722abdf4df08a739126f1be2707cf6d" + "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/da9d021b2722abdf4df08a739126f1be2707cf6d", - "reference": "da9d021b2722abdf4df08a739126f1be2707cf6d", + "url": "https://api.github.com/repos/utopia-php/database/zipball/b38cc9887a8fefedcb9a962168dd6f28b7082fc1", + "reference": "b38cc9887a8fefedcb9a962168dd6f28b7082fc1", "shasum": "" }, "require": { @@ -2261,9 +2261,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/4.0.0" + "source": "https://github.com/utopia-php/database/tree/3.1.3" }, - "time": "2025-11-04T10:55:46+00:00" + "time": "2025-11-04T11:41:54+00:00" }, { "name": "utopia-php/dsn",