fix: try to resolve sqlite trouble - Closes #14874

phalcon · May 16, 2020 · 716aa02 · 716aa02
1 parent 6a0427e
commit 716aa02
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 57 deletions.
diff --git a/tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php b/tests/database/Db/Adapter/Pdo/DescribeColumnsCest.php
@@ -78,7 +78,7 @@ public function dbAdapterPdoDescribeColumnsDefaultPostgres(DatabaseTester $I)
 
         $columns = $db->describeColumns($migration->getTable());
 
-        $I->assertSame('now()', $columns[1]->getDefault());
+        $I->assertSame('CURRENT_TIMESTAMP', $columns[1]->getDefault());
         $I->assertSame('now()', $columns[2]->getDefault());
     }
 }
diff --git a/tests/database/Mvc/Model/ReadWriteAttributeCest.php b/tests/database/Mvc/Model/ReadWriteAttributeCest.php
@@ -78,7 +78,7 @@ public function mvcModelWriteAttribute(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelWriteAttributeWithAssociativeArray(DatabaseTester $I)
     {
@@ -121,7 +121,7 @@ public function mvcModelWriteAttributeWithAssociativeArray(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelWriteAttributeUndefinedPropertyWithAssociativeArray(DatabaseTester $I)
     {

diff --git a/tests/database/Mvc/Model/RefreshCest.php b/tests/database/Mvc/Model/RefreshCest.php
@@ -40,7 +40,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelRefresh(DatabaseTester $I)
     {

diff --git a/tests/database/Mvc/Model/SerializeCest.php b/tests/database/Mvc/Model/SerializeCest.php
@@ -49,7 +49,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelSerialize(DatabaseTester $I)
     {

diff --git a/tests/database/Mvc/Model/ToArrayCest.php b/tests/database/Mvc/Model/ToArrayCest.php
@@ -41,7 +41,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelToArray(DatabaseTester $I)
     {
@@ -89,7 +89,7 @@ public function mvcModelToArray(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelToArrayColumnMap(DatabaseTester $I)
     {
@@ -138,7 +138,7 @@ public function mvcModelToArrayColumnMap(DatabaseTester $I)
      * @issue 1701
      *
      * @group mysql
-     * @group pgsql
+     * @group sqlite
      */
     public function mvcModelToArrayFindFirstColumns(DatabaseTester $I)
     {
@@ -147,50 +147,6 @@ public function mvcModelToArrayFindFirstColumns(DatabaseTester $I)
         $title = uniqid('inv-');
         $date  = date('Y-m-d H:i:s');
 
-        $data = [
-            'inv_id'          => null,
-            'inv_cst_id'      => 5,
-            'inv_status_flag' => 2,
-            'inv_title'       => $title,
-            'inv_total'       => 100.12,
-            'inv_created_at'  => $date,
-        ];
-
-        $invoice = new Invoices();
-        $invoice->assign($data);
-        $result = $invoice->save();
-        $I->assertNotFalse($result);
-
-        $invoice = Invoices::findFirst(
-            [
-                'columns' => 'inv_id, inv_cst_id, inv_title',
-                'inv_title = "' . $title . '"',
-            ]
-        );
-
-        $expected = [
-            'inv_id'     => 1,
-            'inv_cst_id' => 5,
-            'inv_title'  => $title,
-        ];
-        $actual   = $invoice->toArray();
-        $I->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Tests Phalcon\Mvc\Model :: toArray() - find first columns
-     *
-     * @issue 1701
-     *
-     * @group sqlite
-     */
-    public function mvcModelToArrayFindFirstColumnsSQLite(DatabaseTester $I)
-    {
-        $I->wantToTest('Mvc\Model - toArray() - find first columns - sqlite');
-
-        $title = uniqid('inv-');
-        $date  = date('Y-m-d H:i:s');
-
         $data = [
             'inv_id'          => 4,
             'inv_cst_id'      => 5,

diff --git a/tests/database/Mvc/Model/UnserializeCest.php b/tests/database/Mvc/Model/UnserializeCest.php
@@ -47,7 +47,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function mvcModelUnserialize(DatabaseTester $I)
     {

diff --git a/tests/database/Paginator/Adapter/Model/ConstructCest.php b/tests/database/Paginator/Adapter/Model/ConstructCest.php
@@ -47,7 +47,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function paginatorAdapterModelConstruct(DatabaseTester $I)
     {

diff --git a/tests/database/Paginator/Adapter/QueryBuilder/ConstructCest.php b/tests/database/Paginator/Adapter/QueryBuilder/ConstructCest.php
@@ -48,7 +48,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function paginatorAdapterQuerybuilderConstruct(DatabaseTester $I)
     {
@@ -81,7 +81,7 @@ public function paginatorAdapterQuerybuilderConstruct(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function paginatorAdapterQuerybuilderConstructException(DatabaseTester $I)
     {

diff --git a/tests/database/Paginator/Adapter/QueryBuilder/GetSetLimitCest.php b/tests/database/Paginator/Adapter/QueryBuilder/GetSetLimitCest.php
@@ -41,7 +41,7 @@ public function _before(DatabaseTester $I)
      *
      * @group mysql
      * @group pgsql
-     * @group sqlites
+     * @group sqlite
      */
     public function paginatorAdapterQuerybuilderGetSetLimit(DatabaseTester $I)
     {