Skip to content

Commit 8fa17a2

Browse files
dimtrovichdimtrovich
committed
patch: adaptation des tests existants avec le nouveau query builder
1 parent 13b7274 commit 8fa17a2

File tree

14 files changed

+226
-271
lines changed

14 files changed

+226
-271
lines changed

‎spec/Builder/Alias.spec.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,59 @@
1111

1212
it(": Alias simple", function() {
1313
$builder = $this->builder->from('jobs j');
14-
expect($builder->sql())->toBe('SELECT * FROM jobs As j');
14+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j');
1515

16-
$builder = $this->builder->from('jobs As j');
17-
expect($builder->sql())->toBe('SELECT * FROM jobs As j');
16+
$builder = $this->builder->from('jobs AS j');
17+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j');
1818
});
1919

2020
it(": Prise en charge des tableau d'alias", function() {
2121
$builder = $this->builder->from(['jobs j', 'users u']);
22-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, users As u');
22+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
2323

2424
$builder = $this->builder->from(['jobs j', 'users as u']);
25-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, users As u');
25+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
2626
});
2727

2828
it(": Prise en charge de chaine d'alias", function() {
2929
$builder = $this->builder->from('jobs j, users u');
30-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, users As u');
30+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
3131

3232
$builder = $this->builder->from('jobs j, users AS u');
33-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, users As u');
33+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
3434
});
3535

3636
it(": Prise en charge de chaine d'alias", function() {
3737
$builder = $this->builder->from('jobs j, users u');
38-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, users As u');
38+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
3939

4040
$builder = $this->builder->from('jobs j, users AS u');
41-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, users As u');
41+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, users AS u');
4242
});
4343

4444
it(": Alias 'Join' avec un nom de table court", function() {
4545
$this->builder->db()->setPrefix('db_');
4646

4747
$builder = $this->builder->from('jobs')->join('users as u', ['u.id' => 'jobs.id']);
48-
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$/');
48+
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$/');
4949
});
5050

5151
it(": Alias 'Join' avec un nom de table long", function() {
5252
$this->builder->db()->setPrefix('db_');
5353

5454
$builder = $this->builder->from('jobs')->join('users as u', ['users.id' => 'jobs.id']);
55-
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$/');
55+
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$/');
5656
});
5757

5858
it(": Alias simple 'Like' avec le préfixe DB", function() {
5959
$this->builder->db()->setPrefix('db_');
6060

6161
$builder = $this->builder->from('jobs j')->like('j.name', 'veloper');
62-
expect($builder->sql())->toBe('SELECT * FROM db_jobs As j WHERE j.name LIKE \'%veloper%\'');
62+
expect($builder->sql())->toBe('SELECT * FROM db_jobs AS j WHERE j.name LIKE \'%veloper%\'');
6363
});
6464

6565
it(": Alias simple avec le préfixe table", function() {
6666
$builder = $this->builder->from('articles a')->select('articles.user_id as user')->where('articles.id', 1);
67-
expect($builder->sql())->toBe('SELECT a.user_id As user FROM articles As a WHERE a.id = 1');
67+
expect($builder->sql())->toBe('SELECT a.user_id AS user FROM articles AS a WHERE a.id = 1');
6868
});
6969
});

‎spec/Builder/Base.spec.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
it(": Séléction distincte", function() {
1919
$builder = $this->builder->select('country')->distinct()->from('users u');
2020

21-
expect($builder->sql())->toBe('SELECT DISTINCT country FROM users As u');
21+
expect($builder->sql())->toBe('SELECT DISTINCT country FROM users AS u');
2222
});
2323
});

‎spec/Builder/Count.spec.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,40 @@
1212
it(": Nombre de ligne", function() {
1313
$builder = $this->builder->testMode()->from('jobs j');
1414

15-
expect($builder->count())->toBe('SELECT COUNT(*) As num_rows FROM jobs As j');
15+
expect($builder->count())->toBe('SELECT COUNT(*) AS count_value FROM jobs AS j');
1616
});
1717

1818
it(": Nombre de ligne avec condition", function() {
1919
$builder = $this->builder->testMode()->from('jobs j')->where('id >', 3);
2020

21-
expect($builder->count())->toBe('SELECT COUNT(*) As num_rows FROM jobs As j WHERE id > 3');
21+
expect($builder->count())->toBe('SELECT COUNT(*) AS count_value FROM jobs AS j WHERE id > 3');
2222
});
2323

