Merge pull request #2270 from michalsn/feature/group_refactor

groupStart() refactorization

Author: jim-parry

system/Database/BaseBuilder.php

@@ -1260,25 +1260,11 @@ protected function _like_statement(string $prefix = null, string $column, string
 	/**
 	 * Starts a query group.
 	 *
-	 * @param string $not  (Internal use only)
-	 * @param string $type (Internal use only)
-	 *
 	 * @return BaseBuilder
 	 */
-	public function groupStart(string $not = '', string $type = 'AND ')
+	public function groupStart()
 	{
-		$type = $this->groupGetType($type);
-
-		$this->QBWhereGroupStarted = true;
-		$prefix                    = empty($this->QBWhere) ? '' : $type;
-		$where                     = [
-			'condition' => $prefix . $not . str_repeat(' ', ++ $this->QBWhereGroupCount) . ' (',
-			'escape'    => false,
-		];
-
-		$this->QBWhere[] = $where;
-
-		return $this;
+		return $this->groupStartPrepare('', 'AND ', 'QBWhere');
 	}
 
 	//--------------------------------------------------------------------
@@ -1290,7 +1276,7 @@ public function groupStart(string $not = '', string $type = 'AND ')
 	 */
 	public function orGroupStart()
 	{
-		return $this->groupStart('', 'OR ');
+		return $this->groupStartPrepare('', 'OR ', 'QBWhere');
 	}
 
 	//--------------------------------------------------------------------
@@ -1302,7 +1288,7 @@ public function orGroupStart()
 	 */
 	public function notGroupStart()
 	{
-		return $this->groupStart('NOT ', 'AND ');
+		return $this->groupStartPrepare('NOT ', 'AND ', 'QBWhere');
 	}
 
 	//--------------------------------------------------------------------
@@ -1314,7 +1300,7 @@ public function notGroupStart()
 	 */
 	public function orNotGroupStart()
 	{
-		return $this->groupStart('NOT ', 'OR ');
+		return $this->groupStartPrepare('NOT ', 'OR ', 'QBWhere');
 	}
 
 	//--------------------------------------------------------------------
@@ -1326,42 +1312,19 @@ public function orNotGroupStart()
 	 */
 	public function groupEnd()
 	{
-		$this->QBWhereGroupStarted = false;
-		$where                     = [
-			'condition' => str_repeat(' ', $this->QBWhereGroupCount -- ) . ')',
-			'escape'    => false,
-		];
-
-		$this->QBWhere[] = $where;
-
-		return $this;
+		return $this->groupEndPrepare('QBWhere');
 	}
 
 	// --------------------------------------------------------------------
 
 	/**
 	 * Starts a query group for HAVING clause.
 	 *
-	 * @param string $not  (Internal use only)
-	 * @param string $type (Internal use only)
-	 *
 	 * @return BaseBuilder
 	 */
-	public function havingGroupStart(string $not = '', string $type = 'AND ')
+	public function havingGroupStart()
 	{
-		$type = $this->groupGetType($type);
-
-		$this->QBWhereGroupStarted = true;
-		$prefix                    = empty($this->QBHaving) ? '' : $type;
-		$having                    = [
-			'condition' => $prefix . $not . str_repeat(' ', ++$this->QBWhereGroupCount) . ' (',
-			'value'     => null,
-			'escape'    => false,
-		];
-
-		$this->QBHaving[] = $having;
-
-		return $this;
+		return $this->groupStartPrepare('', 'AND ', 'QBHaving');
 	}
 
 	// --------------------------------------------------------------------
@@ -1373,7 +1336,7 @@ public function havingGroupStart(string $not = '', string $type = 'AND ')
 	 */
 	public function orHavingGroupStart()
 	{
-		return $this->havingGroupStart('', 'OR ');
+		return $this->groupStartPrepare('', 'OR ', 'QBHaving');
 	}
 
 	// --------------------------------------------------------------------
@@ -1385,7 +1348,7 @@ public function orHavingGroupStart()
 	 */
 	public function notHavingGroupStart()
 	{
-		return $this->havingGroupStart('NOT ', 'AND ');
+		return $this->groupStartPrepare('NOT ', 'AND ', 'QBHaving');
 	}
 
 	// --------------------------------------------------------------------
@@ -1397,7 +1360,7 @@ public function notHavingGroupStart()
 	 */
 	public function orNotHavingGroupStart()
 	{
-		return $this->havingGroupStart('NOT ', 'OR ');
+		return $this->groupStartPrepare('NOT ', 'OR ', 'QBHaving');
 	}
 
 	// --------------------------------------------------------------------
@@ -1408,15 +1371,55 @@ public function orNotHavingGroupStart()
 	 * @return BaseBuilder
 	 */
 	public function havingGroupEnd()
+	{
+		return $this->groupEndPrepare('QBHaving');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepate a query group start.
+	 *
+	 * @param string $not
+	 * @param string $type
+	 * @param string $clause
+	 *
+	 * @return BaseBuilder
+	 */
+	protected function groupStartPrepare(string $not = '', string $type = 'AND ', string $clause = 'QBWhere')
+	{
+		$type = $this->groupGetType($type);
+
+		$this->QBWhereGroupStarted = true;
+		$prefix                    = empty($this->$clause) ? '' : $type;
+		$where                     = [
+			'condition' => $prefix . $not . str_repeat(' ', ++ $this->QBWhereGroupCount) . ' (',
+			'escape'    => false,
+		];
+
+		$this->{$clause}[] = $where;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepate a query group end.
+	 *
+	 * @param string $clause
+	 *
+	 * @return BaseBuilder
+	 */
+	protected function groupEndPrepare(string $clause = 'QBWhere')
 	{
 		$this->QBWhereGroupStarted = false;
-		$having                    = [
+		$where                     = [
 			'condition' => str_repeat(' ', $this->QBWhereGroupCount -- ) . ')',
-			'value'     => null,
 			'escape'    => false,
 		];
 
-		$this->QBHaving[] = $having;
+		$this->{$clause}[] = $where;
 
 		return $this;
 	}