Skip to content

Commit c065779

Browse files
authored
Merge pull request #2 from co0lc0der/dev
Merge pull request 0.4 -> 0.4.1
2 parents 18291fa + 37580a0 commit c065779

File tree

7 files changed

+224
-68
lines changed

7 files changed

+224
-68
lines changed

docs/Select.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ SELECT * FROM `users` WHERE (`id` > 1) AND (`group_id` = 2);
7070
```php
7171
$results = $query->select('users')->like(['name', '%John%'])->all();
7272

73-
# or with WHERE
73+
// or with WHERE
7474
$results = $query->select('users')->where([['name', 'LIKE', '%John%']])->all();
7575
```
7676
or it's able to use two strings (instead of an array) in parameters since [v0.3.5](https://github.com/co0lc0der/simple-query-builder-php/releases/tag/v0.3.5)
@@ -84,7 +84,7 @@ SELECT * FROM `users` WHERE (`name` LIKE '%John%');
8484
```php
8585
$results = $query->select('users')->notLike(['name', '%John%'])->all();
8686

87-
# or with WHERE
87+
// or with WHERE
8888
$results = $query->select('users')->where([['name', 'NOT LIKE', '%John%']])->all();
8989
```
9090
or it's able to use two strings (instead of an array) in parameters since [v0.3.5](https://github.com/co0lc0der/simple-query-builder-php/releases/tag/v0.3.5)
@@ -100,7 +100,7 @@ since [v0.3.5](https://github.com/co0lc0der/simple-query-builder-php/releases/ta
100100
```php
101101
$results = $query->select('users')->isNull('phone')->all();
102102

103-
# or with WHERE
103+
// or with WHERE
104104
$results = $query->select('users')->where([['phone', 'is null']])->all();
105105
```
106106
Result query
@@ -110,10 +110,10 @@ SELECT * FROM `users` WHERE (`phone` IS NULL);
110110
```php
111111
$results = $query->select('customers')->isNotNull('address')->all();
112112

113-
# or
113+
// or
114114
$results = $query->select('customers')->notNull('address')->all();
115115

116-
# or with WHERE
116+
// or with WHERE
117117
$results = $query->select('customers')->where([['address', 'is not null']])->all();
118118
```
119119
Result query
@@ -145,7 +145,7 @@ SELECT * FROM `posts` WHERE (`user_id` = 3) OFFSET 14 LIMIT 7;
145145
```php
146146
$results = $query->select('users', ['counter' => 'COUNT(*)'])->one();
147147

148-
# or
148+
// or
149149
$results = $query->count('users');
150150
```
151151
Result query
@@ -174,7 +174,13 @@ ORDER BY `b`.`id` DESC;
174174
```
175175
#### `DISTINCT`
176176
```php
177-
$results = $query->select('customers', ['city', 'country'], true)->orderBy('country desc')->all();
177+
$results = $query->select('customers', ['city', 'country'], true)
178+
->orderBy('country desc')->all();
179+
```
180+
or since [v0.4.1](https://github.com/co0lc0der/simple-query-builder-php/releases/tag/v0.4.1)
181+
```php
182+
$results = $query->selectDistinct('customers', ['city', 'country'])
183+
->orderBy('country desc')->all();
178184
```
179185
Result query
180186
```sql

docs/Select_ext.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ ORDER BY `cp`.`cab_id` ASC, `cp`.`printer_id` DESC;
7979
```
8080
### `LEFT [OUTER] JOIN`
8181
```php
82-
# LEFT JOIN
82+
// LEFT JOIN
8383
$results = $query->select('employees', ['employees.employee_id', 'employees.last_name', 'positions.title'])
8484
->join('positions', ['employees.position_id', 'positions.position_id'], "left")
8585
->all();
8686

87-
# or LEFT OUTER JOIN
87+
// or LEFT OUTER JOIN
8888
$results = $query->select('employees', ['employees.employee_id', 'employees.last_name', 'positions.title'])
8989
->join('positions', ['employees.position_id', 'positions.position_id'], "left outer")
9090
->all();
@@ -158,7 +158,7 @@ $results = $query->select('clients', ['name', 'age'])
158158
->select('employees', ['name', 'age'])
159159
->all();
160160

161-
# or
161+
// or
162162
$results = $query->select('clients', ['name', 'age'])
163163
->unionSelect('employees')
164164
->all();
@@ -176,11 +176,24 @@ $results = $query->select('clients', ['name', 'age'])
176176
->select('employees', ['name', 'age'])
177177
->all();
178178

179-
# or
179+
// or
180180
$results = $query->select('clients', ['name', 'age'])
181181
->unionSelect('employees', true)
182182
->all();
183183
```
184+
or since [v0.4.1](https://github.com/co0lc0der/simple-query-builder-php/releases/tag/v0.4.1)
185+
```php
186+
$results = $query->select('clients', ['name', 'age'])
187+
->unionAll()
188+
->select('employees', ['name', 'age'])
189+
->all();
190+
191+
192+
// or
193+
$results = $query->select('clients', ['name', 'age'])
194+
->unionSelectAll('employees')
195+
->all();
196+
```
184197
Result query
185198
```sql
186199
SELECT `name`, `age` FROM `clients`

docs/Table.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Truncate a table
44

55
**! This method will be moved into _TableBuilder_ class !**
66
```php
7-
$query->truncate('users')->go()
7+
$query->truncate('users')->go();
88
```
99
Result query
1010
```sql
@@ -15,15 +15,15 @@ TRUNCATE TABLE `users`;
1515

1616
**! This method will be moved into _TableBuilder_ class !**
1717
```php
18-
$query->drop('temporary')->go()
18+
$query->drop('temporary')->go();
1919
```
2020
Result query
2121
```sql
2222
DROP TABLE IF EXISTS `temporary`;
2323
```
2424
- Without `IF EXISTS`
2525
```php
26-
$query->drop('temporary', false)->go()
26+
$query->drop('temporary', false)->go();
2727
```
2828
Result query
2929
```sql

docs/View.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ One more example
1717
$query->select('users')
1818
->isNull('email')
1919
->createView('users_no_email')
20-
->go()
20+
->go();
2121
```
2222
Result query
2323
```sql
@@ -45,7 +45,7 @@ DROP VIEW IF EXISTS `users_no_email`;
4545
```
4646
- Without `IF EXISTS`
4747
```php
48-
$query->dropView('users_no_email', false)->go()
48+
$query->dropView('users_no_email', false)->go();
4949
```
5050
Result query
5151
```sql

0 commit comments

Comments
 (0)