test: add leaf db tests

Author: mychidarko

.github/workflows/lint.yml

@@ -0,0 +1,27 @@
+name: Lint code
+
+on: ["push","pull_request"]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          extensions: json, zip, pdo, pdo_sqlite
+          tools: composer:v2
+          coverage: none
+
+      - name: Install PHP dependencies
+        run: composer update --no-interaction --no-progress
+
+      - name: Run Linter
+        run: composer run lint -- --check

.github/workflows/tests.yml

@@ -0,0 +1,32 @@
+name: Run Tests
+
+on: ["push","pull_request"]
+
+jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: ["macos-latest","ubuntu-latest","windows-latest"]
+        php: ["8.4","8.3","8.2"]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: json, zip, pdo, pdo_sqlite
+          tools: composer:v2
+          coverage: xdebug
+
+      - name: Install PHP dependencies
+        run: composer update --no-interaction --no-progress
+
+      - name: Run Tests
+        run: composer run test -- --flags=coverage

alchemy.yml

@@ -3,36 +3,57 @@ app:
 
 tests:
   engine: pest
-  parallel: true
+  parallel: false
   paths:
     - tests
   files:
     - '*.test.php'
   coverage:
-    local: false
-    actions: true
+    processUncoveredFiles: true
 
 lint:
   preset: PSR12
   rules:
+    single_quote: true
+    phpdoc_scalar: true
     no_unused_imports: true
+    unary_operator_spaces: true
+    binary_operator_spaces: true
+    phpdoc_var_without_name: true
+    trailing_comma_in_multiline: true
+    phpdoc_single_line_var_spacing: true
+    single_trait_insert_per_statement: true
     not_operator_with_successor_space: false
-    single_quote: true
+    array_syntax:
+      syntax: short
+    ordered_imports:
+      sort_algorithm: alpha
+    method_argument_space:
+      on_multiline: ensure_fully_multiline
+      keep_multiple_spaces_after_comma: true
+    blank_line_before_statement:
+      statements:
+        - try
+        - break
+        - throw
+        - return
+        - declare
+        - continue
 
 actions:
   run:
     - lint
     - tests
   os:
+    - macos-latest
     - ubuntu-latest
+    - windows-latest
   php:
-    extensions: json, zip, dom, curl, libxml, mbstring, pdo
-    versions:
+    extensions: json, zip, pdo, pdo_sqlite
+    versions: # library supports ^7.4|^8.0, but pest 3 needs 8.2+
+      - '8.4'
       - '8.3'
       - '8.2'
-      - '8.1'
-      - '8.0'
-      - '7.4'
   events:
     - push
     - pull_request

composer.json

@@ -30,16 +30,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require-dev": {
-        "pestphp/pest": "^1.21",
+        "pestphp/pest": "*",
         "friendsofphp/php-cs-fixer": "^3.14",
