qb isUse

ifacesoft · Sep 8, 2020 · f291bc4 · f291bc4
1 parent 2bc05f0
commit f291bc4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/source/Ice/Core/QueryBuilder.php b/source/Ice/Core/QueryBuilder.php
@@ -2419,13 +2419,17 @@ public function getWidgets()
      * @param $funcName
      * @param $argumentString
      * @param array $modelTableData
+     * @param bool $isUse
      * @return $this
      * @throws Exception
-     *
      * @todo feature using: ->func('fieldAlias', 'funcName', 'funcArgument', $modelTableData)
      */
-    public function func($funcName, $argumentString, $modelTableData = [])
+    public function func($funcName, $argumentString, $modelTableData = [], $isUse = true)
     {
+        if (!$isUse) {
+            return $this;
+        }
+
         /**
          * @var Model $modelClass
          */

diff --git a/source/Ice/QueryTranslator/Sql.php b/source/Ice/QueryTranslator/Sql.php
@@ -500,7 +500,7 @@ protected function translateSelect(Query $query, DataSource $dataSource)
                     } else {
                         if ($tableAlias === '') {
                             $fieldAlias = $fieldName . ' AS `' . $fieldAlias . '`';
-                        } elseif ($fieldName[0] == '\'') {
+                        } elseif ($fieldName[0] === '\'') {
                             $fieldAlias = $fieldName . ' AS `' . $fieldAlias . '`';
                         } else {
                             $fieldAlias = $fieldName . ' AS `' . trim($fieldAlias, '`') . '`';
@@ -594,8 +594,7 @@ private function getColumnByTimezone($clientTimezone, $column, $alias = null)
     /**
      * Translate join part
      *
-     * @param array $part
-     * @param $modelClassTableAlias
+     * @param Query $query
      * @param DataSource $dataSource
      * @return string
      *
@@ -620,9 +619,7 @@ protected function translateJoin(Query $query, DataSource $dataSource)
         }
 
         foreach ($part as $tableAlias => $joinTable) {
-            /**
-             * @var Model $joinModelClass
-             */
+             /** @var Model $joinModelClass */
             $joinModelClass = $joinTable['class'];
 
             if ($joinModelClass instanceof QueryBuilder) {