Extract query lib

.github/workflows/tests.yml

@@ -60,7 +60,7 @@ jobs:
           docker compose up -d --wait
 
       - name: Run Unit Tests
-        run: docker compose exec tests vendor/bin/phpunit /usr/src/code/tests/unit
+        run: docker compose exec tests vendor/bin/paratest --configuration phpunit.xml --functional --processes 4 /usr/src/code/tests/unit
 
   adapter_test:
     name: Adapter Tests
@@ -103,4 +103,7 @@ jobs:
           docker compose up -d --wait
 
       - name: Run Tests
-        run: docker compose exec -T tests vendor/bin/phpunit /usr/src/code/tests/e2e/Adapter/${{matrix.adapter}}Test.php --debug
+        run: docker compose exec -T tests vendor/bin/paratest --configuration phpunit.xml --functional --processes 4 --exclude-group redis-destructive /usr/src/code/tests/e2e/Adapter/${{matrix.adapter}}Test.php
+
+      - name: Run Redis-Destructive Tests
+        run: docker compose exec -T tests vendor/bin/phpunit --configuration phpunit.xml --group redis-destructive /usr/src/code/tests/e2e/Adapter/${{matrix.adapter}}Test.php

Dockerfile

@@ -2,16 +2,29 @@ FROM composer:2.8 AS composer
 
 WORKDIR /usr/local/src/
 
-COPY composer.lock /usr/local/src/
-COPY composer.json /usr/local/src/
+COPY database/composer.lock /usr/local/src/
+COPY database/composer.json /usr/local/src/
 
-RUN composer install \
+# Copy local query lib dependency (referenced as ../query in composer.json)
+COPY query /usr/local/query
+
+# Rewrite path repository to use copied location
+RUN sed -i 's|"url": "../query"|"url": "/usr/local/query"|' /usr/local/src/composer.json \
+ && sed -i 's|"symlink": true|"symlink": false|' /usr/local/src/composer.json
+
+RUN COMPOSER_MIRROR_PATH_REPOS=1 composer install \
     --ignore-platform-reqs \
     --optimize-autoloader \
     --no-plugins \
     --no-scripts \
     --prefer-dist
 
+# Replace symlink with actual copy (composer path repos may still symlink)
+RUN if [ -L /usr/local/src/vendor/utopia-php/query ]; then \
+      rm /usr/local/src/vendor/utopia-php/query && \
+      cp -r /usr/local/query /usr/local/src/vendor/utopia-php/query; \
+    fi
+
 FROM php:8.4.18-cli-alpine3.22 AS compile
 
 ENV PHP_REDIS_VERSION="6.3.0" \
@@ -110,9 +123,9 @@ COPY --from=redis /usr/local/lib/php/extensions/no-debug-non-zts-20240924/redis.
 COPY --from=pcov /usr/local/lib/php/extensions/no-debug-non-zts-20240924/pcov.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
 COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20240924/xdebug.so /usr/local/lib/php/extensions/no-debug-non-zts-20240924/
 
-COPY ./bin /usr/src/code/bin
-COPY ./src /usr/src/code/src
-COPY ./dev /usr/src/code/dev
+COPY database/bin /usr/src/code/bin
+COPY database/src /usr/src/code/src
+COPY database/dev /usr/src/code/dev
 
 # Add Debug Configs
 RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi

README.md

@@ -633,22 +633,22 @@ $database->createRelationship(
 ); 
 
 // Relationship onDelete types
