Updated to 1.1.6 version

Author: josantonius

CHANGELOG.md

@@ -57,6 +57,31 @@
 * Added `Josantonius\Database\Test\InsertTest->testInsertMethodTableNameError()` method.
 * Added `Josantonius\Database\Test\InsertTest->testInsertMethodColumnNameError()` method.
 
+* Added `Josantonius\Database\Test\SelectTest` class.
+* Added `Josantonius\Database\Test\SelectTest->testGetConnection()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_SelectAll_Limit_Numeric()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Where_Order_Assoc()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Rows()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQuery_Multiple_Statements_Where_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQueryTableNamError()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectQueryColumnNamError()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_SelectAll_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_SelectAll_Numeric()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_SelectAll_Assoc()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Limit_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Multiple_Where_Assoc()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Multiple_Where_Order_Limit_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Order_Where_Multiple_Limit_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Statements_Where_Multiple_Object()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Statements_Where_Advanced_Assoc()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethodWhenThereAreNoResults()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Where_Rows()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_MarksStatements_Where_Advanced()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethod_Marks_DataType_Where_Advanced()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethodTableNameError()` method.
+* Added `Josantonius\Database\Test\SelectTest->testSelectMethodColumnNameError()` method.
+
 ## 1.1.5 - 2017-07-03
 
 * Bug fix in replace method.

phpunit.xml.dist

@@ -19,7 +19,8 @@
         <server name='DOCUMENT_ROOT'   value='/var/www/josantonius/public' />
         <server name='SERVER_PORT'     value='80' />
         <server name='HTTP_REFERER'    value='https://www.google.es/' />
-
+        
+        <var name="ID" value="" />
         <var name="DB_HOST" value="127.0.0.1" />
         <var name="DB_USER" value="travis" />
         <var name="DB_PASSWORD" value="" />
@@ -32,6 +33,7 @@
             <file>tests/Database/Test/CreateTest.php</file>
             <file>tests/Database/Test/InsertTest.php</file>
             <file>tests/Database/Test/SelectTest.php</file>
+            <file>tests/Database/Test/ReplaceTest.php</file>
         </testsuite>
     </testsuites>
 

src/Database/Provider/PDOprovider/PDOprovider.php

@@ -380,7 +380,7 @@ public function replace($table, $data, $statements) {
 
         $columnIdName = $columns[0];
 
-        if ($statements && isset($statements[0][1])) {
+        if (count($data) == count($statements) && isset($statements[0][1])) {
 
             $id = $statements[0][1];
 

tests/Database/Test/InsertTest.php

@@ -74,7 +74,9 @@ public function testInsertQuery_ID($db) {
              VALUES ("Isis", "isis@email.com")', 
              false,
              'id'
-         );
+        );
+
+        $GLOBALS['ID'] = $result;
 
         $this->assertInternalType('int', $result);
     }
@@ -114,7 +116,11 @@ public function testInsertQuery_Statements_Rows($db) {
      */
     public function testInsertQuery_Statements_DataType_Rows($db) {
 
-        $statements[] = [":id",    100,              "int"];
+        $id = rand(1, 999999);
+
+        $GLOBALS['ID'] = $id;
+
+        $statements[] = [":id",    $id,              "int"];
         $statements[] = [":name",  "Isis",           "str"];
         $statements[] = [":email", "isis@email.com", "str"];
 
@@ -143,7 +149,9 @@ public function testInsertQuery_Statements_DataType_Rows($db) {
      */
     public function testInsertQuery_Duplicate_Statements_DataType_Rows($db) {
 
-        $statements[] = [":id",    100,              "int"];
+        $id = $GLOBALS['ID'];
+
+        $statements[] = [":id",    $id,              "int"];
         $statements[] = [":name",  "Isis",           "str"];
         $statements[] = [":email", "isis@email.com", "str"];
 
@@ -177,6 +185,8 @@ public function testInsertQuery_Statements_ID($db) {
              'id'
         );
 
+        $GLOBALS['ID'] = $result;
+
         $this->assertInternalType('int', $result);
     }
 
@@ -191,7 +201,11 @@ public function testInsertQuery_Statements_ID($db) {
      */
     public function testInsertQuery_Statements_DataType_ID($db) {
 
-        $statements[] = [1, 200,              "int"];
+        $id = rand(1, 999999);
+
+        $GLOBALS['ID'] = $id;
+
+        $statements[] = [1, $id,              "int"];
         $statements[] = [2, "Isis",           "str"];
         $statements[] = [3, "isis@email.com", "str"];
 
@@ -203,7 +217,7 @@ public function testInsertQuery_Statements_DataType_ID($db) {
              'id'
         );
 
-        $this->assertEquals(200, $result);
+        $this->assertEquals($id, $result);
     }
 
     /**