refactor(builder): refactor from zephir.

noone-silent · Jul 30, 2024 · fd23ec3 · fd23ec3
1 parent 64b90dc
commit fd23ec3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,6 +1,6 @@
 # Path to sources
 #sonar.sources=.
-sonar.exclusions=**/tests/**
+sonar.exclusions=./tests/*
 #sonar.inclusions=
 
 # Path to tests

diff --git a/src/Mvc/Model/Query/Builder.php b/src/Mvc/Model/Query/Builder.php
@@ -887,10 +887,8 @@ final public function getPhql(): string
         }
 
         // Only append where conditions if it's string
-        if (is_string($conditions)) {
-            if (trim($conditions) !== '') {
-                $phql .= " WHERE " . $conditions;
-            }
+        if (is_string($conditions) && trim($conditions) !== '') {
+            $phql .= " WHERE " . $conditions;
         }
 
         /**

diff --git a/tests/_data/fixtures/Migrations/OrdersProductsMigration.php b/tests/_data/fixtures/Migrations/OrdersProductsMigration.php
@@ -49,10 +49,10 @@ protected function getSqlMysql(): array
     {
         return [
             "
-drop table if exists private.`co_orders_x_products`;
+drop table if exists `co_orders_x_products`;
             ",
             "
-CREATE TABLE private.`co_orders_x_products` (
+CREATE TABLE `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,