-Database::RELATION_MUTATE_CASCADE, 
-Database::RELATION_MUTATE_SET_NULL,
-Database::RELATION_MUTATE_RESTRICT,
+ForeignKeyAction::Cascade->value,
+ForeignKeyAction::SetNull->value,
+ForeignKeyAction::Restrict->value,
 
 // Update the relationship with the default reference attributes
 $database->updateRelationship(
     collection: 'movies', 
     id: 'users', 
-    onDelete: Database::RELATION_MUTATE_CASCADE
+    onDelete: ForeignKeyAction::Cascade->value
 ); 
 
 // Update the relationship with custom reference attributes
 $database->updateRelationship(
     collection: 'movies', 
     id: 'users', 
-    onDelete: Database::RELATION_MUTATE_CASCADE, 
+    onDelete: ForeignKeyAction::Cascade->value, 
     newKey: 'movies_id', 
     newTwoWayKey: 'users_id', 
     twoWay: true
@@ -755,25 +755,25 @@ $database->decreaseDocumentAttribute(
 // Update the value of an attribute in a document
 
 // Set types
-Document::SET_TYPE_ASSIGN, // Assign the new value directly
-Document::SET_TYPE_APPEND, // Append the new value to end of the array
-Document::SET_TYPE_PREPEND // Prepend the new value to start of the array
+SetType::Assign, // Assign the new value directly
+SetType::Append, // Append the new value to end of the array
+SetType::Prepend // Prepend the new value to start of the array
 Note: Using append/prepend with an attribute which is not an array, it will be set to an array containing the new value.
 
 $document->setAttribute(key: 'name', 'Chris Smoove')
-         ->setAttribute(key: 'age', 33, Document::SET_TYPE_ASSIGN);
+         ->setAttribute(key: 'age', 33, SetType::Assign);
 
 $database->updateDocument(
-    collection: 'users', 
-    id: $document->getId(), 
+    collection: 'users',
+    id: $document->getId(),
     document: $document
-);         
+);
 
 // Update the permissions of a document
-$document->setAttribute('$permissions', Permission::read(Role::any()), Document::SET_TYPE_APPEND)
-         ->setAttribute('$permissions', Permission::create(Role::any()), Document::SET_TYPE_APPEND)
-         ->setAttribute('$permissions', Permission::update(Role::any()), Document::SET_TYPE_APPEND)
-         ->setAttribute('$permissions', Permission::delete(Role::any()), Document::SET_TYPE_APPEND)
+$document->setAttribute('$permissions', Permission::read(Role::any()), SetType::Append)
+         ->setAttribute('$permissions', Permission::create(Role::any()), SetType::Append)
+         ->setAttribute('$permissions', Permission::update(Role::any()), SetType::Append)
+         ->setAttribute('$permissions', Permission::delete(Role::any()), SetType::Append)
 
 $database->updateDocument(
     collection: 'users', 

bin/tasks/relationships.php

@@ -20,6 +20,7 @@
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\PDO;
 use Utopia\Database\Query;
+use Utopia\Query\Schema\ForeignKeyAction;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
@@ -111,11 +112,11 @@
             $database->createAttribute('categories', 'name', Database::VAR_STRING, 256, true);
             $database->createAttribute('categories', 'description', Database::VAR_STRING, 1000, true);
 
-            $database->createRelationship('authors', 'articles', Database::RELATION_MANY_TO_MANY, true, onDelete: Database::RELATION_MUTATE_SET_NULL);
-            $database->createRelationship('articles', 'comments', Database::RELATION_ONE_TO_MANY, true, twoWayKey: 'article', onDelete: Database::RELATION_MUTATE_CASCADE);
-            $database->createRelationship('users', 'comments', Database::RELATION_ONE_TO_MANY, true, twoWayKey: 'user', onDelete: Database::RELATION_MUTATE_CASCADE);
-            $database->createRelationship('authors', 'profiles', Database::RELATION_ONE_TO_ONE, true, twoWayKey: 'author', onDelete: Database::RELATION_MUTATE_CASCADE);
-            $database->createRelationship('articles', 'categories', Database::RELATION_MANY_TO_ONE, true, id: 'category', twoWayKey: 'articles', onDelete: Database::RELATION_MUTATE_SET_NULL);
+            $database->createRelationship('authors', 'articles', Database::RELATION_MANY_TO_MANY, true, onDelete: ForeignKeyAction::SetNull->value);
+            $database->createRelationship('articles', 'comments', Database::RELATION_ONE_TO_MANY, true, twoWayKey: 'article', onDelete: ForeignKeyAction::Cascade->value);
+            $database->createRelationship('users', 'comments', Database::RELATION_ONE_TO_MANY, true, twoWayKey: 'user', onDelete: ForeignKeyAction::Cascade->value);
+            $database->createRelationship('authors', 'profiles', Database::RELATION_ONE_TO_ONE, true, twoWayKey: 'author', onDelete: ForeignKeyAction::Cascade->value);
+            $database->createRelationship('articles', 'categories', Database::RELATION_MANY_TO_ONE, true, id: 'category', twoWayKey: 'articles', onDelete: ForeignKeyAction::SetNull->value);
         };
 
         $dbAdapters = [

composer.json

@@ -4,7 +4,8 @@
     "type": "library",
     "keywords": ["php","framework", "upf", "utopia", "database"],
     "license": "MIT",
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {"Utopia\\Database\\": "src/Database"}
     },
@@ -25,7 +26,7 @@
         ],
         "test": [
             "Composer\\Config::disableProcessTimeout",
-            "docker compose exec tests vendor/bin/phpunit --configuration phpunit.xml"
+            "docker compose exec tests vendor/bin/paratest --configuration phpunit.xml --functional --processes 4"
         ],
         "lint": "php -d memory_limit=2G ./vendor/bin/pint --test",
         "format": "php -d memory_limit=2G ./vendor/bin/pint",
@@ -40,11 +41,13 @@
         "utopia-php/framework": "0.33.*",
         "utopia-php/cache": "1.*",
         "utopia-php/pools": "1.*",
-        "utopia-php/mongo": "1.*"
+        "utopia-php/mongo": "1.*",
+        "utopia-php/query": "@dev"
     },
     "require-dev": {
         "fakerphp/faker": "1.23.*",
         "phpunit/phpunit": "9.*",
+        "brianium/paratest": "^6.11",
         "pcov/clobber": "2.*",
         "swoole/ide-helper": "5.1.3",
         "utopia-php/cli": "0.14.*",
@@ -58,6 +61,15 @@
         "mongodb/mongodb": "Needed to support MongoDB Database Adapter"
 
     },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../query",
+            "options": {
+                "symlink": true
+            }
+        }
+    ],
     "config": {
         "allow-plugins": {
             "php-http/discovery": false,