Merge branch '4.0.x' into fix/#14862-pgsql-null-columns

# Conflicts:
#	tests/_data/assets/schemas/pgsql.sql
#	tests/_data/fixtures/Migrations/OrdersProductsMigration.php
#	tests/_envs/pgsql.yml

tests/_data/assets/schemas/pgsql.sql

@@ -1,28 +1,28 @@
 
 
 drop table if exists co_customers;
-            
+
 create table co_customers
 (
     cst_id          serial not null constraint co_customers_pk primary key,
     cst_status_flag smallint   null,
     cst_name_last   varchar(100) null,
     cst_name_first  varchar(50)  null
 );
-            
+
 create index co_customers_cst_status_flag_index
     on co_customers (cst_status_flag);
-            
+
 create index co_customers_cst_name_last_index
     on co_customers (cst_name_last);
-            
+
 create index co_customers_cst_name_first_index
     on co_customers (cst_name_first);
-            
+
 
 
 drop table if exists co_invoices;
-            
+
 create table co_invoices
 (
     inv_id          serial not null constraint co_invoices_pk primary key,
@@ -32,59 +32,53 @@ create table co_invoices
     inv_total       numeric(10, 2),
     inv_created_at  timestamp
 );
-            
+
 create index co_invoices_inv_created_at_index
     on co_invoices (inv_created_at);
-            
+
 create index co_invoices_inv_cst_id_index
     on co_invoices (inv_cst_id);
-            
+
 create index co_invoices_inv_status_flag_index
     on co_invoices (inv_status_flag);
-
 
 
 
 
-drop table if exists co_orders;            
-
+
+drop table if exists co_orders;
+
 create table co_orders
 (
     ord_id serial not null
     constraint ord_pk
       primary key,
       ord_name varchar(70)
 );
-
-alter table public.co_orders owner to postgres;
-
+
 
 
 drop table if exists public.co_orders_x_products;
-            
+
 create table public.co_orders_x_products
 (
     oxp_ord_id int not null,
     oxp_prd_id int not null,
     oxp_quantity int not null
 );
-
-alter table public.co_orders_x_products owner to postgres;
-
 
 
-drop table if exists co_products;            
-
+
+drop table if exists co_products;
+
 create table co_products
 (
     prd_id serial not null
     constraint prd_pk
       primary key,
       prd_name varchar(70)
 );
-
-alter table public.co_products owner to postgres;
-
+
 
 
 

tests/_data/fixtures/Migrations/InvoicesMigration.php

@@ -46,10 +46,9 @@ public function insert(
 insert into co_invoices (
     inv_id, inv_cst_id, inv_status_flag, inv_title, inv_total, inv_created_at
 ) values (
-    {$id}, {$custId}, {$status}, "{$title}", {$total}, "{$now}"
+    {$id}, {$custId}, {$status}, '{$title}', {$total}, '{$now}'
 )
 SQL;
-
         return $this->connection->exec($sql);
     }
 

tests/_data/fixtures/Migrations/OrdersMigration.php

@@ -78,9 +78,6 @@ protected function getSqlPgsql(): array
       primary key,
       ord_name varchar(70)
 );
-            ",
-            "
-alter table public.co_orders owner to postgres;
             "
         ];
     }

tests/_data/fixtures/Migrations/OrdersProductsMigration.php

@@ -71,18 +71,15 @@ protected function getSqlPgsql(): array
     {
         return [
             "
-drop table if exists public.co_orders_x_products;
+drop table if exists private.co_orders_x_products;
             ",
             "
-create table public.co_orders_x_products
+create table private.co_orders_x_products
 (
     oxp_ord_id int not null,
     oxp_prd_id int not null,
     oxp_quantity int not null
 );
-            ",
-            "
-alter table public.co_orders_x_products owner to postgres;
             "
         ];
     }

tests/_data/fixtures/Migrations/ProductsMigration.php

@@ -78,9 +78,6 @@ protected function getSqlPgsql(): array
       primary key,
       prd_name varchar(70)
 );
-            ",
-            "
-alter table public.co_products owner to postgres;
             "
         ];
     }

tests/_envs/pgsql.yml

@@ -10,3 +10,5 @@ modules:
         cleanup: false
         reconnect: true
         waitlock: 10
+        initial_queries:
+          - 'CREATE SCHEMA IF NOT EXISTS private;'

tests/database/Db/Adapter/Pdo/QueryCest.php

@@ -38,12 +38,13 @@ public function _before(DatabaseTester $I)
      * @author Phalcon Team <team@phalcon.io>
      * @since  2020-02-22
      *
+     * @group pgsql
      * @group mysql
      * @group sqlite
      */
     public function dbAdapterPdoQuery(DatabaseTester $I)
     {
-        $I->wantToTest('Db\Adapter\Pdo\Mysql - query()');
+        $I->wantToTest('Db\Adapter\Pdo - query()');
 
         $connection = $I->getConnection();
         $db = $this->container->get('db');

tests/database/Mvc/Model/Criteria/JoinCest.php

@@ -21,6 +21,7 @@
 use Phalcon\Test\Models\Invoices;
 use Phalcon\Test\Models\Orders;
 use Phalcon\Test\Models\Products;
+use Phalcon\Mvc\Model\Resultset\Simple;
 
 /**
  * Class JoinCest
@@ -74,6 +75,7 @@ public function mvcModelCriteriaJoin(DatabaseTester $I)
      * @since  2020-02-06
      *
      * @group mysql
+     * @group pgsql
      */
     public function mvcModelCriteriaJoinManyToManyMultipleSchema(DatabaseTester $I)
     {
@@ -92,13 +94,12 @@ public function mvcModelCriteriaJoinManyToManyMultipleSchema(DatabaseTester $I)
         $builder->from(Orders::class);
         $builder->join(Products::class);
 
-        $expected = 'SELECT `co_orders`.`ord_id`, `co_orders`.`ord_name` '
-            . 'FROM `co_orders`  '
-            . 'INNER JOIN `private`.`co_orders_x_products` '
-            . 'ON `co_orders`.`ord_id` = `co_orders_x_products`.`oxp_ord_id` '
-            . 'INNER JOIN `co_products` ON `co_orders_x_products`.`oxp_prd_id` = `co_products`.`prd_id`';
-        $actual   = $builder->getQuery()->getSql();
+        $expected = 'private';
+        $query    = $builder->getQuery();
+        $request  = $query->getSql();
 
-        $I->assertEquals($expected, $actual['sql']);
+        $I->assertContains($expected, $request['sql']);
+
+        $I->assertInstanceOf(Simple::class, $query->execute());
     }
 }