Merge pull request #358 from utopia-php/feat-isolation-mode

Feat isolation mode
utopia-php · Dec 8, 2023 · 035e6b4 · 035e6b4
2 parents ebd030f + 5398922
commit 035e6b4
Show file tree

Hide file tree

Showing 54 changed files with 1,589 additions and 726 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,40 +1,100 @@
 name: "Tests"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  IMAGE: databases-dev
+  CACHE_KEY: databases-dev-${{ github.event.pull_request.head.sha }}
+
 on: [pull_request]
+
 jobs:
-  tests:
-    name: Unit & E2E
+  setup:
+    name: Setup & Build Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build Docker Image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: false
+          tags: ${{ env.IMAGE }}
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          outputs: type=docker,dest=/tmp/${{ env.IMAGE }}.tar
+
+      - name: Cache Docker Image
+        uses: actions/cache@v3
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+
+  unit_test:
+    name: Unit Test
     runs-on: ubuntu-latest
+    needs: setup
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 2
-        submodules: recursive
-
-    - run: git checkout HEAD^2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Build image
-      uses: docker/build-push-action@v3
-      with:
-        context: .
-        push: false
-        tags: database-dev
-        load: true
-        cache-from: type=gha
-        cache-to: type=gha,mode=max
-
-    - name: Start Databases
-      run:  |
-        docker compose up -d
-        sleep 10
-
-    - name: Run Tests
-      run: docker compose exec -T tests vendor/bin/phpunit --configuration phpunit.xml
-
-    - name: Check Coverage
-      run: docker compose exec -T tests vendor/bin/coverage-check tmp/clover.xml 90
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Load Cache
+        uses: actions/cache@v3
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Services
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          sleep 10
+
+      - name: Run Unit Tests
+        run: docker compose exec tests vendor/bin/phpunit /usr/src/code/tests/unit
+
+  adapter_test:
+    name: Adapter Tests
+    runs-on: ubuntu-latest
+    needs: setup
+    strategy:
+      fail-fast: false
+      matrix:
+        adapter:
+          [
+            MariaDB,
+            MySQL,
+            Postgres,
+            SQLite,
+            MongoDB,
+          ]
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Load Cache
+        uses: actions/cache@v3
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Services
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          sleep 10
+
+      - name: Run ${{matrix.service}} Tests
+        run: docker compose exec -T tests vendor/bin/phpunit /usr/src/code/tests/e2e/Adapter/${{matrix.adapter}}Test.php --debug
diff --git a/README.md b/README.md
@@ -244,10 +244,10 @@ $database->setNamespace(
 );
 
 // Get default database
-$database->getDefaultDatabase();
+$database->getDatabase();
 
 // Sets default database
-$database->setDefaultDatabase(
+$database->setDatabase(
     name: 'dbName'
 );
 
@@ -402,7 +402,7 @@ $database->deleteCollection(
 );
 
 // Delete cached documents of a collection
-$database->deleteCachedCollection(
+$database->purgeCachedCollection(
     collection: 'users'
 );
 ```
@@ -836,7 +836,7 @@ $database->deleteDocument(
 
 // Delete a cached document
 Note: Cached Documents or Collections are automatically deleted when a document or collection is updated or deleted 
-$database->deleteCachedDocument(
+$database->purgeCachedDocument(
     collection: 'movies', 
     id: $document->getId()
 );

diff --git a/bin/tasks/index.php b/bin/tasks/index.php
@@ -71,7 +71,7 @@
                 return;
         }
 
-        $database->setDefaultDatabase($name);
+        $database->setDatabase($name);
         $database->setNamespace($namespace);
 
         Console::info("For query: greaterThan(created, 2010-01-01 05:00:00)', 'equal(genre,travel)");

diff --git a/bin/tasks/load.php b/bin/tasks/load.php
@@ -56,7 +56,7 @@
                     $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};charset=utf8mb4", $dbUser, $dbPass, MariaDB::getPDOAttributes());
 
                     $database = new Database(new MariaDB($pdo), $cache);
-                    $database->setDefaultDatabase($name);
+                    $database->setDatabase($name);
                     $database->setNamespace($namespace);
 
                     // Outline collection schema
@@ -89,7 +89,7 @@
                             $pdo = $pool->get();
 
                             $database = new Database(new MariaDB($pdo), $cache);
-                            $database->setDefaultDatabase($name);
+                            $database->setDatabase($name);
                             $database->setNamespace($namespace);
 
                             // Each coroutine loads 1000 documents
@@ -116,7 +116,7 @@
                     $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};charset=utf8mb4", $dbUser, $dbPass, MySQL::getPDOAttributes());
 
                     $database = new Database(new MySQL($pdo), $cache);
-                    $database->setDefaultDatabase($name);
+                    $database->setDatabase($name);
                     $database->setNamespace($namespace);
 
                     // Outline collection schema
@@ -150,7 +150,7 @@
                             $pdo = $pool->get();
 
                             $database = new Database(new MySQL($pdo), $cache);
-                            $database->setDefaultDatabase($name);
+                            $database->setDatabase($name);
                             $database->setNamespace($namespace);
 
                             // Each coroutine loads 1000 documents
@@ -178,7 +178,7 @@
                     );
 
                     $database = new Database(new Mongo($client), $cache);
-                    $database->setDefaultDatabase($name);
+                    $database->setDatabase($name);
                     $database->setNamespace($namespace);
 
                     // Outline collection schema
@@ -192,7 +192,7 @@
                     for ($i = 0; $i < $limit / 1000; $i++) {
                         go(function () use ($client, $faker, $name, $namespace, $cache) {
                             $database = new Database(new Mongo($client), $cache);
-                            $database->setDefaultDatabase($name);
+                            $database->setDatabase($name);
                             $database->setNamespace($namespace);
 
                             // Each coroutine loads 1000 documents
@@ -227,8 +227,8 @@
 
 function createSchema(Database $database): void
 {
-    if ($database->exists($database->getDefaultDatabase())) {
-        $database->delete($database->getDefaultDatabase());
+    if ($database->exists($database->getDatabase())) {
+        $database->delete($database->getDatabase());
     }
     $database->create();
 

diff --git a/bin/tasks/query.php b/bin/tasks/query.php
@@ -45,7 +45,7 @@
                 );
 
                 $database = new Database(new Mongo($client), $cache);
-                $database->setDefaultDatabase($name);
+                $database->setDatabase($name);
                 $database->setNamespace($namespace);
                 break;
 
@@ -58,7 +58,7 @@
                 $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};charset=utf8mb4", $dbUser, $dbPass, MariaDB::getPDOAttributes());
 
                 $database = new Database(new MariaDB($pdo), $cache);
-                $database->setDefaultDatabase($name);
+                $database->setDatabase($name);
                 $database->setNamespace($namespace);
                 break;
 
@@ -71,7 +71,7 @@
                 $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};charset=utf8mb4", $dbUser, $dbPass, MySQL::getPDOAttributes());
 
                 $database = new Database(new MySQL($pdo), $cache);
-                $database->setDefaultDatabase($name);
+                $database->setDatabase($name);
                 $database->setNamespace($namespace);
                 break;
 

diff --git a/composer.json b/composer.json
@@ -9,7 +9,10 @@
         "psr-4": {"Utopia\\Database\\": "src/Database"}
     },
     "autoload-dev": {
-        "psr-4": {"Utopia\\Tests\\": "tests/Database"}
+        "psr-4": {
+            "Tests\\E2E\\": "tests/e2e",
+            "Tests\\Unit\\": "tests/unit"
+        }
     },
     "scripts": {
         "build": [

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   tests:
     container_name: tests
-    image: database-dev
+    image: databases-dev
     build:
       context: .
     networks:

diff --git a/phpunit.xml b/phpunit.xml
@@ -9,8 +9,11 @@
     processIsolation="false"
     stopOnFailure="false">
     <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
+        <testsuite name="unit">
+            <directory>./tests/unit</directory>
+        </testsuite>
+        <testsuite name="e2e">
+            <directory>./tests/e2e/Adapter</directory>
         </testsuite>
     </testsuites>
     <coverage processUncoveredFiles="true">