#14862 - Review private/public schemas

phalcon · Feb 25, 2020 · ef7b797 · ef7b797
1 parent 054d1f6
commit ef7b797
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/_data/assets/schemas/mysql.sql b/tests/_data/assets/schemas/mysql.sql
@@ -65,9 +65,9 @@ CREATE TABLE `co_orders` (
 
 
 
-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(10) unsigned NOT NULL,
   `oxp_prd_id` int(10) unsigned NOT NULL,
   `oxp_quantity` int(10) unsigned NOT NULL,

diff --git a/tests/_data/fixtures/Migrations/OrdersProductsMigration.php b/tests/_data/fixtures/Migrations/OrdersProductsMigration.php
@@ -71,18 +71,18 @@ protected function getSqlPgsql(): array
     {
         return [
             "
-drop table if exists private.co_orders_x_products;
+drop table if exists public.co_orders_x_products;
             ",
             "
-create table private.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 private.co_orders_x_products owner to postgres;
+alter table public.co_orders_x_products owner to postgres;
             "
         ];
     }

diff --git a/tests/_envs/mysql.yml b/tests/_envs/mysql.yml
@@ -12,4 +12,4 @@ modules:
         waitlock: 10
         initial_queries:
           - "SET NAMES utf8;"
-          - "CREATE SCHEMA IF NOT EXISTS public"
+          - "CREATE SCHEMA IF NOT EXISTS private"
diff --git a/tests/database/Mvc/Model/Criteria/JoinCest.php b/tests/database/Mvc/Model/Criteria/JoinCest.php
@@ -94,7 +94,7 @@ public function mvcModelCriteriaJoinManyToManyMultipleSchema(DatabaseTester $I)
 
         $expected = 'SELECT `co_orders`.`ord_id`, `co_orders`.`ord_name` '
             . 'FROM `co_orders`  '
-            . 'INNER JOIN `public`.`co_orders_x_products` '
+            . '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();