2424
it(": Nombre de ligne avec regroupement", function() {
2525
$builder = $this->builder->testMode()->from('jobs j')->where('id >', 3)->groupBy('id');
2626

27-
expect($builder->count())->toBe('SELECT COUNT(*) As num_rows FROM ( SELECT * FROM jobs As j WHERE id > 3 GROUP BY id ) BLITZ_count_all_results');
27+
expect($builder->bindings->getValues())->toBe([3]);
28+
expect($builder->count())->toBe('SELECT COUNT(*) AS count_value FROM (SELECT * FROM jobs AS j WHERE id > ? GROUP BY id) AS count_table');
2829
});
2930

3031
it(": Compter tous les résultats avec GroupBy et le prefixe de la base de données", function() {
3132
$this->builder->db()->setPrefix('db_');
3233
$builder = $this->builder->testMode()->select('j.*')->from('jobs j')->where('id >', 3)->groupBy('id');
3334

34-
expect($builder->count())->toMatch('/^SELECT COUNT\(\*\) As num_rows FROM \( SELECT j_(?:[a-z0-9]+)\.\* FROM db_jobs As j_(?:[a-z0-9]+) WHERE id > 3 GROUP BY id \) BLITZ_count_all_results$/');
35+
expect($builder->bindings->getValues())->toBe([3]);
36+
expect($builder->count())->toBe('SELECT COUNT(*) AS count_value FROM (SELECT j.* FROM db_jobs AS j WHERE id > ? GROUP BY id) AS count_table');
3537
});
3638

3739
it(": Compter tous les résultats avec GroupBy et Having", function() {
3840
$builder = $this->builder->testMode()->from('jobs j')->where('id >', 3)->groupBy('id')->having('1=1');
3941

40-
expect($builder->count())->toBe('SELECT COUNT(*) As num_rows FROM ( SELECT * FROM jobs As j WHERE id > 3 GROUP BY id HAVING 1=1 ) BLITZ_count_all_results');
42+
expect($builder->bindings->getValues())->toBe([3, 1]);
43+
expect($builder->count())->toBe('SELECT COUNT(*) AS count_value FROM (SELECT * FROM jobs AS j WHERE id > ? GROUP BY id HAVING 1 = ?) AS count_table');
4144
});
4245

4346
it(": Compter tous les résultats avec Having uniquement", function() {
4447
$builder = $this->builder->testMode()->from('jobs j')->where('id >', 3)->having('1=1');
4548

46-
expect($builder->count())->toBe('SELECT COUNT(*) As num_rows FROM jobs As j WHERE id > 3 HAVING 1=1');
49+
expect($builder->count())->toBe('SELECT COUNT(*) AS count_value FROM jobs AS j WHERE id > 3 HAVING 1 = 1');
4750
});
4851
});

‎spec/Builder/Delete.spec.php‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
use BlitzPHP\Database\Exceptions\DatabaseException;
55
use BlitzPHP\Database\Spec\Mock\MockConnection;
66

