adumitru68 / QueryBuilder

sample/autoloader.php

Indentation +6 added lines, -6 removed lines

@@ -10,14 +10,14 @@
 /**
  * @param $class
  */
-    function($class) {
+	function($class) {
 
-        $nameSpace = str_replace('\\', '/', trim($class, '\\')) . '.php';
-        $nameSpace = str_replace('Qpdb/QueryBuilder/', '', $nameSpace);
-        $includeFile = __DIR__ . '/../src/' . $nameSpace;
+		$nameSpace = str_replace('\\', '/', trim($class, '\\')) . '.php';
+		$nameSpace = str_replace('Qpdb/QueryBuilder/', '', $nameSpace);
+		$includeFile = __DIR__ . '/../src/' . $nameSpace;
 
-        require_once($includeFile);
+		require_once($includeFile);
 
-    }
+	}
 
 );
\ No newline at end of file

src/Traits/InsertMultiple.php

Indentation +77 added lines, -77 removed lines

@@ -17,110 +17,110 @@
 trait InsertMultiple
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param $fieldsList
-     * @param array $rowsForInsert
-     * @return $this
-     */
-    public function fromArray($fieldsList, array $rowsForInsert)
-    {
-        $this->setFieldsList($fieldsList);
+	/**
+	 * @param $fieldsList
+	 * @param array $rowsForInsert
+	 * @return $this
+	 */
+	public function fromArray($fieldsList, array $rowsForInsert)
+	{
+		$this->setFieldsList($fieldsList);
 
-        foreach ($rowsForInsert as $row)
-            $this->addSingleRow($row);
+		foreach ($rowsForInsert as $row)
+			$this->addSingleRow($row);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $fieldsList
-     * @param QuerySelect $query
-     * @return $this
-     */
-    public function fromQuerySelect($fieldsList, QuerySelect $query)
-    {
-        $this->setFieldsList($fieldsList);
+	/**
+	 * @param $fieldsList
+	 * @param QuerySelect $query
+	 * @return $this
+	 */
+	public function fromQuerySelect($fieldsList, QuerySelect $query)
+	{
+		$this->setFieldsList($fieldsList);
 
-        foreach ($query->getBindParams() as $key => $value)
-            $this->queryStructure->setParams($key, $value);
+		foreach ($query->getBindParams() as $key => $value)
+			$this->queryStructure->setParams($key, $value);
 
-        $this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
+		$this->queryStructure->replaceElement(QueryStructure::SET_FIELDS, $query);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param string|array $fieldList
-     */
-    private function setFieldsList($fieldList)
-    {
-        if (!is_array($fieldList))
-            $fieldList = QueryHelper::explode($fieldList);
+	/**
+	 * @param string|array $fieldList
+	 */
+	private function setFieldsList($fieldList)
+	{
+		if (!is_array($fieldList))
+			$fieldList = QueryHelper::explode($fieldList);
 
-        $this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
+		$this->queryStructure->replaceElement(QueryStructure::FIELDS, $fieldList);
 
-    }
+	}
 
-    /**
-     * @param array $rowValues
-     * @return $this
-     * @throws QueryException
-     */
-    private function addSingleRow(array $rowValues)
-    {
+	/**
+	 * @param array $rowValues
+	 * @return $this
+	 * @throws QueryException
+	 */
+	private function addSingleRow(array $rowValues)
+	{
 
-        if ($this->getNumberOfFields() !== count($rowValues))
-            throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
+		if ($this->getNumberOfFields() !== count($rowValues))
+			throw new QueryException('Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT);
 
-        $pdoRowValues = array();
+		$pdoRowValues = array();
 
-        foreach ($rowValues as $value)
-            $pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
+		foreach ($rowValues as $value)
+			$pdoRowValues[] = $this->queryStructure->bindParam('value', $value);
 
-        $pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
+		$pdoRowValuesString = '( ' . QueryHelper::implode($pdoRowValues, ', ') . ' )';
 
-        $this->queryStructure->setElement(QueryStructure::SET_FIELDS, $pdoRowValuesString);
+		$this->queryStructure->setElement(QueryStructure::SET_FIELDS, $pdoRowValuesString);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    private function getInsertMultipleRowsSyntax()
-    {
-        if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
-            return $this->getSyntaxWithSelect();
+	/**
+	 * @return string
+	 */
+	private function getInsertMultipleRowsSyntax()
+	{
+		if (is_a($this->queryStructure->getElement(QueryStructure::SET_FIELDS), QuerySelect::class))
+			return $this->getSyntaxWithSelect();
 
-        $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
-        $values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');
+		$fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
+		$values = QueryHelper::implode($this->queryStructure->getElement(QueryStructure::SET_FIELDS), ', ');
 
-        return $fields . ' VALUES ' . $values;
-    }
+		return $fields . ' VALUES ' . $values;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getSyntaxWithSelect()
-    {
-        $fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
+	/**
+	 * @return string
+	 */
+	private function getSyntaxWithSelect()
+	{
+		$fields = '( ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::FIELDS), ', ') . ' )';
 
-        return $fields . ' ' . $this->queryStructure->getElement(QueryStructure::SET_FIELDS)->getSyntax();
-    }
+		return $fields . ' ' . $this->queryStructure->getElement(QueryStructure::SET_FIELDS)->getSyntax();
+	}
 
-    /**
-     * @return int
-     */
-    private function getNumberOfFields()
-    {
-        return count($this->queryStructure->getElement(QueryStructure::FIELDS));
-    }
+	/**
+	 * @return int
+	 */
+	private function getNumberOfFields()
+	{
+		return count($this->queryStructure->getElement(QueryStructure::FIELDS));
+	}
 
 
 }
\ No newline at end of file

src/Traits/SelectFields.php

Indentation +42 added lines, -42 removed lines

@@ -14,61 +14,61 @@
 
 trait SelectFields
 {
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param string|array $fields
-     * @return $this
-     * @throws QueryException
-     */
-    public function fields($fields)
-    {
+	/**
+	 * @param string|array $fields
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function fields($fields)
+	{
 
-        switch (gettype($fields)) {
-            case QueryStructure::ELEMENT_TYPE_ARRAY:
+		switch (gettype($fields)) {
+			case QueryStructure::ELEMENT_TYPE_ARRAY:
 
-                $fields = $this->prepareArrayFields($fields);
+				$fields = $this->prepareArrayFields($fields);
 
-                if (count($fields))
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields)); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
-                break;
+				if (count($fields))
+					$this->queryStructure->setElement(QueryStructure::FIELDS, implode(', ', $fields)); else
+					$this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+				break;
 
-            case QueryStructure::ELEMENT_TYPE_STRING:
+			case QueryStructure::ELEMENT_TYPE_STRING:
 
-                $fields = trim($fields);
-                if ('' !== $fields)
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, $fields); else
-                    $this->queryStructure->setElement(QueryStructure::FIELDS, '*');
-                break;
+				$fields = trim($fields);
+				if ('' !== $fields)
+					$this->queryStructure->setElement(QueryStructure::FIELDS, $fields); else
+					$this->queryStructure->setElement(QueryStructure::FIELDS, '*');
+				break;
 
-            default:
-                throw new QueryException('Invalid fields parameter type', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+			default:
+				throw new QueryException('Invalid fields parameter type', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
 
-        }
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * @param array $fieldsArray
-     * @return array
-     * @throws QueryException
-     */
-    private function prepareArrayFields($fieldsArray = array())
-    {
-        $prepareArray = [];
+	/**
+	 * @param array $fieldsArray
+	 * @return array
+	 * @throws QueryException
+	 */
+	private function prepareArrayFields($fieldsArray = array())
+	{
+		$prepareArray = [];
 
-        foreach ($fieldsArray as $field) {
-            if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING)
-                throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
+		foreach ($fieldsArray as $field) {
+			if (gettype($field) !== QueryStructure::ELEMENT_TYPE_STRING)
+				throw new QueryException('Invalid select field type!', QueryException::QUERY_ERROR_SELECT_INVALID_FIELD);
 
-            if ('' !== trim($field))
-                $prepareArray[] = trim($field);
-        }
+			if ('' !== trim($field))
+				$prepareArray[] = trim($field);
+		}
 
-        return $prepareArray;
-    }
+		return $prepareArray;
+	}
 
 }
\ No newline at end of file

src/Traits/GroupBy.php

Indentation +47 added lines, -47 removed lines

@@ -15,68 +15,68 @@
 trait GroupBy
 {
 
-    use Objects;
+	use Objects;
 
 
-    /**
-     * @param $column
-     * @param array $allowedColumns
-     * @return $this
-     * @throws QueryException
-     */
-    public function groupBy($column, array $allowedColumns = [])
-    {
-        $column = trim($column);
+	/**
+	 * @param $column
+	 * @param array $allowedColumns
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function groupBy($column, array $allowedColumns = [])
+	{
+		$column = trim($column);
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+		if (!$this->validateColumn($column, $allowedColumns))
+			throw new QueryException('Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
 
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column);
+		$this->queryStructure->setElement(QueryStructure::GROUP_BY, $column);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $column
-     * @param array $allowedColumns
-     * @return $this
-     * @throws QueryException
-     */
-    public function groupByDesc($column, array $allowedColumns = [])
-    {
-        $column = trim($column);
+	/**
+	 * @param $column
+	 * @param array $allowedColumns
+	 * @return $this
+	 * @throws QueryException
+	 */
+	public function groupByDesc($column, array $allowedColumns = [])
+	{
+		$column = trim($column);
 
-        if (!$this->validateColumn($column, $allowedColumns))
-            throw new QueryException('Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
+		if (!$this->validateColumn($column, $allowedColumns))
+			throw new QueryException('Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME);
 
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $column . ' DESC');
+		$this->queryStructure->setElement(QueryStructure::GROUP_BY, $column . ' DESC');
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @param $expression
-     * @return $this
-     */
-    public function groupByExpression($expression)
-    {
-        $this->queryStructure->setElement(QueryStructure::GROUP_BY, $expression);
+	/**
+	 * @param $expression
+	 * @return $this
+	 */
+	public function groupByExpression($expression)
+	{
+		$this->queryStructure->setElement(QueryStructure::GROUP_BY, $expression);
 
-        return $this;
-    }
+		return $this;
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getGroupBySyntax()
-    {
-        if (count($this->queryStructure->getElement(QueryStructure::GROUP_BY)))
-            return 'GROUP BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::GROUP_BY), ', ');
+	/**
+	 * @return string
+	 */
+	private function getGroupBySyntax()
+	{
+		if (count($this->queryStructure->getElement(QueryStructure::GROUP_BY)))
+			return 'GROUP BY ' . QueryHelper::implode($this->queryStructure->getElement(QueryStructure::GROUP_BY), ', ');
 
-        return '';
-    }
+		return '';
+	}
 
 }
\ No newline at end of file

src/Traits/Replacement.php

Indentation +35 added lines, -35 removed lines

@@ -16,40 +16,40 @@
 trait Replacement
 {
 
-    use Objects;
-
-    /**
-     * @param $syntax
-     * @param int $withReplacement
-     * @return mixed|string
-     */
-    private function getSyntaxReplace($syntax, $withReplacement = QueryStatementInterface::REPLACEMENT_NONE)
-    {
-        $syntax = QueryHelper::clearMultipleSpaces($syntax);
-
-        if (!$withReplacement)
-            return $syntax;
-
-        return $this->replaceValues($syntax);
-    }
-
-    /**
-     * @param $syntax
-     * @return string
-     */
-    private function replaceValues($syntax)
-    {
-        $bindParams = $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
-        $search = array();
-        $replace = array();
-        foreach ($bindParams as $key => $value) {
-            $search[] = ':' . $key;
-            $replace[] = DbConnect::getInstance()->quote($value);
-        }
-        $syntax = str_ireplace($search, $replace, $syntax);
-
-        return $syntax;
-
-    }
+	use Objects;
+
+	/**
+	 * @param $syntax
+	 * @param int $withReplacement
+	 * @return mixed|string
+	 */
+	private function getSyntaxReplace($syntax, $withReplacement = QueryStatementInterface::REPLACEMENT_NONE)
+	{
+		$syntax = QueryHelper::clearMultipleSpaces($syntax);
+
+		if (!$withReplacement)
+			return $syntax;
+
+		return $this->replaceValues($syntax);
+	}
+
+	/**
+	 * @param $syntax
+	 * @return string
+	 */
+	private function replaceValues($syntax)
+	{
+		$bindParams = $this->queryStructure->getElement(QueryStructure::BIND_PARAMS);
+		$search = array();
+		$replace = array();
+		foreach ($bindParams as $key => $value) {
+			$search[] = ':' . $key;
+			$replace[] = DbConnect::getInstance()->quote($value);
+		}
+		$syntax = str_ireplace($search, $replace, $syntax);
+
+		return $syntax;
+
+	}
 
 }
\ No newline at end of file

src/Traits/Distinct.php

Indentation +54 added lines, -54 removed lines

@@ -15,60 +15,60 @@
 trait Distinct
 {
 
-    use Objects;
-
-
-    /**
-     * @return $this
-     */
-    public function all()
-    {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 0);
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function distinct()
-    {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 1);
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function distinctRow()
-    {
-        $this->queryStructure->setElement(QueryStructure::DISTINCT, 2);
-
-        return $this;
-    }
-
-
-    /**
-     * @return string
-     * @throws QueryException
-     */
-    private function getDistinctSyntax()
-    {
-        $useDistinct = $this->queryStructure->getElement(QueryStructure::DISTINCT);
-
-        switch ($useDistinct) {
-            case 0:
-                return '';
-            case 1:
-                return 'DISTINCT';
-            case 2:
-                return 'DISTINCTROW';
-            default:
-                throw new QueryException('Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT);
-        }
-
-    }
+	use Objects;
+
+
+	/**
+	 * @return $this
+	 */
+	public function all()
+	{
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 0);
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function distinct()
+	{
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 1);
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function distinctRow()
+	{
+		$this->queryStructure->setElement(QueryStructure::DISTINCT, 2);
+
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws QueryException
+	 */
+	private function getDistinctSyntax()
+	{
+		$useDistinct = $this->queryStructure->getElement(QueryStructure::DISTINCT);
+
+		switch ($useDistinct) {
+			case 0:
+				return '';
+			case 1:
+				return 'DISTINCT';
+			case 2:
+				return 'DISTINCTROW';
+			default:
+				throw new QueryException('Invalid distinct type', QueryException::QUERY_ERROR_INVALID_DISTINCT);
+		}
+
+	}
 
 
 }
\ No newline at end of file

src/Traits/Having.php

Indentation +332 added lines, -332 removed lines

@@ -13,337 +13,337 @@
 trait Having
 {
 
-    use Objects;
-
-
-    /**
-     * @param $field
-     * @param $value
-     * @param $glue
-     * @return $this
-     */
-    public function havingEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '<>'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingNotEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '<>'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingLessThan($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '<'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingLessThan($field, $value)
-    {
-        return $this->having(array($field, $value, '<'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingLessThanOrEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '<='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingLessThanOrEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '<='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingGreaterThan($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '>'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingGreaterThan($field, $value)
-    {
-        return $this->having(array($field, $value, '>'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingGreaterThanOrEqual($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, '>='), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingGreaterThanOrEqual($field, $value)
-    {
-        return $this->having(array($field, $value, '>='), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingLike($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'LIKE'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingLike($field, $value)
-    {
-        return $this->having(array($field, $value, 'LIKE'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotLike($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'NOT LIKE'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingNotLike($field, $value)
-    {
-        return $this->having(array($field, $value, 'NOT LIKE'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @param string $glue
-     * @return $this
-     */
-    public function havingBetween($field, $min, $max, $glue = 'AND')
-    {
-        return $this->having(array($field, array($min, $max), 'BETWEEN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @return $this
-     */
-    public function orHavingBetween($field, $min, $max)
-    {
-        return $this->having(array($field, array($min, $max), 'BETWEEN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotBetween($field, $min, $max, $glue = 'AND')
-    {
-        return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $min
-     * @param $max
-     * @return $this
-     */
-    public function orHavingNotBetween($field, $min, $max)
-    {
-        return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingIn($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'IN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingIn($field, $value)
-    {
-        return $this->having(array($field, $value, 'IN'), 'OR');
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @param string $glue
-     * @return $this
-     */
-    public function havingNotIn($field, $value, $glue = 'AND')
-    {
-        return $this->having(array($field, $value, 'NOT IN'), $glue);
-    }
-
-    /**
-     * @param $field
-     * @param $value
-     * @return $this
-     */
-    public function orHavingNotIn($field, $value)
-    {
-        return $this->having(array($field, $value, 'NOT IN'), 'OR');
-    }
-
-    /**
-     * @param $whereString
-     * @param array $bindParams
-     * @param string $glue
-     * @return $this
-     */
-    public function havingExpression($whereString, array $bindParams = [], $glue = 'AND')
-    {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
-
-        return $this->having($whereString, $glue);
-    }
-
-    /**
-     * @param $whereString
-     * @param array $bindParams
-     * @return $this
-     */
-    public function orHavingExpression($whereString, array $bindParams = [])
-    {
-        $whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
-
-        return $this->having($whereString, 'OR');
-    }
-
-    /**
-     * @return $this
-     */
-    public function havingInvertResult()
-    {
-        $this->queryStructure->setElement(QueryStructure::HAVING_INVERT, 1);
-
-        return $this;
-    }
-
-    /**
-     * @param string $glue
-     * @return $this
-     */
-    public function havingGroup($glue = 'AND')
-    {
-        $this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function orHavingGroup()
-    {
-        return $this->havingGroup('OR');
-    }
-
-    /**
-     * @return $this
-     */
-    public function havingGroupEnd()
-    {
-        $this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
-
-        return $this;
-    }
-
-    /**
-     * @param $param
-     * @param string $glue
-     * @return $this
-     */
-    private function having($param, $glue = 'AND')
-    {
-        return $this->createCondition($param, $glue, QueryStructure::HAVING);
-    }
+	use Objects;
+
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param $glue
+	 * @return $this
+	 */
+	public function havingEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '<>'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingNotEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '<>'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingLessThan($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '<'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingLessThan($field, $value)
+	{
+		return $this->having(array($field, $value, '<'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingLessThanOrEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '<='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingLessThanOrEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '<='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingGreaterThan($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '>'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingGreaterThan($field, $value)
+	{
+		return $this->having(array($field, $value, '>'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingGreaterThanOrEqual($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, '>='), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingGreaterThanOrEqual($field, $value)
+	{
+		return $this->having(array($field, $value, '>='), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingLike($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'LIKE'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingLike($field, $value)
+	{
+		return $this->having(array($field, $value, 'LIKE'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotLike($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'NOT LIKE'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingNotLike($field, $value)
+	{
+		return $this->having(array($field, $value, 'NOT LIKE'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingBetween($field, $min, $max, $glue = 'AND')
+	{
+		return $this->having(array($field, array($min, $max), 'BETWEEN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @return $this
+	 */
+	public function orHavingBetween($field, $min, $max)
+	{
+		return $this->having(array($field, array($min, $max), 'BETWEEN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotBetween($field, $min, $max, $glue = 'AND')
+	{
+		return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $min
+	 * @param $max
+	 * @return $this
+	 */
+	public function orHavingNotBetween($field, $min, $max)
+	{
+		return $this->having(array($field, array($min, $max), 'NOT BETWEEN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingIn($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'IN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingIn($field, $value)
+	{
+		return $this->having(array($field, $value, 'IN'), 'OR');
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingNotIn($field, $value, $glue = 'AND')
+	{
+		return $this->having(array($field, $value, 'NOT IN'), $glue);
+	}
+
+	/**
+	 * @param $field
+	 * @param $value
+	 * @return $this
+	 */
+	public function orHavingNotIn($field, $value)
+	{
+		return $this->having(array($field, $value, 'NOT IN'), 'OR');
+	}
+
+	/**
+	 * @param $whereString
+	 * @param array $bindParams
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingExpression($whereString, array $bindParams = [], $glue = 'AND')
+	{
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+
+		return $this->having($whereString, $glue);
+	}
+
+	/**
+	 * @param $whereString
+	 * @param array $bindParams
+	 * @return $this
+	 */
+	public function orHavingExpression($whereString, array $bindParams = [])
+	{
+		$whereString = $this->queryStructure->bindParamsExpression($whereString, $bindParams);
+
+		return $this->having($whereString, 'OR');
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function havingInvertResult()
+	{
+		$this->queryStructure->setElement(QueryStructure::HAVING_INVERT, 1);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $glue
+	 * @return $this
+	 */
+	public function havingGroup($glue = 'AND')
+	{
+		$this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => $glue, 'body' => '(', 'type' => 'start_where_group'));
+
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function orHavingGroup()
+	{
+		return $this->havingGroup('OR');
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function havingGroupEnd()
+	{
+		$this->queryStructure->setElement(QueryStructure::HAVING, array('glue' => '', 'body' => ')', 'type' => 'end_where_group'));
+
+		return $this;
+	}
+
+	/**
+	 * @param $param
+	 * @param string $glue
+	 * @return $this
+	 */
+	private function having($param, $glue = 'AND')
+	{
+		return $this->createCondition($param, $glue, QueryStructure::HAVING);
+	}
 
 }
\ No newline at end of file

src/Traits/WhereAndHavingBuilder.php

Indentation +162 added lines, -162 removed lines

@@ -17,167 +17,167 @@
 trait WhereAndHavingBuilder
 {
 
-    use Objects;
-
-
-    /**
-     * @param $param
-     * @param string $glue
-     * @param $clauseType
-     * @return $this
-     */
-    protected function createCondition($param, $glue = 'AND', $clauseType)
-    {
-
-        if (!is_array($param)) {
-            $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => trim($param), 'type' => 'cond'));
-
-            return $this;
-        }
-
-        $param = $this->validateWhereParam($param);
-
-        $field = $param[0];
-        $value = $param[1];
-        $operator = $param[2];
-
-        switch ($operator) {
-            case 'BETWEEN':
-            case 'NOT BETWEEN':
-            case '!BETWEEN':
-                $min = $value[0];
-                $max = $value[1];
-                $body = [$field, $operator, $this->queryStructure->bindParam('min', $min), 'AND', $this->queryStructure->bindParam('max', $max)];
-                $body = implode(' ', $body);
-                $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-                break;
-
-            case 'IN':
-            case 'NOT IN':
-            case '!IN':
-                if (is_a($value, QuerySelect::class))
-                    return $this->inSelectObject($field, $value, $operator, $glue, $clauseType); elseif (is_array($value))
-                    return $this->inArray($field, $value, $operator, $glue, $clauseType);
-                break;
-
-            default:
-                $valuePdoString = $this->queryStructure->bindParam($field, $value);
-                $body = $field . ' ' . $operator . ' ' . $valuePdoString;
-                $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-
-        }
-
-        return $this;
-
-    }
-
-
-    /**
-     * @param $field
-     * @param QuerySelect $subquerySelect
-     * @param $operator
-     * @param string $glue
-     * @param $clauseType
-     * @return $this
-     */
-    private function inSelectObject($field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType)
-    {
-        $subquerySelectParams = $subquerySelect->getBindParams();
-        foreach ($subquerySelectParams as $key => $value) {
-            $this->queryStructure->setParams($key, $value);
-        }
-        $body = [$field, $operator, '( ', $subquerySelect->getSyntax(), ' )'];
-        $body = implode(' ', $body);
-        $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-
-        return $this;
-    }
-
-    /**
-     * @param $field
-     * @param array $value
-     * @param $operator
-     * @param $glue
-     * @param $clauseType
-     * @return $this
-     */
-    private function inArray($field, array $value, $operator, $glue, $clauseType)
-    {
-        $pdoArray = array();
-        foreach ($value as $item) {
-            $pdoArray[] = $this->queryStructure->bindParam('a', $item);
-        }
-        $body = [$field, $operator, '( ' . implode(', ', $pdoArray) . ' )'];
-        $body = implode(' ', $body);
-        $body = QueryHelper::clearMultipleSpaces($body);
-        $this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
-
-        return $this;
-    }
-
-
-    /**
-     * @return bool|mixed|string
-     */
-    private function getWhereSyntax()
-    {
-        return $this->getWhereAndHavingSyntax(QueryStructure::WHERE);
-    }
-
-    /**
-     * @return bool|mixed|string
-     */
-    private function getHavingSyntax()
-    {
-        return $this->getWhereAndHavingSyntax(QueryStructure::HAVING);
-    }
-
-    /**
-     * @param $clauseType
-     * @return bool|mixed|string
-     */
-    private function getWhereAndHavingSyntax($clauseType)
-    {
-        if (count($this->queryStructure->getElement($clauseType)) == 0)
-            return '';
-
-        $where = '';
-        $last_type = 'where_start';
-        foreach ($this->queryStructure->getElement($clauseType) as $where_cond) {
-            $glue = $where_cond['glue'];
-            if ($last_type == 'where_start' || $last_type == 'start_where_group') {
-                $glue = '';
-            }
-            $where .= ' ' . $glue . ' ' . $where_cond['body'];
-            $last_type = $where_cond['type'];
-        }
-
-        if ($this->queryStructure->getElement($clauseType . '_invert')) {
-            $where = ' NOT ( ' . $where . ' ) ';
-        }
-
-        $where = 'WHERE ' . $where;
-
-        return QueryHelper::clearMultipleSpaces($where);
-    }
-
-    /**
-     * @param $param
-     * @return array
-     * @throws QueryException
-     */
-    private function validateWhereParam($param)
-    {
-        if (count($param) < 2)
-            throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
-
-        if (count($param) == 2)
-            $param[] = '=';
-
-        $param[2] = trim(strtoupper($param[2]));
-        $param[2] = QueryHelper::clearMultipleSpaces($param[2]);
-
-        return $param;
-    }
+	use Objects;
+
+
+	/**
+	 * @param $param
+	 * @param string $glue
+	 * @param $clauseType
+	 * @return $this
+	 */
+	protected function createCondition($param, $glue = 'AND', $clauseType)
+	{
+
+		if (!is_array($param)) {
+			$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => trim($param), 'type' => 'cond'));
+
+			return $this;
+		}
+
+		$param = $this->validateWhereParam($param);
+
+		$field = $param[0];
+		$value = $param[1];
+		$operator = $param[2];
+
+		switch ($operator) {
+			case 'BETWEEN':
+			case 'NOT BETWEEN':
+			case '!BETWEEN':
+				$min = $value[0];
+				$max = $value[1];
+				$body = [$field, $operator, $this->queryStructure->bindParam('min', $min), 'AND', $this->queryStructure->bindParam('max', $max)];
+				$body = implode(' ', $body);
+				$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+				break;
+
+			case 'IN':
+			case 'NOT IN':
+			case '!IN':
+				if (is_a($value, QuerySelect::class))
+					return $this->inSelectObject($field, $value, $operator, $glue, $clauseType); elseif (is_array($value))
+					return $this->inArray($field, $value, $operator, $glue, $clauseType);
+				break;
+
+			default:
+				$valuePdoString = $this->queryStructure->bindParam($field, $value);
+				$body = $field . ' ' . $operator . ' ' . $valuePdoString;
+				$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+
+		}
+
+		return $this;
+
+	}
+
+
+	/**
+	 * @param $field
+	 * @param QuerySelect $subquerySelect
+	 * @param $operator
+	 * @param string $glue
+	 * @param $clauseType
+	 * @return $this
+	 */
+	private function inSelectObject($field, QuerySelect $subquerySelect, $operator, $glue = 'AND', $clauseType)
+	{
+		$subquerySelectParams = $subquerySelect->getBindParams();
+		foreach ($subquerySelectParams as $key => $value) {
+			$this->queryStructure->setParams($key, $value);
+		}
+		$body = [$field, $operator, '( ', $subquerySelect->getSyntax(), ' )'];
+		$body = implode(' ', $body);
+		$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+
+		return $this;
+	}
+
+	/**
+	 * @param $field
+	 * @param array $value
+	 * @param $operator
+	 * @param $glue
+	 * @param $clauseType
+	 * @return $this
+	 */
+	private function inArray($field, array $value, $operator, $glue, $clauseType)
+	{
+		$pdoArray = array();
+		foreach ($value as $item) {
+			$pdoArray[] = $this->queryStructure->bindParam('a', $item);
+		}
+		$body = [$field, $operator, '( ' . implode(', ', $pdoArray) . ' )'];
+		$body = implode(' ', $body);
+		$body = QueryHelper::clearMultipleSpaces($body);
+		$this->queryStructure->setElement($clauseType, array('glue' => $glue, 'body' => $body, 'type' => 'cond'));
+
+		return $this;
+	}
+
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	private function getWhereSyntax()
+	{
+		return $this->getWhereAndHavingSyntax(QueryStructure::WHERE);
+	}
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	private function getHavingSyntax()
+	{
+		return $this->getWhereAndHavingSyntax(QueryStructure::HAVING);
+	}
+
+	/**
+	 * @param $clauseType
+	 * @return bool|mixed|string
+	 */
+	private function getWhereAndHavingSyntax($clauseType)
+	{
+		if (count($this->queryStructure->getElement($clauseType)) == 0)
+			return '';
+
+		$where = '';
+		$last_type = 'where_start';
+		foreach ($this->queryStructure->getElement($clauseType) as $where_cond) {
+			$glue = $where_cond['glue'];
+			if ($last_type == 'where_start' || $last_type == 'start_where_group') {
+				$glue = '';
+			}
+			$where .= ' ' . $glue . ' ' . $where_cond['body'];
+			$last_type = $where_cond['type'];
+		}
+
+		if ($this->queryStructure->getElement($clauseType . '_invert')) {
+			$where = ' NOT ( ' . $where . ' ) ';
+		}
+
+		$where = 'WHERE ' . $where;
+
+		return QueryHelper::clearMultipleSpaces($where);
+	}
+
+	/**
+	 * @param $param
+	 * @return array
+	 * @throws QueryException
+	 */
+	private function validateWhereParam($param)
+	{
+		if (count($param) < 2)
+			throw new QueryException('Invalid where array!', QueryException::QUERY_ERROR_WHERE_INVALID_PARAM_ARRAY);
+
+		if (count($param) == 2)
+			$param[] = '=';
+
+		$param[2] = trim(strtoupper($param[2]));
+		$param[2] = QueryHelper::clearMultipleSpaces($param[2]);
+
+		return $param;
+	}
 
 }
\ No newline at end of file

src/Traits/LowPriority.php

Indentation +9 added lines, -9 removed lines

@@ -14,16 +14,16 @@
 trait LowPriority
 {
 
-    use Objects;
+	use Objects;
 
-    /**
-     * @return $this
-     */
-    public function lowPriority()
-    {
-        $this->queryStructure->setElement(QueryStructure::PRIORITY, 'LOW_PRIORITY');
+	/**
+	 * @return $this
+	 */
+	public function lowPriority()
+	{
+		$this->queryStructure->setElement(QueryStructure::PRIORITY, 'LOW_PRIORITY');
 
-        return $this;
-    }
+		return $this;
+	}
 
 }
\ No newline at end of file