patch: mise a jour des tests

Author: dimtrovich

spec/Builder/Alias.spec.php

@@ -31,28 +31,23 @@
 
         $builder = $this->builder->from('jobs j, users AS u');
         expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
-    });
 
-    it(": Prise en charge de chaine d'alias", function() {
-        $builder = $this->builder->from('jobs j, users u');
-        expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
-        
-        $builder = $this->builder->from('jobs j, users AS u');
+        $builder = $this->builder->from('jobs as j, users u');
         expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
     });
 
     it(": Alias 'Join' avec un nom de table court", function() {
         $this->builder->db()->setPrefix('db_');
 
         $builder = $this->builder->from('jobs')->join('users as u', ['u.id' => 'jobs.id']);
-        expect($builder->sql())->toMatch('/^SELECT \* FROM db_jobs AS jobs_(?:[a-z0-9]+) INNER JOIN db_users AS u ON u\.id = jobs_(?:[a-z0-9]+)\.id$/');           
+        expect($builder->sql())->toBe('SELECT * FROM db_jobs INNER JOIN db_users AS u ON u.id = db_jobs.id');           
     });
 
     it(": Alias 'Join' avec un nom de table long", function() {
         $this->builder->db()->setPrefix('db_');
 
         $builder = $this->builder->from('jobs')->join('users as u', ['users.id' => 'jobs.id']);
-        expect($builder->sql())->toMatch('/^SELECT \* FROM db_jobs AS jobs_(?:[a-z0-9]+) INNER JOIN db_users AS u ON u\.id = jobs_(?:[a-z0-9]+)\.id$/');           
+        expect($builder->sql())->toBe('SELECT * FROM db_jobs INNER JOIN db_users AS u ON u.id = db_jobs.id');           
     });
 
     it(": Alias simple 'Like' avec le préfixe DB", function() {

spec/Builder/From.spec.php

@@ -12,24 +12,24 @@
     it(": Table simple", function() {
         $builder = $this->builder->from('jobs');
 
-        expect($builder->sql())->toMatch('/^SELECT \* FROM jobs AS jobs_(?:[a-z0-9]+)$/'); 
+        expect($builder->sql())->toBe('SELECT * FROM jobs'); 
     });
 
     it(": Appel multiple de la méthode `from`", function() {
         $builder = $this->builder->from('jobs')->from('users u');
 
-        expect($builder->sql())->toMatch('/^SELECT \* FROM jobs AS jobs_(?:[a-z0-9]+), users AS u$/'); 
+        expect($builder->sql())->toBe('SELECT * FROM jobs, users AS u'); 
     });
 
     it(": Utilisation d'un tableau de tables", function() {
         $builder = $this->builder->from(['jobs', 'users u']);
-        expect($builder->sql())->toMatch('/^SELECT \* FROM jobs AS jobs_(?:[a-z0-9]+), users AS u$/'); 
+        expect($builder->sql())->toBe('SELECT * FROM jobs, users AS u'); 
     });
 
     it(": Réinitialisation de la table", function() {
         $builder = $this->builder->from('jobs')->from('users u', true);
 
-        expect($builder->sql())->toMatch('/^SELECT \* FROM users AS u$/'); 
+        expect($builder->sql())->toBe('SELECT * FROM users AS u'); 
     });
 
     it(": Réinitialisations", function() {

spec/Builder/Order.spec.php

@@ -60,6 +60,6 @@
     it(": Tri sans definition explicite d'alias", function() {
         $builder = $this->builder->from('user')->sortDesc('user.id');
 
-        expect($builder->sql())->toMatch('/^SELECT \* FROM user AS user_(?:[a-z0-9]+) ORDER BY user_(?:[a-z0-9]+)\.id DESC$/');
+        expect($builder->sql())->toBe('SELECT * FROM user ORDER BY user.id DESC');
     });
 });

spec/Builder/Where.spec.php

@@ -18,7 +18,7 @@
     describe('Simple where', function() {
         it(": Where simple", function() {
             $builder = $this->builder->from('users')->where('id', 3);
-            expect($builder->sql())->toMatch('/^SELECT \* FROM users AS users_(?:[a-z0-9]+) WHERE id = 3$/');           
+            expect($builder->sql())->toBe('SELECT * FROM users WHERE id = 3');           
         });
 
         it(": Where avec un operateur personnalisé", function() {
@@ -69,13 +69,13 @@
             expect($builder->sql())->toBe('SELECT * FROM users AS u, jobs AS j WHERE u.id_user = j.id_user');
 
             $builder = $this->builder->from(['users', 'jobs'])->whereColumn('users.id_user', 'jobs.id_user');
-            expect($builder->sql())->toMatch('/^SELECT \* FROM users AS users_(?:[a-z0-9]+), jobs AS jobs_(?:[a-z0-9]+) WHERE users_(?:[a-z0-9]+)\.id_user = jobs_(?:[a-z0-9]+)\.id_user$/');
+            expect($builder->sql())->toBe('SELECT * FROM users, jobs WHERE users.id_user = jobs.id_user');
 
             $builder = $this->builder->from(['users u', 'jobs j'])->whereColumn(['users.id_user' => 'jobs.id_user', 'u.name' => 'j.username']);
             expect($builder->sql())->toBe('SELECT * FROM users AS u, jobs AS j WHERE u.id_user = j.id_user AND u.name = j.username');
 
             $builder = $this->builder->from(['users u', 'jobs'])->whereColumn('u.id_user', 'jobs.id_user');
-            expect($builder->sql())->toMatch('/^SELECT \* FROM users AS u, jobs AS jobs_(?:[a-z0-9]+) WHERE u\.id_user = jobs_(?:[a-z0-9]+)\.id_user$/');
+            expect($builder->sql())->toBe('SELECT * FROM users AS u, jobs WHERE u.id_user = jobs.id_user');
         });
 
         it(": NotWhereColumn", function() {

spec/_support/Mock/MockConnection.php

@@ -1,9 +1,10 @@
 <?php
 namespace BlitzPHP\Database\Spec\Mock;
 
-use BlitzPHP\Database\Connection\BaseConnection;
+use BlitzPHP\Contracts\Database\ResultInterface;
+use BlitzPHP\Database\Connection\SQLite;
 
-class MockConnection extends BaseConnection
+class MockConnection extends SQLite
 {
     /**
      * {@inheritDoc}
@@ -12,16 +13,6 @@ class MockConnection extends BaseConnection
 
     protected array $returnValues = [];
 
-    /**
-     * Database schema for Postgre and SQLSRV
-     */
-    protected string $schema;
-
-    /**
-     * {@inheritDoc}
-     */
-    public string $database;
-
     /**
      * {@inheritDoc}
      */
@@ -34,99 +25,41 @@ public function shouldReturn(string $method, $return): self
         return $this;
     }
 
-    /**
-     * Orchestrates a query against the database. Queries must use
-     * Database\Statement objects to store the query and build it.
-     * This method works with the cache.
-     *
-     * Should automatically handle different connections for read/write
-     * queries if needed.
-     *
-     * @param mixed ...$binds
-     *
-     * @return BaseResult|bool|Query
-     *
-     * @todo BC set $queryClass default as null in 4.1
-     */
-    public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
+    protected function afterConnect(): void
     {
-        $queryClass = str_replace('Connection', 'Query', static::class);
-
-        $query = new $queryClass($this);
-
-        $query->setQuery($sql, $binds, $setEscapeFlags);
-
-        if (! empty($this->swapPre) && ! empty($this->prefix)) {
-            $query->swapPrefix($this->prefix, $this->swapPre);
-        }
-
-        $startTime = microtime(true);
-
-        $this->lastQuery = $query;
-
-        // Run the query
-        if (false === ($this->result = $this->simpleQuery($query->getQuery()))) {
-            $query->setDuration($startTime, $startTime);
-
-            // @todo deal with errors
-
-            return false;
-        }
-
-        $query->setDuration($startTime);
-
-        // resultID is not false, so it must be successful
-        if ($query->isWriteType($sql)) {
-            return true;
-        }
-
-        // query is not write-type, so it must be read-type query; return QueryResult
-        $resultClass = str_replace('Connection', 'Result', static::class);
-
-        return new $resultClass($this->conn, $this->result);
+        
     }
 
     /**
-     * Connect to the database.
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
-    public function connect(bool $persistent = false)
+    protected function getDsn(): string
     {
-        $return = $this->returnValues['connect'] ?? true;
-
-        if (is_array($return)) {
-            // By removing the top item here, we can
-            // get a different value for, say, testing failover connections.
-            $return = array_shift($this->returnValues['connect']);
-        }
-
-        return $return;
+        return 'sqlite::memory:';
     }
 
     /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
+     * {@inheritDoc}
      */
-    public function reconnect(): bool
+    public function setDatabase(string $databaseName): bool
     {
+        $this->config['database'] = $databaseName;
+
         return true;
     }
 
     /**
-     * Select a specific database table to use.
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
-    public function setDatabase(string $databaseName)
+    public function getDriver(): string
     {
-        $this->database = $databaseName;
+        $this->initialize();
 
-        return $this;
+        return 'mysql';
     }
 
     /**
-     * Returns a string containing the version of the database being used.
+     * {@inheritDoc}
      */
     public function getVersion(): string
     {
@@ -160,11 +93,7 @@ public function numRows(): int
     }
 
     /**
-     * Returns the last error code and message.
-     *
-     * Must return an array with keys 'code' and 'message':
-     *
-     *  return ['code' => null, 'message' => null);
+     * {@inheritDoc}
      */
     public function error(): array
     {
@@ -181,7 +110,7 @@ public function error(): array
      */
     public function insertID(?string $table = null)
     {
-        return $this->conn->insert_id;
+        return 1;
     }
 
     /**
@@ -191,83 +120,4 @@ protected function _escapeString(string $str): string
     {
         return "'" . parent::_escapeString($str) . "'";
     }
-
-    /**
-     * Generates the SQL for listing tables in a platform-dependent manner.
-     */
-    protected function _listTables(bool $constrainByPrefix = false): string
-    {
-        return '';
-    }
-
-    /**
-     * Generates a platform-specific query string so that the column names can be fetched.
-     */
-    protected function _listColumns(string $table = ''): string
-    {
-        return '';
-    }
-
-    protected function _fieldData(string $table): array
-    {
-        return [];
-    }
-
-    protected function _indexData(string $table): array
-    {
-        return [];
-    }
-
-    protected function _foreignKeyData(string $table): array
-    {
-        return [];
-    }
-
-    /**
-     * Close the connection.
-     */
-    protected function _close()
-    {
-    }
-
-    /**
-     * Begin Transaction
-     */
-    protected function _transBegin(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Commit Transaction
-     */
-    protected function _transCommit(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Rollback Transaction
-     */
-    protected function _transRollback(): bool
-    {
-        return true;
-    }
-
-
-    /**
-	 * Returns platform-specific SQL to disable foreign key checks.
-	 */
-	protected function _disableForeignKeyChecks(): string
-    {
-        return '';
-    }
-
-    /**
-	 * Returns platform-specific SQL to disable foreign key checks.
-	 */
-    protected function _enableForeignKeyChecks(): string
-    {
-        return '';
-    }
 }