[#14080] - Fixed array to string conversion for delete

phalcon · Jul 6, 2019 · 467ec6b · 467ec6b
1 parent 35163a4
commit 467ec6b
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 4 deletions.
diff --git a/phalcon/Db/Adapter/AbstractAdapter.zep b/phalcon/Db/Adapter/AbstractAdapter.zep
@@ -263,7 +263,7 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
      * DELETE FROM `robots` WHERE `id` = 101
      * ```
      */
-    public function delete(string table, var whereCondition = null, var placeholders = null, var dataTypes = null) -> bool
+    public function delete(var table, var whereCondition = null, var placeholders = null, var dataTypes = null) -> bool
     {
         var sql, escapedTable;
 

diff --git a/phalcon/Db/Adapter/AdapterInterface.zep b/phalcon/Db/Adapter/AdapterInterface.zep
@@ -86,7 +86,7 @@ interface AdapterInterface
     /**
      * Deletes data from a table using custom RDBMS SQL syntax
      */
-    public function delete(string table, whereCondition = null, placeholders = null, dataTypes = null) -> bool;
+    public function delete(var table, whereCondition = null, placeholders = null, dataTypes = null) -> bool;
 
     /**
      * Returns an array of Phalcon\Db\Column objects describing a table

diff --git a/tests/integration/Mvc/Model/CreateCest.php b/tests/integration/Mvc/Model/CreateCest.php
@@ -13,12 +13,17 @@
 namespace Phalcon\Test\Integration\Mvc\Model;
 
 use IntegrationTester;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Models\AlbumORama\Artists;
+use function uniqid;
 
 /**
  * Class CreateCest
  */
 class CreateCest
 {
+    use DiTrait;
+
     /**
      * Tests Phalcon\Mvc\Model :: create()
      *
@@ -28,6 +33,35 @@ class CreateCest
     public function mvcModelCreate(IntegrationTester $I)
     {
         $I->wantToTest('Mvc\Model - create()');
-        $I->skipTest('Need implementation');
+
+        $this->setNewFactoryDefault();
+
+        $name = uniqid();
+
+        // MySql
+        $this->setDiMysql();
+
+        $artist = new Artists();
+        $artist->name = $name;
+        $result = $artist->save();
+
+        $I->assertNotFalse($result);
+
+        $result = $artist->delete();
+
+        $I->assertNotFalse($result);
+
+        // Postgresql
+        $this->setDiPostgresql();
+
+        $artist = new Artists();
+        $artist->name = $name;
+        $result = $artist->save();
+
+        $I->assertNotFalse($result);
+
+        $result = $artist->delete();
+
+        $I->assertNotFalse($result);
     }
 }
diff --git a/tests/integration/Mvc/Model/DeleteCest.php b/tests/integration/Mvc/Model/DeleteCest.php
@@ -13,12 +13,17 @@
 namespace Phalcon\Test\Integration\Mvc\Model;
 
 use IntegrationTester;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Models\AlbumORama\Artists;
+use function uniqid;
 
 /**
  * Class DeleteCest
  */
 class DeleteCest
 {
+    use DiTrait;
+
     /**
      * Tests Phalcon\Mvc\Model :: delete()
      *
@@ -28,6 +33,35 @@ class DeleteCest
     public function mvcModelDelete(IntegrationTester $I)
     {
         $I->wantToTest('Mvc\Model - delete()');
-        $I->skipTest('Need implementation');
+
+        $this->setNewFactoryDefault();
+
+        $name = uniqid();
+
+        // MySql
+        $this->setDiMysql();
+
+        $artist = new Artists();
+        $artist->name = $name;
+        $result = $artist->save();
+
+        $I->assertNotFalse($result);
+
+        $result = $artist->delete();
+
+        $I->assertNotFalse($result);
+
+        // Postgresql
+        $this->setDiPostgresql();
+
+        $artist = new Artists();
+        $artist->name = $name;
+        $result = $artist->save();
+
+        $I->assertNotFalse($result);
+
+        $result = $artist->delete();
+
+        $I->assertNotFalse($result);
     }
 }