Skip to content
This repository was archived by the owner on Aug 19, 2022. It is now read-only.

Commit 8c3ffd9

Browse files
josantoniusjosantonius
committed
Updated to 1.1.6 version
1 parent 580dd9c commit 8c3ffd9

6 files changed

Lines changed: 396 additions & 391 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,47 +40,58 @@
4040

4141
* Added `Josantonius\Database\Test\InsertTest` class.
4242
* Added `Josantonius\Database\Test\InsertTest->testGetConnection()` method.
43-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_Rows()` method.
44-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_ID()` method.
45-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_Statements_Rows()` method.
46-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_Statements_DataType_Rows()` method.
47-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_Duplicate_Statements_DataType_Rows()` method.
48-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_Statements_ID()` method.
49-
* Added `Josantonius\Database\Test\InsertTest->testInsertQuery_Statements_DataType_ID()` method.
50-
* Added `Josantonius\Database\Test\InsertTest->testInsertQueryTableNameError()` method.
51-
* Added `Josantonius\Database\Test\InsertTest->testInsertQueryColumnNameError()` method.
52-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Rows()` method.
53-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Statements_ID()` method.
54-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Statements_DataType_ID()` method.
55-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Marks_Statements_ID()` method.
56-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Marks_DataType_Rows()` method.
57-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethodTableNameError()` method.
58-
* Added `Josantonius\Database\Test\InsertTest->testInsertMethodColumnNameError()` method.
43+
* Added `Josantonius\Database\Test\InsertTest->testInsert_ReturnRows()` method.
44+
* Added `Josantonius\Database\Test\InsertTest->testInsert_ReturnID()` method.
45+
* Added `Josantonius\Database\Test\InsertTest->testInsert_Statements_ReturnRows()` method.
46+
* Added `Josantonius\Database\Test\InsertTest->testInsert_Statements_DataType_ReturnRows()` method.
47+
* Added `Josantonius\Database\Test\InsertTest->testInsertDuplicateEntryException()` method.
48+
* Added `Josantonius\Database\Test\InsertTest->testInsert_Statements_ReturnID()` method.
49+
* Added `Josantonius\Database\Test\InsertTest->testInsert_Statements_DataType_ReturnID()` method.
50+
* Added `Josantonius\Database\Test\InsertTest->testInsertTableNameErrorException()` method.
51+
* Added `Josantonius\Database\Test\InsertTest->testInsertColumnNameErrorException()` method.
52+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_ReturnRows()` method.
53+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Statements_ReturnID()` method.
54+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Statements_DataType_ReturnID()` method.
55+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Marks_Statements_ReturnID()` method.
56+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethod_Marks_DataType_ReturnRows()` method.
57+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethodTableNameErrorException()` method.
58+
* Added `Josantonius\Database\Test\InsertTest->testInsertMethodColumnNameErrorException()` method.
5959