7+
use function Kahlan\expect;
8+
79
describe("Database / Query Builder : Suppression", function() {
810

911
beforeEach(function() {
1012
$this->builder = new BaseBuilder(new MockConnection([]));
1113
});
1214

13-
it(": Vérification de la présence d'une table", function() {
14-
$builder = $this->builder->testMode();
15+
xit(": Vérification de la présence d'une table", function() {
16+
$builder = $this->builder->testMode()->delete();
17+
dd($builder);
1518
expect(function() use ($builder) {
1619
$builder->delete();
1720
})->toThrow(new DatabaseException("Table is not defined."));
@@ -24,24 +27,26 @@
2427

2528
it(": Suppression conditionnée", function() {
2629
$builder = $this->builder->testMode()->from('jobs');
27-
expect($builder->delete(['id' => 1]))->toBe('DELETE FROM jobs WHERE id = 1');
30+
expect($builder->delete(['id' => 1]))->toBe('DELETE FROM jobs WHERE id = ?');
2831

2932
$builder = $this->builder->testMode()->from('jobs')->where(['id' => 1]);
30-
expect($builder->delete())->toBe('DELETE FROM jobs WHERE id = 1');
33+
expect($builder->bindings->getValues())->toBe([1]);
34+
expect($builder->delete())->toBe('DELETE FROM jobs WHERE id = ?');
3135
});
3236

3337
it(": Suppression avec alias de table", function() {
3438
// Retrait des alias (explicite) pour les requetes de suppression
3539
$builder = $this->builder->testMode()->from('jobs As j');
36-
expect($builder->delete(['id' => 1]))->toBe('DELETE FROM jobs WHERE id = 1');
40+
expect($builder->delete(['id' => 1]))->toBe('DELETE FROM jobs WHERE id = ?');
3741

3842
// Retrait des alias (implicite) pour les requetes de suppression
3943
$builder = $this->builder->testMode()->from('jobs j');
40-
expect($builder->delete(['id' => 1]))->toBe('DELETE FROM jobs WHERE id = 1');
44+
expect($builder->delete(['id' => 1]))->toBe('DELETE FROM jobs WHERE id = ?');
4145
});
4246

4347
it(": Suppression avec limite", function() {
4448
$builder = $this->builder->testMode()->from('jobs')->where('id', 1)->limit(10);
45-
expect($builder->delete())->toBe('DELETE FROM jobs WHERE id = 1 LIMIT 10');
49+
expect($builder->bindings->getValues())->toBe([1]);
50+
expect($builder->delete())->toBe('DELETE FROM jobs WHERE id = ? LIMIT 10');
4651
});
4752
});

‎spec/Builder/From.spec.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,48 @@
1212
it(": Table simple", function() {
1313
$builder = $this->builder->from('jobs');
1414

15-
expect($builder->sql())->toMatch('/^SELECT \* FROM jobs As jobs_(?:[a-z0-9]+)$/');
15+
expect($builder->sql())->toMatch('/^SELECT \* FROM jobs AS jobs_(?:[a-z0-9]+)$/');
1616
});
1717

1818
it(": Appel multiple de la méthode `from`", function() {
1919
$builder = $this->builder->from('jobs')->from('users u');
2020

21-
expect($builder->sql())->toMatch('/^SELECT \* FROM jobs As jobs_(?:[a-z0-9]+), users As u$/');
21+
expect($builder->sql())->toMatch('/^SELECT \* FROM jobs AS jobs_(?:[a-z0-9]+), users AS u$/');
2222
});
2323

2424
it(": Utilisation d'un tableau de tables", function() {
2525
$builder = $this->builder->from(['jobs', 'users u']);
26-
expect($builder->sql())->toMatch('/^SELECT \* FROM jobs As jobs_(?:[a-z0-9]+), users As u$/');
26+
expect($builder->sql())->toMatch('/^SELECT \* FROM jobs AS jobs_(?:[a-z0-9]+), users AS u$/');
2727
});
2828

2929
it(": Réinitialisation de la table", function() {
3030
$builder = $this->builder->from('jobs')->from('users u', true);
3131

32-
expect($builder->sql())->toMatch('/^SELECT \* FROM users As u$/');
32+
expect($builder->sql())->toMatch('/^SELECT \* FROM users AS u$/');
3333
});
3434

3535
it(": Réinitialisations", function() {
3636
$builder = $this->builder->from(['jobs j', 'roles r']);
37-
expect($builder->sql())->toBe('SELECT * FROM jobs As j, roles As r');
37+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j, roles AS r');
3838

3939
$builder = $this->builder->from(null, true);
4040
expect($builder->sql())->toBe('SELECT *');
4141

4242
$builder = $this->builder->from('jobs j');
43-
expect($builder->sql())->toBe('SELECT * FROM jobs As j');
43+
expect($builder->sql())->toBe('SELECT * FROM jobs AS j');
4444
});
4545

4646
it(": Sous requetes", function() {
4747
$subquery = (clone $this->builder)->from('users u');
4848
$builder = $this->builder->fromSubquery($subquery, 'alias');
49-
expect($builder->sql())->toBe('SELECT * FROM (SELECT * FROM users As u) alias');
49+
expect($builder->sql())->toBe('SELECT * FROM (SELECT * FROM users AS u) AS alias');
5050

5151
$subquery = (clone $this->builder)->from('users u')->select('id, name');
5252
$builder = $this->builder->fromSubquery($subquery, 'users_1');
53-
expect($builder->sql())->toBe('SELECT * FROM (SELECT id, name FROM users As u) users_1');
53+
expect($builder->sql())->toBe('SELECT * FROM (SELECT id, name FROM users AS u) AS users_1');
5454

5555
$subquery = (clone $this->builder)->from('users u');
5656
$builder = $this->builder->fromSubquery($subquery, 'alias')->from('some_table st');
57-
expect($builder->sql())->toBe('SELECT * FROM (SELECT * FROM users As u) alias, some_table As st');
57+
expect($builder->sql())->toBe('SELECT * FROM (SELECT * FROM users AS u) AS alias, some_table AS st');
5858
});
5959
});

0 commit comments

Comments
 (0)