Skip to content

Commit 522b25e

Browse files
thekidthekid
committed
Rewrite to work without create()
See xp-framework/core#91
1 parent 6a57867 commit 522b25e

11 files changed

+119
-117
lines changed

‎src/test/php/rdbms/unittest/CriteriaTest.class.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,17 @@ public function constructorAcceptsVarArgArrays() {
183183

184184
#[@test]
185185
public function addReturnsThis() {
186-
$this->assertInstanceOf('rdbms.Criteria', create(new Criteria())->add('job_id', 1, EQUAL));
186+
$this->assertInstanceOf('rdbms.Criteria', (new Criteria())->add('job_id', 1, EQUAL));
187187
}
188188

189189
#[@test]
190190
public function addOrderByReturnsThis() {
191-
$this->assertInstanceOf('rdbms.Criteria', create(new Criteria())->add('job_id', 1, EQUAL)->addOrderBy('valid_from', DESCENDING));
191+
$this->assertInstanceOf('rdbms.Criteria', (new Criteria())->add('job_id', 1, EQUAL)->addOrderBy('valid_from', DESCENDING));
192192
}
193193

194194
#[@test]
195195
public function addGroupByReturnsThis() {
196-
$this->assertInstanceOf('rdbms.Criteria', create(new Criteria())->add('job_id', 1, EQUAL)->addGroupBy('valid_from'));
196+
$this->assertInstanceOf('rdbms.Criteria', (new Criteria())->add('job_id', 1, EQUAL)->addGroupBy('valid_from'));
197197
}
198198

199199
#[@test]
@@ -251,20 +251,20 @@ public function createNonExistantColumn() {
251251

252252
#[@test, @expect('rdbms.SQLStateException')]
253253
public function addGroupByNonExistantColumnString() {
254-
create(new Criteria())->addGroupBy('not_existant')->toSQL($this->conn, $this->peer);
254+
(new Criteria())->addGroupBy('not_existant')->toSQL($this->conn, $this->peer);
255255
}
256256

257257
#[@test]
258258
public function fetchModeChaining() {
259-
$this->assertInstanceOf('rdbms.Criteria', create(new Criteria())->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob')));
259+
$this->assertInstanceOf('rdbms.Criteria', (new Criteria())->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob')));
260260
}
261261

262262
#[@test]
263263
public function testIsJoin() {
264264
$crit= new Criteria();
265265
$this->assertFalse($crit->isJoin());
266266
$this->assertTrue($crit->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob'))->isJoin());
267-
$crit->fetchmode= array();
267+
$crit->fetchmode= [];
268268
$this->assertFalse($crit->isJoin());
269269
$this->assertFalse($crit->setFetchmode(\rdbms\join\Fetchmode::select('PersonJob'))->isJoin());
270270
}
@@ -276,7 +276,7 @@ public function testJoinWithoutCondition() {
276276
$jp->enterJoinContext();
277277
$this->assertEquals(
278278
'1 = 1',
279-
create(new Criteria())
279+
(new Criteria())
280280
->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob'))
281281
->toSQL($this->conn, $this->peer)
282282
);
@@ -290,11 +290,11 @@ public function testJoinWithCondition() {
290290
$jp->enterJoinContext();
291291
$this->assertEquals(
292292
'PersonJob_Department.department_id = 5 and start.job_id = 2',
293-
create(new Criteria())
294-
->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob'))
295-
->add(Job::column('PersonJob->Department->department_id')->equal(5))
296-
->add(Job::column('job_id')->equal(2))
297-
->toSQL($this->conn, $this->peer)
293+
(new Criteria())
294+
->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob'))
295+
->add(Job::column('PersonJob->Department->department_id')->equal(5))
296+
->add(Job::column('job_id')->equal(2))
297+
->toSQL($this->conn, $this->peer)
298298
);
299299
$jp->leaveJoinContext();
300300
}
@@ -307,13 +307,13 @@ public function testJoinWithProjection() {
307307
try {
308308
$this->assertEquals(
309309
'select PersonJob.job_id, PersonJob_Department.department_id from JOBS.job as start, JOBS.Person as PersonJob, JOBS.Department as PersonJob_Department where start.job_id *= PersonJob.job_id and PersonJob.department_id *= PersonJob_Department.department_id and 1 = 1',
310-
create(new Criteria())
311-
->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob'))
312-
->setProjection(\rdbms\criterion\Projections::projectionList()
313-
->add(Job::column('PersonJob->job_id'))
314-
->add(Job::column('PersonJob->Department->department_id'))
315-
)
316-
->getSelectQueryString($this->conn, $this->peer, $jp)
310+
(new Criteria())
311+
->setFetchmode(\rdbms\join\Fetchmode::join('PersonJob'))
312+
->setProjection(\rdbms\criterion\Projections::projectionList()
313+
->add(Job::column('PersonJob->job_id'))
314+
->add(Job::column('PersonJob->Department->department_id'))
315+
)
316+
->getSelectQueryString($this->conn, $this->peer, $jp)
317317
);
318318
} catch (\lang\Throwable $e) {
319319
// Fall through

‎src/test/php/rdbms/unittest/DSNTest.class.php

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,47 @@ class DSNTest extends \unittest\TestCase {
1313
public function stringRepresentationWithPassword() {
1414
$this->assertEquals(
1515
'rdbms.DSN@(sybase://sa:********@localhost:1999/CAFFEINE?autoconnect=1)',
16-
create(new DSN('sybase://sa:password@localhost:1999/CAFFEINE?autoconnect=1'))->toString()
16+
(new DSN('sybase://sa:password@localhost:1999/CAFFEINE?autoconnect=1'))->toString()
1717
);
1818
}
1919

2020
#[@test]
2121
public function stringRepresentationWithoutPassword() {
2222
$this->assertEquals(
2323
'rdbms.DSN@(mysql://root@localhost/?log=default)',
24-
create(new DSN('mysql://root@localhost/?log=default'))->toString()
24+
(new DSN('mysql://root@localhost/?log=default'))->toString()
2525
);
2626
}
2727

2828
#[@test]
2929
public function asStringRemovesPassword() {
3030
$this->assertEquals(
3131
'mysql://user:********@localhost/?log=default',
32-
create(new DSN('mysql://user:foobar@localhost/?log=default'))->asString()
32+
(new DSN('mysql://user:foobar@localhost/?log=default'))->asString()
3333
);
3434
}
3535

3636
#[@test]
3737
public function asStringKeepsPasswordIfRequested() {
3838
$this->assertEquals(
3939
'mysql://user:foobar@localhost/?log=default',
40-
create(new DSN('mysql://user:foobar@localhost/?log=default'))->asString(true)
40+
(new DSN('mysql://user:foobar@localhost/?log=default'))->asString(true)
4141
);
4242
}
4343

4444
#[@test]
4545
public function asStringSkipsUserEvenWithRaw() {
4646
$this->assertEquals(
4747
'mysql://localhost/?log=default',
48-
create(new DSN('mysql://localhost/?log=default'))->asString(true)
48+
(new DSN('mysql://localhost/?log=default'))->asString(true)
4949
);
5050
}
5151

5252
#[@test]
5353
public function driver() {
5454
$this->assertEquals(
5555
'sybase',
56-
create(new DSN('sybase://TEST/'))->getDriver()
56+
(new DSN('sybase://TEST/'))->getDriver()
5757
);
5858
}
5959

@@ -66,173 +66,173 @@ public function noDriver() {
6666
public function host() {
6767
$this->assertEquals(
6868
'TEST',
69-
create(new DSN('sybase://TEST/'))->getHost()
69+
(new DSN('sybase://TEST/'))->getHost()
7070
);
7171
}
7272

7373
#[@test]
7474
public function port() {
7575
$this->assertEquals(
7676
1999,
77-
create(new DSN('sybase://TEST:1999/'))->getPort()
77+
(new DSN('sybase://TEST:1999/'))->getPort()
7878
);
7979
}
8080

8181
#[@test]
8282
public function portDefault() {
8383
$this->assertEquals(
8484
1999,
85-
create(new DSN('sybase://TEST:1999/'))->getPort(5000)
85+
(new DSN('sybase://TEST:1999/'))->getPort(5000)
8686
);
8787
}
8888

8989
#[@test]
9090
public function noPort() {
91-
$this->assertNull(create(new DSN('sybase://TEST/'))->getPort());
91+
$this->assertNull((new DSN('sybase://TEST/'))->getPort());
9292
}
9393

9494
#[@test]
9595
public function noPortDefault() {
9696
$this->assertEquals(
9797
1999,
98-
create(new DSN('sybase://TEST/'))->getPort(1999)
98+
(new DSN('sybase://TEST/'))->getPort(1999)
9999
);
100100
}
101101

102102
#[@test]
103103
public function database() {
104104
$this->assertEquals(
105105
'CAFFEINE',
106-
create(new DSN('sybase://TEST/CAFFEINE'))->getDatabase()
106+
(new DSN('sybase://TEST/CAFFEINE'))->getDatabase()
107107
);
108108
}
109109

110110
#[@test]
111111
public function databaseDefault() {
112112
$this->assertEquals(
113113
'CAFFEINE',
114-
create(new DSN('sybase://TEST/CAFFEINE'))->getDatabase('master')
114+
(new DSN('sybase://TEST/CAFFEINE'))->getDatabase('master')
115115
);
116116
}
117117

118118
#[@test]
119119
public function noDatabase() {
120-
$this->assertNull(create(new DSN('mysql://root@localhost'))->getDatabase());
120+
$this->assertNull((new DSN('mysql://root@localhost'))->getDatabase());
121121
}
122122

123123
#[@test]
124124
public function noDatabaseDefault() {
125125
$this->assertEquals(
126126
'master',
127-
create(new DSN('mysql://root@localhost'))->getDatabase('master')
127+
(new DSN('mysql://root@localhost'))->getDatabase('master')
128128
);
129129
}
130130

131131
#[@test]
132132
public function slashDatabase() {
133-
$this->assertNull(create(new DSN('mysql://root@localhost/'))->getDatabase());
133+
$this->assertNull((new DSN('mysql://root@localhost/'))->getDatabase());
134134
}
135135

136136
#[@test]
137137
public function slashDatabaseDefault() {
138138
$this->assertEquals(
139139
'master',
140-
create(new DSN('mysql://root@localhost/'))->getDatabase('master')
140+
(new DSN('mysql://root@localhost/'))->getDatabase('master')
141141
);
142142
}
143143

144144
#[@test]
145145
public function fileDatabase() {
146146
$this->assertEquals(
147147
'/usr/local/fb/jobs.fdb',
148-
create(new DSN('ibase://localhost//usr/local/fb/jobs.fdb'))->getDatabase()
148+
(new DSN('ibase://localhost//usr/local/fb/jobs.fdb'))->getDatabase()
149149
);
150150
}
151151

152152
#[@test]
153153
public function user() {
154154
$this->assertEquals(
155155
'sa',
156-
create(new DSN('sybase://sa@TEST'))->getUser()
156+
(new DSN('sybase://sa@TEST'))->getUser()
157157
);
158158
}
159159

160160
#[@test]
161161
public function userDefault() {
162162
$this->assertEquals(
163163
'sa',
164-
create(new DSN('sybase://sa@TEST'))->getUser('reader')
164+
(new DSN('sybase://sa@TEST'))->getUser('reader')
165165
);
166166
}
167167

168168
#[@test]
169169
public function noUser() {
170-
$this->assertNull(create(new DSN('sybase://TEST'))->getUser());
170+
$this->assertNull((new DSN('sybase://TEST'))->getUser());
171171
}
172172

173173
#[@test]
174174
public function noUserDefault() {
175175
$this->assertEquals(
176176
'reader',
177-
create(new DSN('sybase://TEST'))->getUser('reader')
177+
(new DSN('sybase://TEST'))->getUser('reader')
178178
);
179179
}
180180

181181
#[@test]
182182
public function password() {
183183
$this->assertEquals(
184184
'password',
185-
create(new DSN('sybase://sa:password@TEST'))->getPassword()
185+
(new DSN('sybase://sa:password@TEST'))->getPassword()
186186
);
187187
}
188188

189189
#[@test]
190190
public function passwordDefault() {
191191
$this->assertEquals(
192192
'password',
193-
create(new DSN('sybase://sa:password@TEST'))->getPassword('secret')
193+
(new DSN('sybase://sa:password@TEST'))->getPassword('secret')
194194
);
195195
}
196196

197197
#[@test]
198198
public function noPassword() {
199-
$this->assertNull(create(new DSN('sybase://sa@TEST'))->getPassword());
199+
$this->assertNull((new DSN('sybase://sa@TEST'))->getPassword());
200200
}
201201

202202
#[@test]
203203
public function noPasswordDefault() {
204204
$this->assertEquals(
205205
'secret',
206-
create(new DSN('sybase://sa@TEST'))->getPassword('secret')
206+
(new DSN('sybase://sa@TEST'))->getPassword('secret')
207207
);
208208
}
209209

210210
#[@test]
211211
public function noFlags() {
212-
$this->assertEquals(0, create(new DSN('sybase://sa@TEST'))->getFlags());
212+
$this->assertEquals(0, (new DSN('sybase://sa@TEST'))->getFlags());
213213
}
214214

215215
#[@test]
216216
public function definedFlags() {
217217
$this->assertEquals(
218218
DB_AUTOCONNECT,
219-
create(new DSN('sybase://sa@TEST?autoconnect=1'))->getFlags()
219+
(new DSN('sybase://sa@TEST?autoconnect=1'))->getFlags()
220220
);
221221
}
222222

223223
#[@test]
224224
public function stringPropertyValue() {
225225
$this->assertEquals(
226226
'default',
227-
create(new DSN('sybase://sa@TEST?log=default'))->getProperty('log')
227+
(new DSN('sybase://sa@TEST?log=default'))->getProperty('log')
228228
);
229229
}
230230

231231
#[@test]
232232
public function arrayPropertyValue() {
233233
$this->assertEquals(
234234
array('util.log.LogObserver' => 'default'),
235-
create(new DSN('pgsql://postgres:1433/db?observer[util.log.LogObserver]=default'))->getProperty('observer')
235+
(new DSN('pgsql://postgres:1433/db?observer[util.log.LogObserver]=default'))->getProperty('observer')
236236
);
237237
}
238238

‎src/test/php/rdbms/unittest/FinderTest.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public function genericFinderGetAll() {
335335
'expire_at' => null
336336
)
337337
)));
338-
$all= create(new GenericFinder(Job::getPeer()))->getAll(new \rdbms\Criteria());
338+
$all= (new GenericFinder(Job::getPeer()))->getAll(new \rdbms\Criteria());
339339
$this->assertEquals(2, sizeof($all));
340340
$this->assertInstanceOf('rdbms.unittest.dataset.Job', $all[0]);
341341
$this->assertInstanceOf('rdbms.unittest.dataset.Job', $all[1]);

‎src/test/php/rdbms/unittest/JoinIteratorTest.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public static function registerConnection() {
3030

3131
#[@test, @expect('util.NoSuchElementException')]
3232
public function emptyResultNextTest() {
33-
create(new JoinIterator(new JoinProcessor(Job::getPeer()), new MockResultSet()))->next();
33+
(new JoinIterator(new JoinProcessor(Job::getPeer()), new MockResultSet()))->next();
3434
}
3535

3636
#[@test]
3737
public function emptyResultHasNextTest() {
38-
$this->assertFalse(create(new JoinIterator(new JoinProcessor(Job::getPeer()), new MockResultSet()))->hasNext());
38+
$this->assertFalse((new JoinIterator(new JoinProcessor(Job::getPeer()), new MockResultSet()))->hasNext());
3939
}
4040

4141
#[@test]

0 commit comments

Comments
 (0)