6060
* Added `Josantonius\Database\Test\SelectTest` class.
6161
* Added `Josantonius\Database\Test\SelectTest->testGetConnection()` method.
62-
* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Object()` method.
63-
* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_SelectAll_Limit_Numeric()` method.
64-
* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Where_Order_Assoc()` method.
65-
* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Rows()` method.
66-
* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Statements_Where_Object()` method.
67-
* Added `Josantonius\Database\Test\SelectTest->testSelectQueryTableNamError()` method.
68-
* Added `Josantonius\Database\Test\SelectTest->testSelectQueryColumnNamError()` method.
69-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_SelectAll_Object()` method.
70-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_SelectAll_Numeric()` method.
71-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_SelectAll_Assoc()` method.
72-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Limit_Object()` method.
73-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Multiple_Where_Assoc()` method.
74-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Multiple_Where_Order_Limit_Object()` method.
75-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Order_Where_Multiple_Limit_Object()` method.
76-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Statements_Where_Multiple_Object()` method.
77-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Statements_Where_Advanced_Assoc()` method.
78-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethodWhenThereAreNoResults()` method.
79-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Where_Rows()` method.
80-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_MarksStatements_Where_Advanced()` method.
81-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Marks_DataType_Where_Advanced()` method.
82-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethodTableNameError()` method.
83-
* Added `Josantonius\Database\Test\SelectTest->testSelectMethodColumnNameError()` method.
62+
* Added `Josantonius\Database\Test\SelectTest->testQuery_Multiple_ReturnObject()` method.
63+
* Added `Josantonius\Database\Test\SelectTest->testQuery_SelectAll_Limit_ReturnArrayNumeric()` method.
64+
* Added `Josantonius\Database\Test\SelectTest->testQuery_Multiple_Where_Order_ReturnArrayAssoc()` method.
65+
* Added `Josantonius\Database\Test\SelectTest->testQuery_Multiple_ReturnRows()` method.
66+
* Added `Josantonius\Database\Test\SelectTest->testQuery_Multiple_Statements_Where_ReturnObject()` method.
67+
* Added `Josantonius\Database\Test\SelectTest->testQueryTableNamErrorException()` method.
68+
* Added `Josantonius\Database\Test\SelectTest->testQueryColumnNamErrorException()` method.
69+
* Added `Josantonius\Database\Test\SelectTest->testMethod_SelectAll_ReturnObject()` method.
70+
* Added `Josantonius\Database\Test\SelectTest->testMethod_SelectAll_Numeric()` method.
71+
* Added `Josantonius\Database\Test\SelectTest->testMethod_SelectAll_ReturnArrayAssoc()` method.
72+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Limit_ReturnObject()` method.
73+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Multiple_Where_ReturnArrayAssoc()` method.
74+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Multiple_Where_Order_Limit_ReturnObject()` method.
75+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Order_Where_Multiple_Limit_ReturnObject()` method.
76+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Statements_Where_Multiple_ReturnObject()` method.
77+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Statements_Where_Advanced_ReturnAssoc()` method.
78+
* Added `Josantonius\Database\Test\SelectTest->testMethodWhenThereAreNoResults()` method.
79+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Where_ReturnRows()` method.
80+
* Added `Josantonius\Database\Test\SelectTest->testMethod_MarksStatements_Advanced_ReturnRows()` method.
81+
* Added `Josantonius\Database\Test\SelectTest->testMethod_Marks_DataType_Where_Advanced_ReturnRows()` method.
82+
* Added `Josantonius\Database\Test\SelectTest->testMethodTableNameErrorException()` method.
83+
* Added `Josantonius\Database\Test\SelectTest->testMethodColumnNameErrorException()` method.
84+
85+
* Added `Josantonius\Database\Test\ReplaceTest` class.
86+
* Added `Josantonius\Database\Test\ReplaceTest->testGetConnection()` method.
87+
* Added `Josantonius\Database\Test\ReplaceTest->testMethod_ReturnRows()` method.
88+
* Added `Josantonius\Database\Test\ReplaceTest->testMethod_Statements_Advanced_ReturnID()` method.
89+
* Added `Josantonius\Database\Test\ReplaceTest->testMethod_Statements_DataType_Avanced_ReturnRows()` method.
90+
* Added `Josantonius\Database\Test\ReplaceTest->testMethod_MarksStatements_WhereAdvance_ReturnRows()` method.
91+
* Added `Josantonius\Database\Test\ReplaceTest->testMethod_MarksStatements_DataType_Where_ReturnID()` method.
92+
* Added `Josantonius\Database\Test\ReplaceTest->testMethodTableNameErrorException()` method.
93+
* Added `Josantonius\Database\Test\ReplaceTest->testMethodColumnNameErrorException()` method.
94+
8495

8596
## 1.1.5 - 2017-07-03
8697

‎phpunit.xml.dist‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<server name='SERVER_PORT' value='80' />
2121
<server name='HTTP_REFERER' value='https://www.google.es/' />
2222

23-
<var name="ID" value="" />
24-
<var name="DB_HOST" value="127.0.0.1" />
25-
<var name="DB_USER" value="travis" />
23+
<var name="ID" value="" />
24+
<var name="DB_HOST" value="127.0.0.1" />
25+
<var name="DB_USER" value="travis" />
2626
<var name="DB_PASSWORD" value="" />
27-
<var name="DB_NAME" value="phpunit" />
27+
<var name="DB_NAME" value="phpunit" />
2828
</php>
2929