-        "leafs/alchemy": "^2.2"
+        "leafs/alchemy": "v5.x-dev"
     },
     "scripts": {
         "format": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist.php --allow-risky=yes",
-        "test": "./vendor/bin/alchemy setup --test",
+        "test": "./vendor/bin/alchemy test",
         "alchemy": "./vendor/bin/alchemy setup",
-        "lint": "./vendor/bin/alchemy setup --lint",
-        "actions": "./vendor/bin/alchemy setup --actions"
+        "lint": "./vendor/bin/alchemy lint",
+        "fmt": "./vendor/bin/alchemy fmt",
+        "ci": "./vendor/bin/alchemy ci"
     },
     "config": {
         "allow-plugins": {

src/Db.php

@@ -53,22 +53,27 @@ public function tableExists(string $table)
         switch ($this->config['dbtype']) {
             case 'sqlite':
                 $schema = $this->select('sqlite_master')->where(['type' => 'table', 'name' => $table])->all();
+
                 break;
 
             case 'mysql':
                 $schema = $this->select('INFORMATION_SCHEMA.TABLES')->where(['TABLE_SCHEMA' => $this->config['dbname'], 'TABLE_NAME' => $table])->all();
+
                 break;
 
             case 'pgsql':
                 $schema = $this->select('pg_catalog.pg_tables')->where(['schemaname' => 'public', 'tablename' => $table])->all();
+
                 break;
 
             case 'sqlsrv':
                 $schema = $this->select('information_schema.tables')->where(['table_schema' => 'dbo', 'table_name' => $table])->all();
+
                 break;
 
             default:
                 $schema = $this->select('INFORMATION_SCHEMA.SCHEMATA')->where('SCHEMA_NAME', $table)->all();
+
                 break;
         }
 
@@ -132,7 +137,7 @@ public function dropTable(string $table)
     public function backup(string $dbName, string $destination, bool $withDifferential = false)
     {
         return $this->query("BACKUP DATABASE $dbName TO DISK = '$destination' " .
-            $withDifferential ? 'WITH DIFFERENTIAL' : '')->execute();
+            ($withDifferential ? 'WITH DIFFERENTIAL' : ''))->execute();
     }
 
     /**
@@ -355,6 +360,8 @@ public function orWhere($condition, $comparator = null, $value = null): self
         return $this;
     }
 
+    /**
+     * Add a JSON where clause to the query
      *
      * @param string $column The JSON column
      * @param string $jsonKey The key within the JSON structure
@@ -363,9 +370,8 @@ public function orWhere($condition, $comparator = null, $value = null): self
      */
     public function whereJson(string $column, string $jsonKey, $value, string $comparator = '='): self
     {
-        // Check if the value is an integer, and cast the JSON value to an integer
+        // cast the extracted value to a number when comparing against one
         $jsonExpression = is_int($value)
-            # just incase: ? "CAST(JSON_EXTRACT($column, '$.$jsonKey') AS UNSIGNED)";
             ? "JSON_EXTRACT($column, '$.$jsonKey') + 0"
             : "JSON_EXTRACT($column, '$.$jsonKey')";
 
@@ -442,95 +448,9 @@ public function orWhereJsonContains(string $column, $value, ?string $jsonKey = n
     /**
      * Fetch current query with all related data
      *
-     * @param string $column The JSON column
-     * @param string $jsonKey The key within the JSON structure
-     * @param mixed $value The value to compare against
-     * @param string $comparator The comparison operator (default '=')
-     */
-    public function whereJson(string $column, string $jsonKey, $value, string $comparator = '='): self
-    {
-        // Check if the value is an integer, and cast the JSON value to an integer
-        $jsonExpression = is_int($value)
-            ? "JSON_EXTRACT($column, '$.$jsonKey') + 0" # just incase: ? "CAST(JSON_EXTRACT($column, '$.$jsonKey') AS UNSIGNED)";
-            : "JSON_EXTRACT($column, '$.$jsonKey')";
-
-        $this->query = Builder::where($this->query, $jsonExpression, $value, $comparator);
-        $this->bind(...(Builder::$bindings));
-
-        return $this;
-    }
-
-    /**
-     * Add a JSON where clause with OR comparator to the query
-     *
-     * @param string $column The JSON column
-     * @param string $jsonKey The key within the JSON structure
-     * @param mixed $value The value to compare against
-     * @param string $comparator The comparison operator (default '=')
-     */
-    public function orWhereJson(string $column, string $jsonKey, $value, string $comparator = '='): self
-    {
-        $jsonExpression = is_int($value)
-            ? "JSON_EXTRACT($column, '$.$jsonKey') + 0"
-            : "JSON_EXTRACT($column, '$.$jsonKey')";
-
-        $this->query = Builder::where($this->query, $jsonExpression, $value, $comparator, 'OR');
-        $this->bind(...(Builder::$bindings));
-
-        return $this;
-    }
-
-    /**
-     * Add a JSON contains clause to the query
-     *
-     * @param string $column The JSON column
-     * @param mixed $value The value to check for
-     * @param string|null $jsonKey The key within the JSON structure (optional)
-     */
-    public function whereJsonContains(string $column, $value, ?string $jsonKey = null): self
-    {
-        $jsonValue = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-
-        $jsonExpression = $jsonKey
-            ? "JSON_CONTAINS($column, ?, '$.$jsonKey')"
-            : "JSON_CONTAINS($column, ?)";
-
-        
-        Builder::$bindings[] = $jsonValue;
-        $this->query = Builder::where($this->query, $jsonExpression, 1, '=');
-        $this->bind(...(Builder::$bindings));
-
-        return $this;
-    }
-    
-    /**
-     * Add a JSON contains clause with OR comparator to the query
-     *
-     * @param string $column The JSON column
-     * @param mixed $value The value to check for
-     * @param string|null $jsonKey The key within the JSON structure (optional)
-     */
-    public function orWhereJsonContains(string $column, $value, ?string $jsonKey = null): self
-    {
-        $jsonValue = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-
-        $jsonExpression = $jsonKey
-            ? "JSON_CONTAINS($column, ?, '$.$jsonKey')"
-            : "JSON_CONTAINS($column, ?)";
-
-        Builder::$bindings[] = $jsonValue;
-        $this->query = Builder::where($this->query, $jsonExpression, 1, '=', 'OR');
-        $this->bind(...(Builder::$bindings));
-
-        return $this;
-    }
-
-    /**
-     * Fetch current query with all related data
-     * 
      * @param string $table The table to join
      * @param string $foreignKey The foreign key to use
-     * 
+     *
      * @return self
      */
     public function with(string $table, ?string $foreignKey = null)
@@ -539,7 +459,7 @@ public function with(string $table, ?string $foreignKey = null)
 
         $this->eager[] = [
             'table' => $table,
-            'foreignKey' => $foreignKey
+            'foreignKey' => $foreignKey,
         ];
 
         return $this;
@@ -605,8 +525,9 @@ public function search(string $row, string $value, ?array $hidden = []): ?array
      */
     public function beginTransaction(): self
     {
-        $this->query('START TRANSACTION');
-        $this->execute();
+        // PDO's own transaction handling works across mysql, sqlite,
+        // postgres and sqlsrv — raw START TRANSACTION is mysql-only
+        $this->connection($this->currentConnection)->beginTransaction();
 
         return $this;
     }
@@ -618,8 +539,7 @@ public function beginTransaction(): self
      */
     public function commit(): self
     {
-        $this->query('COMMIT');
-        $this->execute();
+        $this->connection($this->currentConnection)->commit();
 
         return $this;
     }
@@ -631,8 +551,7 @@ public function commit(): self
      */
     public function rollback(): self
     {
-        $this->query('ROLLBACK');
-        $this->execute();
+        $this->connection($this->currentConnection)->rollBack();
 
         return $this;
     }
@@ -654,7 +573,7 @@ public function transaction($callback): bool
             return true;
         } catch (\Exception $e) {
             $this->rollback();
-            $this->errorsArray = $e;
+            $this->errors['transaction'] = $e->getMessage();
 
             return false;
         }

src/Db/Builder.php

@@ -166,17 +166,19 @@ public static function whereAdvanced(
             case 'in':
                 $placeholders = implode(', ', array_fill(0, count($values), '?'));
                 $query .= "$column IN ($placeholders)";
+
                 break;
 
             case 'notin':
             case 'not in':
                 $placeholders = implode(', ', array_fill(0, count($values), '?'));
                 $query .= "$column NOT IN ($placeholders)";
+
                 break;
 
             case 'between':
                 if (count($values) !== 2) {
-                    throw new \InvalidArgumentException("BETWEEN requires exactly 2 values.");
+                    throw new \InvalidArgumentException('BETWEEN requires exactly 2 values.');
                 }
 
                 $query .= "$column BETWEEN ? AND ?";
@@ -188,6 +190,7 @@ public static function whereAdvanced(
         }
 
         static::$bindings = array_merge(static::$bindings, $values);
+
         return $query;
     }