From 1b776f7fdc13feb10b2e7402653a21655d2818d3 Mon Sep 17 00:00:00 2001 From: fogelito Date: Thu, 20 Oct 2022 23:59:00 +0300 Subject: [PATCH] some changes --- .env | 8 +-- app/config/collections.php | 116 ++++++++++++++++++------------------- composer.json | 4 +- composer.lock | 94 +++++++++++++++--------------- docker-compose.yml | 1 + 5 files changed, 112 insertions(+), 111 deletions(-) diff --git a/.env b/.env index 227ea10676..55e32cb722 100644 --- a/.env +++ b/.env @@ -17,11 +17,11 @@ _APP_REDIS_HOST=redis _APP_REDIS_PORT=6379 _APP_REDIS_PASS= _APP_REDIS_USER= -_APP_DB_HOST=mariadb -_APP_DB_PORT=3306 +_APP_DB_HOST=db-mysql-fra1-shmuel-test-do-user-10204879-0.b.db.ondigitalocean.com +_APP_DB_PORT=25060 _APP_DB_SCHEMA=appwrite -_APP_DB_USER=user -_APP_DB_PASS=password +_APP_DB_USER=doadmin +_APP_DB_PASS=AVNS_LjyH2XQ_tKwGwira3tn _APP_DB_ROOT_PASS=rootsecretpassword _APP_STORAGE_DEVICE=Local _APP_STORAGE_S3_ACCESS_KEY= diff --git a/app/config/collections.php b/app/config/collections.php index 4297721dbb..f9f1d78148 100644 --- a/app/config/collections.php +++ b/app/config/collections.php @@ -2076,7 +2076,7 @@ $collections = [ '$id' => ID::custom('name'), 'type' => Database::VAR_STRING, 'format' => '', - 'size' => 16384, + 'size' => 2048, 'signed' => true, 'required' => false, 'default' => null, @@ -2097,7 +2097,7 @@ $collections = [ '$id' => ID::custom('runtime'), 'type' => Database::VAR_STRING, 'format' => '', - 'size' => 16384, + 'size' => 2048, 'signed' => true, 'required' => false, 'default' => null, @@ -2212,62 +2212,62 @@ $collections = [ 'lengths' => [], 'orders' => [], ], - // [ - // '$id' => ID::custom('_key_name'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['name'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_enabled'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['enabled'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_runtime'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['runtime'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_deployment'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['deployment'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_schedule'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['schedule'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_scheduleNext'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['scheduleNext'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_schedulePrevious'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['schedulePrevious'], - // 'lengths' => [], - // 'orders' => [], - // ], - // [ - // '$id' => ID::custom('_key_timeout'), - // 'type' => Database::INDEX_KEY, - // 'attributes' => ['timeout'], - // 'lengths' => [], - // 'orders' => [], - // ], + [ + '$id' => ID::custom('_key_name'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['name'], + 'lengths' => [700], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_enabled'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['enabled'], + 'lengths' => [], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_runtime'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['runtime'], + 'lengths' => [700], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_deployment'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['deployment'], + 'lengths' => [], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_schedule'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['schedule'], + 'lengths' => [], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_scheduleNext'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['scheduleNext'], + 'lengths' => [], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_schedulePrevious'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['schedulePrevious'], + 'lengths' => [], + 'orders' => [], + ], + [ + '$id' => ID::custom('_key_timeout'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['timeout'], + 'lengths' => [], + 'orders' => [], + ], ], ], diff --git a/composer.json b/composer.json index 973aec8539..7cefd70e9e 100644 --- a/composer.json +++ b/composer.json @@ -48,10 +48,10 @@ "utopia-php/abuse": "0.13.*", "utopia-php/analytics": "0.2.*", "utopia-php/audit": "0.14.*", - "utopia-php/cache": "0.6.*", + "utopia-php/cache": "0.7.*", "utopia-php/cli": "0.13.*", "utopia-php/config": "0.2.*", - "utopia-php/database": "0.25.*", + "utopia-php/database": "dev-mysql-varchar-index-length as 0.25.7", "utopia-php/locale": "0.4.*", "utopia-php/registry": "0.5.*", "utopia-php/preloader": "0.2.*", diff --git a/composer.lock b/composer.lock index 9ec0ea3197..5ae81fbd36 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": "568151395a8877f87d9bdce048adc2dc", + "content-hash": "f0c0b6f8c2a3d8c16a7357f57c2730cc", "packages": [ { "name": "adhocore/jwt", @@ -1903,24 +1903,26 @@ }, { "name": "utopia-php/cache", - "version": "0.6.1", + "version": "0.7.0", "source": { "type": "git", "url": "https://github.com/utopia-php/cache.git", - "reference": "9889235a6d3da6cbb1f435201529da4d27c30e79" + "reference": "cd53431242c88299daea2589e21322abe97682cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/cache/zipball/9889235a6d3da6cbb1f435201529da4d27c30e79", - "reference": "9889235a6d3da6cbb1f435201529da4d27c30e79", + "url": "https://api.github.com/repos/utopia-php/cache/zipball/cd53431242c88299daea2589e21322abe97682cc", + "reference": "cd53431242c88299daea2589e21322abe97682cc", "shasum": "" }, "require": { "ext-json": "*", + "ext-memcached": "*", "ext-redis": "*", "php": ">=8.0" }, "require-dev": { + "laravel/pint": "1.2.*", "phpunit/phpunit": "^9.3", "vimeo/psalm": "4.13.1" }, @@ -1934,12 +1936,6 @@ "license": [ "MIT" ], - "authors": [ - { - "name": "Eldad Fux", - "email": "eldad@appwrite.io" - } - ], "description": "A simple cache library to manage application cache storing, loading and purging", "keywords": [ "cache", @@ -1950,9 +1946,9 @@ ], "support": { "issues": "https://github.com/utopia-php/cache/issues", - "source": "https://github.com/utopia-php/cache/tree/0.6.1" + "source": "https://github.com/utopia-php/cache/tree/0.7.0" }, - "time": "2022-08-10T08:12:46+00:00" + "time": "2022-10-16T06:04:12+00:00" }, { "name": "utopia-php/cli", @@ -2060,16 +2056,16 @@ }, { "name": "utopia-php/database", - "version": "0.25.4", + "version": "dev-mysql-varchar-index-length", "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "2883de82eee99e5744bf6e4123095a530c48a194" + "reference": "6dfc74188e24ffa600f2e0edc505a2f168e8cc04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/2883de82eee99e5744bf6e4123095a530c48a194", - "reference": "2883de82eee99e5744bf6e4123095a530c48a194", + "url": "https://api.github.com/repos/utopia-php/database/zipball/6dfc74188e24ffa600f2e0edc505a2f168e8cc04", + "reference": "6dfc74188e24ffa600f2e0edc505a2f168e8cc04", "shasum": "" }, "require": { @@ -2078,7 +2074,7 @@ "ext-redis": "*", "mongodb/mongodb": "1.8.0", "php": ">=8.0", - "utopia-php/cache": "0.6.*", + "utopia-php/cache": "0.7.*", "utopia-php/framework": "0.*.*" }, "require-dev": { @@ -2098,16 +2094,6 @@ "license": [ "MIT" ], - "authors": [ - { - "name": "Eldad Fux", - "email": "eldad@appwrite.io" - }, - { - "name": "Brandon Leckemby", - "email": "brandon@appwrite.io" - } - ], "description": "A simple library to manage application persistency using multiple database adapters", "keywords": [ "database", @@ -2118,9 +2104,9 @@ ], "support": { "issues": "https://github.com/utopia-php/database/issues", - "source": "https://github.com/utopia-php/database/tree/0.25.4" + "source": "https://github.com/utopia-php/database/tree/mysql-varchar-index-length" }, - "time": "2022-09-14T06:22:33+00:00" + "time": "2022-10-20T19:41:52+00:00" }, { "name": "utopia-php/domains", @@ -3419,25 +3405,30 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -3463,9 +3454,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-03-15T21:29:03+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpspec/prophecy", @@ -5283,16 +5274,16 @@ }, { "name": "twig/twig", - "version": "v3.4.2", + "version": "v3.4.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077" + "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077", - "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58", + "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58", "shasum": "" }, "require": { @@ -5343,7 +5334,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.4.2" + "source": "https://github.com/twigphp/Twig/tree/v3.4.3" }, "funding": [ { @@ -5355,12 +5346,21 @@ "type": "tidelift" } ], - "time": "2022-08-12T06:47:24+00:00" + "time": "2022-09-28T08:42:51+00:00" + } + ], + "aliases": [ + { + "package": "utopia-php/database", + "version": "dev-mysql-varchar-index-length", + "alias": "0.25.7", + "alias_normalized": "0.25.7.0" } ], - "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "utopia-php/database": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -5384,5 +5384,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/docker-compose.yml b/docker-compose.yml index bd30de3e9f..f143b437f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,6 +83,7 @@ services: - ./public:/usr/src/code/public - ./src:/usr/src/code/src - ./dev:/usr/local/dev + - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database depends_on: - mariadb - redis