3030
<testsuites>
@@ -34,6 +34,7 @@
3434
<file>tests/Database/Test/InsertTest.php</file>
3535
<file>tests/Database/Test/SelectTest.php</file>
3636
<file>tests/Database/Test/ReplaceTest.php</file>
37+
<file>tests/Database/Test/UpdateTest.php</file>
3738
</testsuite>
3839
</testsuites>
3940

‎tests/Database/Test/InsertTest.php‎

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testGetConnection() {
4646
*
4747
* @return void
4848
*/
49-
public function testInsertQuery_Rows($db) {
49+
public function testInsert_ReturnRows($db) {
5050

5151
$result = $db->query(
5252

@@ -66,7 +66,7 @@ public function testInsertQuery_Rows($db) {
6666
*
6767
* @return void
6868
*/
69-
public function testInsertQuery_ID($db) {
69+
public function testInsert_ReturnID($db) {
7070

7171
$result = $db->query(
7272

@@ -76,9 +76,7 @@ public function testInsertQuery_ID($db) {
7676
'id'
7777
);
7878

79-
$GLOBALS['ID'] = $result;
80-
81-
$this->assertInternalType('int', $result);
79+
$this->assertEquals(2, $result);
8280
}
8381

8482
/**
@@ -90,7 +88,7 @@ public function testInsertQuery_ID($db) {
9088
*
9189
* @return void
9290
*/
93-
public function testInsertQuery_Statements_Rows($db) {
91+
public function testInsert_Statements_ReturnRows($db) {
9492

9593
$statements[] = [":name", "Isis"];
9694
$statements[] = [":email", "isis@email.com"];
@@ -114,13 +112,9 @@ public function testInsertQuery_Statements_Rows($db) {
114112
*
115113
* @return void
116114
*/
117-
public function testInsertQuery_Statements_DataType_Rows($db) {
118-
119-
$id = rand(1, 999999);
115+
public function testInsert_Statements_DataType_ReturnRows($db) {
120116

121-
$GLOBALS['ID'] = $id;
122-
123-
$statements[] = [":id", $id, "int"];
117+
$statements[] = [":id", 3008, "int"];
124118
$statements[] = [":name", "Isis", "str"];
125119
$statements[] = [":email", "isis@email.com", "str"];
126120

@@ -147,11 +141,9 @@ public function testInsertQuery_Statements_DataType_Rows($db) {
147141
*
148142
* @return void
149143
*/
150-
public function testInsertQuery_Duplicate_Statements_DataType_Rows($db) {
151-
152-
$id = $GLOBALS['ID'];
144+
public function testInsertDuplicateEntryException($db) {
153145

154-
$statements[] = [":id", $id, "int"];
146+
$statements[] = [":id", 3008, "int"];
155147
$statements[] = [":name", "Isis", "str"];
156148
$statements[] = [":email", "isis@email.com", "str"];
157149

@@ -172,7 +164,7 @@ public function testInsertQuery_Duplicate_Statements_DataType_Rows($db) {
172164
*
173165
* @return void
174166
*/
175-
public function testInsertQuery_Statements_ID($db) {
167+
public function testInsert_Statements_ReturnID($db) {
176168

177169
$statements[] = [1, "Isis"];
178170
$statements[] = [2, "isis@email.com"];
@@ -185,9 +177,7 @@ public function testInsertQuery_Statements_ID($db) {
185177
'id'
186178
);
187179

188-
$GLOBALS['ID'] = $result;
189-
190-
$this->assertInternalType('int', $result);
180+
$this->assertEquals(3009, $result);
191181
}
192182

193183
/**
@@ -199,13 +189,9 @@ public function testInsertQuery_Statements_ID($db) {
199189
*
200190
* @return void
201191
*/
202-
public function testInsertQuery_Statements_DataType_ID($db) {
203-
204-
$id = rand(1, 999999);
205-
206-
$GLOBALS['ID'] = $id;
192+
public function testInsert_Statements_DataType_ReturnID($db) {
207193

208-
$statements[] = [1, $id, "int"];
194+
$statements[] = [1, 4883, "int"];
209195
$statements[] = [2, "Isis", "str"];
210196
$statements[] = [3, "isis@email.com", "str"];
211197

@@ -217,7 +203,7 @@ public function testInsertQuery_Statements_DataType_ID($db) {
217203
'id'
218204
);
219205

220-
$this->assertEquals($id, $result);
206+
$this->assertEquals(4883, $result);
221207
}
222208

223209
/**
@@ -233,7 +219,7 @@ public function testInsertQuery_Statements_DataType_ID($db) {
233219
*
234220
* @return void
235221
*/
236-
public function testInsertQueryTableNameError($db) {
222+
public function testInsertTableNameErrorException($db) {
237223

238224
$result = $db->query(
239225

@@ -255,7 +241,7 @@ public function testInsertQueryTableNameError($db) {
255241
*
256242
* @return void
257243
*/
258-
public function testInsertQueryColumnNameError($db) {
244+
public function testInsertColumnNameErrorException($db) {
259245

260246
$result = $db->query(
261247

@@ -273,7 +259,7 @@ public function testInsertQueryColumnNameError($db) {
273259
*
274260
* @return void
275261
*/
276-
public function testInsertMethod_Rows($db) {
262+
public function testInsertMethod_ReturnRows($db) {
277263

278264
$data = [
279265
"name" => "Isis",
@@ -297,7 +283,7 @@ public function testInsertMethod_Rows($db) {
297283
*
298284
* @return void
299285
*/
300-
public function testInsertMethod_Statements_ID($db) {
286+
public function testInsertMethod_Statements_ReturnID($db) {
301287

302288
$statements[] = [":name", "Isis", "str"];
303289
$statements[] = [":email", "isis@email.com", "str"];
@@ -312,7 +298,7 @@ public function testInsertMethod_Statements_ID($db) {
312298

313299
$result = $query->execute('id');
314300

315-
$this->assertInternalType('int', $result);
301+
$this->assertEquals(4885, $result);
316302
}
317303

318304
/**
@@ -324,7 +310,7 @@ public function testInsertMethod_Statements_ID($db) {
324310
*
325311
* @return void
326312
*/
327-
public function testInsertMethod_Statements_DataType_ID($db) {
313+
public function testInsertMethod_Statements_DataType_ReturnID($db) {
328314

329315
$statements[] = [":name", "Isis"];
330316
$statements[] = [":email", "isis@email.com"];
@@ -339,7 +325,7 @@ public function testInsertMethod_Statements_DataType_ID($db) {
339325

340326
$result = $query->execute('id');
341327

342-
$this->assertInternalType('int', $result);
328+
$this->assertEquals(4886, $result);
343329
}
344330

345331
/**
@@ -351,7 +337,7 @@ public function testInsertMethod_Statements_DataType_ID($db) {
351337
*
352338
* @return void
353339
*/
354-
public function testInsertMethod_Marks_Statements_ID($db) {
340+
public function testInsertMethod_Marks_Statements_ReturnID($db) {
355341

356342
$statements[] = [1, "Isis"];
357343
$statements[] = [2, "isis@email.com"];
@@ -366,7 +352,7 @@ public function testInsertMethod_Marks_Statements_ID($db) {
366352

367353
$result = $query->execute('id');
368354

369-
$this->assertInternalType('int', $result);
355+
$this->assertEquals(4887, $result);
370356
}
371357

372358
/**
@@ -378,7 +364,7 @@ public function testInsertMethod_Marks_Statements_ID($db) {
378364
*
379365
* @return void
380366
*/
381-
public function testInsertMethod_Marks_DataType_Rows($db) {
367+
public function testInsertMethod_Marks_DataType_ReturnRows($db) {
382368

383369
$statements[] = [1, "Isis", "str"];
384370
$statements[] = [2, "isis@email.com", "str"];
@@ -409,7 +395,7 @@ public function testInsertMethod_Marks_DataType_Rows($db) {
409395
*
410396
* @return void
411397
*/
412-
public function testInsertMethodTableNameError($db) {
398+
public function testInsertMethodTableNameErrorException($db) {
413399

414400
$data = [
415401
"name" => "Isis",
@@ -435,7 +421,7 @@ public function testInsertMethodTableNameError($db) {
435421
*
436422
* @return void
437423
*/
438-
public function testInsertMethodColumnNameError($db) {
424+
public function testInsertMethodColumnNameErrorException($db) {
439425

440426
$data = [
441427
"xxxx" => "Isis",

0 commit comments

Comments
 (0)