Merge pull request #652 from cosmocode/latest-qb

Restore disabling mechanism for "latest" in queries

Author: annda

meta/Search.php

@@ -527,6 +527,7 @@ public function getSQL()
     protected function runSQLBuilder()
     {
         $sqlBuilder = new SearchSQLBuilder();
+        $sqlBuilder->setSelectLatest($this->selectLatest);
         $sqlBuilder->addSchemas($this->schemas);
         $sqlBuilder->addColumns($this->columns);
         $sqlBuilder->addFilters($this->filter);
@@ -682,19 +683,4 @@ protected function isEmptyValue(Value $value)
         if ($value->getColumn()->getTid() == 0) return true;
         return false;
     }
-
-    /**
-     * @param string $datatable
-     * @return string
-     */
-    protected function getSpecialFlagsClause($datatable)
-    {
-        $latestClause = "IS_PUBLISHER($datatable.pid)";
-        if ($this->selectLatest) {
-            $latestClause .= " AND $datatable.latest = 1";
-        }
-        $publishedClause = "IS_PUBLISHER($datatable.pid) !=1 AND $datatable.published = 1";
-
-        return "( ($latestClause) OR ($publishedClause) )";
-    }
 }

meta/SearchSQLBuilder.php

@@ -12,6 +12,9 @@ class SearchSQLBuilder
     /** @var QueryBuilder */
     protected $qb;
 
+    /** @var bool Include latest = 1 in select query */
+    protected $selectLatest = true;
+
     /**
      * SearchSQLBuilder constructor.
      */
@@ -65,8 +68,7 @@ public function addSchemas($schemas)
 
                 $first_table = $datatable;
             }
-            // phpcs:ignore
-            $this->qb->filters()->whereAnd("( (IS_PUBLISHER($datatable.pid) AND $datatable.latest = 1) OR (IS_PUBLISHER($datatable.pid) !=1 AND $datatable.published = 1) )");
+            $this->qb->filters()->whereAnd($this->addPublishClauses($datatable));
         }
     }
 
@@ -167,6 +169,21 @@ public function addSorts($sorts)
         }
     }
 
+    /**
+     * @param string $datatable
+     * @return string
+     */
+    public function addPublishClauses($datatable)
+    {
+        $latestClause = "IS_PUBLISHER($datatable.pid)";
+        if ($this->selectLatest) {
+            $latestClause .= " AND $datatable.latest = 1";
+        }
+        $publishedClause = "IS_PUBLISHER($datatable.pid) !=1 AND $datatable.published = 1";
+
+        return "( ($latestClause) OR ($publishedClause) )";
+    }
+
     /**
      * Access to the underlying QueryBuilder
      *
@@ -188,4 +205,14 @@ public function getSQL()
     {
         return $this->qb->getSQL();
     }
+
+    /**
+     * Allows disabling default 'latest = 1' clause in select statement
+     *
+     * @param bool $selectLatest
+     */
+    public function setSelectLatest(bool $selectLatest)
+    {
+        $this->selectLatest = $selectLatest;
+    }
 }