@@ -148,7 +148,7 @@ |
||
148 | 148 | |
149 | 149 | $driverMock = $this->createMock('Doctrine\DBAL\Driver'); |
150 | 150 | $driverMock->expects(($this->at(0))) |
151 | - ->method('connect'); |
|
151 | + ->method('connect'); |
|
152 | 152 | $platform = new Mocks\MockPlatform(); |
153 | 153 | |
154 | 154 | $conn = new Connection(array('platform' => $platform), $driverMock, new Configuration(), $eventManager); |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | $expressionBuilder = new ExpressionBuilder($this->conn); |
24 | 24 | |
25 | 25 | $this->conn->expects($this->any()) |
26 | - ->method('getExpressionBuilder') |
|
27 | - ->will($this->returnValue($expressionBuilder)); |
|
26 | + ->method('getExpressionBuilder') |
|
27 | + ->will($this->returnValue($expressionBuilder)); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $qb = new QueryBuilder($this->conn); |
45 | 45 | |
46 | 46 | $qb->select('u.id') |
47 | - ->from('users', 'u'); |
|
47 | + ->from('users', 'u'); |
|
48 | 48 | |
49 | 49 | self::assertEquals('SELECT u.id FROM users u', (string) $qb); |
50 | 50 | } |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | $expr = $qb->expr(); |
56 | 56 | |
57 | 57 | $qb->select('u.id') |
58 | - ->from('users', 'u') |
|
59 | - ->where($expr->andX($expr->eq('u.nickname', '?'))); |
|
58 | + ->from('users', 'u') |
|
59 | + ->where($expr->andX($expr->eq('u.nickname', '?'))); |
|
60 | 60 | |
61 | 61 | self::assertEquals("SELECT u.id FROM users u WHERE u.nickname = ?", (string) $qb); |
62 | 62 | } |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | $expr = $qb->expr(); |
68 | 68 | |
69 | 69 | $qb->select('u.*', 'p.*') |
70 | - ->from('users', 'u') |
|
71 | - ->leftJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
70 | + ->from('users', 'u') |
|
71 | + ->leftJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
72 | 72 | |
73 | 73 | self::assertEquals('SELECT u.*, p.* FROM users u LEFT JOIN phones p ON p.user_id = u.id', (string) $qb); |
74 | 74 | } |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | $expr = $qb->expr(); |
80 | 80 | |
81 | 81 | $qb->select('u.*', 'p.*') |
82 | - ->from('users', 'u') |
|
83 | - ->Join('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
82 | + ->from('users', 'u') |
|
83 | + ->Join('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
84 | 84 | |
85 | 85 | self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p ON p.user_id = u.id', (string) $qb); |
86 | 86 | } |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | $expr = $qb->expr(); |
92 | 92 | |
93 | 93 | $qb->select('u.*', 'p.*') |
94 | - ->from('users', 'u') |
|
95 | - ->innerJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
94 | + ->from('users', 'u') |
|
95 | + ->innerJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
96 | 96 | |
97 | 97 | self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p ON p.user_id = u.id', (string) $qb); |
98 | 98 | } |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | $expr = $qb->expr(); |
104 | 104 | |
105 | 105 | $qb->select('u.*', 'p.*') |
106 | - ->from('users', 'u') |
|
107 | - ->rightJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
106 | + ->from('users', 'u') |
|
107 | + ->rightJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id')); |
|
108 | 108 | |
109 | 109 | self::assertEquals('SELECT u.*, p.* FROM users u RIGHT JOIN phones p ON p.user_id = u.id', (string) $qb); |
110 | 110 | } |
@@ -115,9 +115,9 @@ discard block |
||
115 | 115 | $expr = $qb->expr(); |
116 | 116 | |
117 | 117 | $qb->select('u.*', 'p.*') |
118 | - ->from('users', 'u') |
|
119 | - ->where('u.username = ?') |
|
120 | - ->andWhere('u.name = ?'); |
|
118 | + ->from('users', 'u') |
|
119 | + ->where('u.username = ?') |
|
120 | + ->andWhere('u.name = ?'); |
|
121 | 121 | |
122 | 122 | self::assertEquals('SELECT u.*, p.* FROM users u WHERE (u.username = ?) AND (u.name = ?)', (string) $qb); |
123 | 123 | } |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | $expr = $qb->expr(); |
129 | 129 | |
130 | 130 | $qb->select('u.*', 'p.*') |
131 | - ->from('users', 'u') |
|
132 | - ->where('u.username = ?') |
|
133 | - ->orWhere('u.name = ?'); |
|
131 | + ->from('users', 'u') |
|
132 | + ->where('u.username = ?') |
|
133 | + ->orWhere('u.name = ?'); |
|
134 | 134 | |
135 | 135 | self::assertEquals('SELECT u.*, p.* FROM users u WHERE (u.username = ?) OR (u.name = ?)', (string) $qb); |
136 | 136 | } |
@@ -141,9 +141,9 @@ discard block |
||
141 | 141 | $expr = $qb->expr(); |
142 | 142 | |
143 | 143 | $qb->select('u.*', 'p.*') |
144 | - ->from('users', 'u') |
|
145 | - ->orWhere('u.username = ?') |
|
146 | - ->orWhere('u.name = ?'); |
|
144 | + ->from('users', 'u') |
|
145 | + ->orWhere('u.username = ?') |
|
146 | + ->orWhere('u.name = ?'); |
|
147 | 147 | |
148 | 148 | self::assertEquals('SELECT u.*, p.* FROM users u WHERE (u.username = ?) OR (u.name = ?)', (string) $qb); |
149 | 149 | } |
@@ -154,11 +154,11 @@ discard block |
||
154 | 154 | $expr = $qb->expr(); |
155 | 155 | |
156 | 156 | $qb->select('u.*', 'p.*') |
157 | - ->from('users', 'u') |
|
158 | - ->where('u.username = ?') |
|
159 | - ->andWhere('u.username = ?') |
|
160 | - ->orWhere('u.name = ?') |
|
161 | - ->andWhere('u.name = ?'); |
|
157 | + ->from('users', 'u') |
|
158 | + ->where('u.username = ?') |
|
159 | + ->andWhere('u.username = ?') |
|
160 | + ->orWhere('u.name = ?') |
|
161 | + ->andWhere('u.name = ?'); |
|
162 | 162 | |
163 | 163 | self::assertEquals('SELECT u.*, p.* FROM users u WHERE (((u.username = ?) AND (u.username = ?)) OR (u.name = ?)) AND (u.name = ?)', (string) $qb); |
164 | 164 | } |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | $expr = $qb->expr(); |
170 | 170 | |
171 | 171 | $qb->select('u.*', 'p.*') |
172 | - ->from('users', 'u') |
|
173 | - ->groupBy('u.id'); |
|
172 | + ->from('users', 'u') |
|
173 | + ->groupBy('u.id'); |
|
174 | 174 | |
175 | 175 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id', (string) $qb); |
176 | 176 | } |
@@ -181,8 +181,8 @@ discard block |
||
181 | 181 | $expr = $qb->expr(); |
182 | 182 | |
183 | 183 | $qb->select('u.*', 'p.*') |
184 | - ->groupBy(array()) |
|
185 | - ->from('users', 'u'); |
|
184 | + ->groupBy(array()) |
|
185 | + ->from('users', 'u'); |
|
186 | 186 | |
187 | 187 | self::assertEquals('SELECT u.*, p.* FROM users u', (string) $qb); |
188 | 188 | } |
@@ -193,8 +193,8 @@ discard block |
||
193 | 193 | $expr = $qb->expr(); |
194 | 194 | |
195 | 195 | $qb->select('u.*', 'p.*') |
196 | - ->addGroupBy(array()) |
|
197 | - ->from('users', 'u'); |
|
196 | + ->addGroupBy(array()) |
|
197 | + ->from('users', 'u'); |
|
198 | 198 | |
199 | 199 | self::assertEquals('SELECT u.*, p.* FROM users u', (string) $qb); |
200 | 200 | } |
@@ -205,9 +205,9 @@ discard block |
||
205 | 205 | $expr = $qb->expr(); |
206 | 206 | |
207 | 207 | $qb->select('u.*', 'p.*') |
208 | - ->from('users', 'u') |
|
209 | - ->groupBy('u.id') |
|
210 | - ->addGroupBy('u.foo'); |
|
208 | + ->from('users', 'u') |
|
209 | + ->groupBy('u.id') |
|
210 | + ->addGroupBy('u.foo'); |
|
211 | 211 | |
212 | 212 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id, u.foo', (string) $qb); |
213 | 213 | } |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | $expr = $qb->expr(); |
219 | 219 | |
220 | 220 | $qb->select('u.*', 'p.*') |
221 | - ->from('users', 'u') |
|
222 | - ->groupBy('u.id') |
|
223 | - ->addGroupBy('u.foo', 'u.bar'); |
|
221 | + ->from('users', 'u') |
|
222 | + ->groupBy('u.id') |
|
223 | + ->addGroupBy('u.foo', 'u.bar'); |
|
224 | 224 | |
225 | 225 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id, u.foo, u.bar', (string) $qb); |
226 | 226 | } |
@@ -231,9 +231,9 @@ discard block |
||
231 | 231 | $expr = $qb->expr(); |
232 | 232 | |
233 | 233 | $qb->select('u.*', 'p.*') |
234 | - ->from('users', 'u') |
|
235 | - ->groupBy('u.id') |
|
236 | - ->having('u.name = ?'); |
|
234 | + ->from('users', 'u') |
|
235 | + ->groupBy('u.id') |
|
236 | + ->having('u.name = ?'); |
|
237 | 237 | |
238 | 238 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id HAVING u.name = ?', (string) $qb); |
239 | 239 | } |
@@ -244,9 +244,9 @@ discard block |
||
244 | 244 | $expr = $qb->expr(); |
245 | 245 | |
246 | 246 | $qb->select('u.*', 'p.*') |
247 | - ->from('users', 'u') |
|
248 | - ->groupBy('u.id') |
|
249 | - ->andHaving('u.name = ?'); |
|
247 | + ->from('users', 'u') |
|
248 | + ->groupBy('u.id') |
|
249 | + ->andHaving('u.name = ?'); |
|
250 | 250 | |
251 | 251 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id HAVING u.name = ?', (string) $qb); |
252 | 252 | } |
@@ -257,10 +257,10 @@ discard block |
||
257 | 257 | $expr = $qb->expr(); |
258 | 258 | |
259 | 259 | $qb->select('u.*', 'p.*') |
260 | - ->from('users', 'u') |
|
261 | - ->groupBy('u.id') |
|
262 | - ->having('u.name = ?') |
|
263 | - ->andHaving('u.username = ?'); |
|
260 | + ->from('users', 'u') |
|
261 | + ->groupBy('u.id') |
|
262 | + ->having('u.name = ?') |
|
263 | + ->andHaving('u.username = ?'); |
|
264 | 264 | |
265 | 265 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id HAVING (u.name = ?) AND (u.username = ?)', (string) $qb); |
266 | 266 | } |
@@ -271,10 +271,10 @@ discard block |
||
271 | 271 | $expr = $qb->expr(); |
272 | 272 | |
273 | 273 | $qb->select('u.*', 'p.*') |
274 | - ->from('users', 'u') |
|
275 | - ->groupBy('u.id') |
|
276 | - ->having('u.name = ?') |
|
277 | - ->orHaving('u.username = ?'); |
|
274 | + ->from('users', 'u') |
|
275 | + ->groupBy('u.id') |
|
276 | + ->having('u.name = ?') |
|
277 | + ->orHaving('u.username = ?'); |
|
278 | 278 | |
279 | 279 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id HAVING (u.name = ?) OR (u.username = ?)', (string) $qb); |
280 | 280 | } |
@@ -285,10 +285,10 @@ discard block |
||
285 | 285 | $expr = $qb->expr(); |
286 | 286 | |
287 | 287 | $qb->select('u.*', 'p.*') |
288 | - ->from('users', 'u') |
|
289 | - ->groupBy('u.id') |
|
290 | - ->orHaving('u.name = ?') |
|
291 | - ->orHaving('u.username = ?'); |
|
288 | + ->from('users', 'u') |
|
289 | + ->groupBy('u.id') |
|
290 | + ->orHaving('u.name = ?') |
|
291 | + ->orHaving('u.username = ?'); |
|
292 | 292 | |
293 | 293 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id HAVING (u.name = ?) OR (u.username = ?)', (string) $qb); |
294 | 294 | } |
@@ -299,11 +299,11 @@ discard block |
||
299 | 299 | $expr = $qb->expr(); |
300 | 300 | |
301 | 301 | $qb->select('u.*', 'p.*') |
302 | - ->from('users', 'u') |
|
303 | - ->groupBy('u.id') |
|
304 | - ->having('u.name = ?') |
|
305 | - ->orHaving('u.username = ?') |
|
306 | - ->andHaving('u.username = ?'); |
|
302 | + ->from('users', 'u') |
|
303 | + ->groupBy('u.id') |
|
304 | + ->having('u.name = ?') |
|
305 | + ->orHaving('u.username = ?') |
|
306 | + ->andHaving('u.username = ?'); |
|
307 | 307 | |
308 | 308 | self::assertEquals('SELECT u.*, p.* FROM users u GROUP BY u.id HAVING ((u.name = ?) OR (u.username = ?)) AND (u.username = ?)', (string) $qb); |
309 | 309 | } |
@@ -314,8 +314,8 @@ discard block |
||
314 | 314 | $expr = $qb->expr(); |
315 | 315 | |
316 | 316 | $qb->select('u.*', 'p.*') |
317 | - ->from('users', 'u') |
|
318 | - ->orderBy('u.name'); |
|
317 | + ->from('users', 'u') |
|
318 | + ->orderBy('u.name'); |
|
319 | 319 | |
320 | 320 | self::assertEquals('SELECT u.*, p.* FROM users u ORDER BY u.name ASC', (string) $qb); |
321 | 321 | } |
@@ -326,9 +326,9 @@ discard block |
||
326 | 326 | $expr = $qb->expr(); |
327 | 327 | |
328 | 328 | $qb->select('u.*', 'p.*') |
329 | - ->from('users', 'u') |
|
330 | - ->orderBy('u.name') |
|
331 | - ->addOrderBy('u.username', 'DESC'); |
|
329 | + ->from('users', 'u') |
|
330 | + ->orderBy('u.name') |
|
331 | + ->addOrderBy('u.username', 'DESC'); |
|
332 | 332 | |
333 | 333 | self::assertEquals('SELECT u.*, p.* FROM users u ORDER BY u.name ASC, u.username DESC', (string) $qb); |
334 | 334 | } |
@@ -339,9 +339,9 @@ discard block |
||
339 | 339 | $expr = $qb->expr(); |
340 | 340 | |
341 | 341 | $qb->select('u.*', 'p.*') |
342 | - ->from('users', 'u') |
|
343 | - ->addOrderBy('u.name') |
|
344 | - ->addOrderBy('u.username', 'DESC'); |
|
342 | + ->from('users', 'u') |
|
343 | + ->addOrderBy('u.name') |
|
344 | + ->addOrderBy('u.username', 'DESC'); |
|
345 | 345 | |
346 | 346 | self::assertEquals('SELECT u.*, p.* FROM users u ORDER BY u.name ASC, u.username DESC', (string) $qb); |
347 | 347 | } |
@@ -361,8 +361,8 @@ discard block |
||
361 | 361 | $expr = $qb->expr(); |
362 | 362 | |
363 | 363 | $qb->select('u.*') |
364 | - ->addSelect('p.*') |
|
365 | - ->from('users', 'u'); |
|
364 | + ->addSelect('p.*') |
|
365 | + ->from('users', 'u'); |
|
366 | 366 | |
367 | 367 | self::assertEquals('SELECT u.*, p.* FROM users u', (string) $qb); |
368 | 368 | } |
@@ -382,9 +382,9 @@ discard block |
||
382 | 382 | $expr = $qb->expr(); |
383 | 383 | |
384 | 384 | $qb->select('u.*') |
385 | - ->addSelect('p.*') |
|
386 | - ->from('users', 'u') |
|
387 | - ->from('phonenumbers', 'p'); |
|
385 | + ->addSelect('p.*') |
|
386 | + ->from('users', 'u') |
|
387 | + ->from('phonenumbers', 'p'); |
|
388 | 388 | |
389 | 389 | self::assertEquals('SELECT u.*, p.* FROM users u, phonenumbers p', (string) $qb); |
390 | 390 | } |
@@ -393,8 +393,8 @@ discard block |
||
393 | 393 | { |
394 | 394 | $qb = new QueryBuilder($this->conn); |
395 | 395 | $qb->update('users', 'u') |
396 | - ->set('u.foo', '?') |
|
397 | - ->set('u.bar', '?'); |
|
396 | + ->set('u.foo', '?') |
|
397 | + ->set('u.bar', '?'); |
|
398 | 398 | |
399 | 399 | self::assertEquals(QueryBuilder::UPDATE, $qb->getType()); |
400 | 400 | self::assertEquals('UPDATE users u SET u.foo = ?, u.bar = ?', (string) $qb); |
@@ -404,8 +404,8 @@ discard block |
||
404 | 404 | { |
405 | 405 | $qb = new QueryBuilder($this->conn); |
406 | 406 | $qb->update('users') |
407 | - ->set('foo', '?') |
|
408 | - ->set('bar', '?'); |
|
407 | + ->set('foo', '?') |
|
408 | + ->set('bar', '?'); |
|
409 | 409 | |
410 | 410 | self::assertEquals('UPDATE users SET foo = ?, bar = ?', (string) $qb); |
411 | 411 | } |
@@ -414,8 +414,8 @@ discard block |
||
414 | 414 | { |
415 | 415 | $qb = new QueryBuilder($this->conn); |
416 | 416 | $qb->update('users', 'u') |
417 | - ->set('u.foo', '?') |
|
418 | - ->where('u.foo = ?'); |
|
417 | + ->set('u.foo', '?') |
|
418 | + ->where('u.foo = ?'); |
|
419 | 419 | |
420 | 420 | self::assertEquals('UPDATE users u SET u.foo = ? WHERE u.foo = ?', (string) $qb); |
421 | 421 | } |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | { |
452 | 452 | $qb = new QueryBuilder($this->conn); |
453 | 453 | $qb->delete('users', 'u') |
454 | - ->where('u.foo = ?'); |
|
454 | + ->where('u.foo = ?'); |
|
455 | 455 | |
456 | 456 | self::assertEquals('DELETE FROM users u WHERE u.foo = ?', (string) $qb); |
457 | 457 | } |
@@ -22,8 +22,8 @@ |
||
22 | 22 | $this->expr = new ExpressionBuilder($conn); |
23 | 23 | |
24 | 24 | $conn->expects($this->any()) |
25 | - ->method('getExpressionBuilder') |
|
26 | - ->will($this->returnValue($this->expr)); |
|
25 | + ->method('getExpressionBuilder') |
|
26 | + ->will($this->returnValue($this->expr)); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |