gin0115 / pixie-wpdb

src/QueryBuilder/Raw.php

Indentation +52 added lines, -52 removed lines

@@ -4,62 +4,62 @@
 
 class Raw
 {
-    /**
-     * @var string
-     */
-    protected $value;
+	/**
+	 * @var string
+	 */
+	protected $value;
 
-    /**
-     * @var mixed[]
-     */
-    protected $bindings;
+	/**
+	 * @var mixed[]
+	 */
+	protected $bindings;
 
-    /**
-     * @param string $value
-     * @param mixed|mixed[] $bindings
-     */
-    public function __construct($value, $bindings = [])
-    {
-        $this->value    = (string)$value;
-        $this->bindings = (array)$bindings;
-    }
+	/**
+	 * @param string $value
+	 * @param mixed|mixed[] $bindings
+	 */
+	public function __construct($value, $bindings = [])
+	{
+		$this->value    = (string)$value;
+		$this->bindings = (array)$bindings;
+	}
 
-    /**
-     * Create a Raw instance with no bindings
-     *
-     * @param string $value
-     * @return self
-     */
-    public static function val(string $value): self
-    {
-        return new self($value, []);
-    }
+	/**
+	 * Create a Raw instance with no bindings
+	 *
+	 * @param string $value
+	 * @return self
+	 */
+	public static function val(string $value): self
+	{
+		return new self($value, []);
+	}
 
-    /**
-     * Returns the current bindings
-     *
-     * @return mixed[]
-     */
-    public function getBindings(): array
-    {
-        return $this->bindings;
-    }
+	/**
+	 * Returns the current bindings
+	 *
+	 * @return mixed[]
+	 */
+	public function getBindings(): array
+	{
+		return $this->bindings;
+	}
 
-    /**
-     * Returns the current value held.
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return (string) $this->value;
-    }
+	/**
+	 * Returns the current value held.
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return (string) $this->value;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string)$this->value;
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return (string)$this->value;
+	}
 }

src/QueryBuilder/WPDBAdapter.php

Indentation +711 added lines, -711 removed lines

@@ -17,715 +17,715 @@
 
 class WPDBAdapter
 {
-    /**
-     * @var string
-     */
-    protected $sanitizer = '';
-
-    /**
-     * @var \Pixie\Connection
-     */
-    protected $connection;
-
-    /**
-     * @var \Viocon\Container
-     */
-    protected $container;
-
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-        $this->container  = $this->connection->getContainer();
-    }
-
-    /**
-     * Build select query string and bindings
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     *
-     * @throws Exception
-     *
-     * @return array{sql:string,bindings:mixed[]}
-     */
-    public function select(array $statements): array
-    {
-        if (!array_key_exists('tables', $statements)) {
-            throw new Exception('No table specified.', 3);
-        } elseif (!array_key_exists('selects', $statements)) {
-            $statements['selects'][] = '*';
-        }
-
-        // From
-        $tables = $this->arrayStr($statements['tables'], ', ');
-        // Select
-        $selects = $this->arrayStr($statements['selects'], ', ');
-
-        // Wheres
-        list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
-
-        // Group bys
-        $groupBys = '';
-        if (isset($statements['groupBys']) && $groupBys = $this->arrayStr($statements['groupBys'], ', ')) {
-            $groupBys = 'GROUP BY ' . $groupBys;
-        }
-
-        // Order bys
-        $orderBys = '';
-        if (isset($statements['orderBys']) && is_array($statements['orderBys'])) {
-            foreach ($statements['orderBys'] as $orderBy) {
-                $field = $this->wrapSanitizer($orderBy['field']);
-                if ($field instanceof Closure) {
-                    continue;
-                }
-                $orderBys .= $field . ' ' . $orderBy['type'] . ', ';
-            }
-
-            if ($orderBys = trim($orderBys, ', ')) {
-                $orderBys = 'ORDER BY ' . $orderBys;
-            }
-        }
-
-        // Limit and offset
-        $limit  = isset($statements['limit']) ? 'LIMIT ' . (int) $statements['limit'] : '';
-        $offset = isset($statements['offset']) ? 'OFFSET ' . (int) $statements['offset'] : '';
-
-        // Having
-        list($havingCriteria, $havingBindings) = $this->buildCriteriaWithType($statements, 'havings', 'HAVING');
-
-        // Joins
-        $joinString = $this->buildJoin($statements);
-
-        /** @var string[] */
-        $sqlArray = [
-            'SELECT' . (isset($statements['distinct']) ? ' DISTINCT' : ''),
-            $selects,
-            'FROM',
-            $tables,
-            $joinString,
-            $whereCriteria,
-            $groupBys,
-            $havingCriteria,
-            $orderBys,
-            $limit,
-            $offset,
-        ];
-
-        $sql = $this->concatenateQuery($sqlArray);
-
-        $bindings = array_merge(
-            $whereBindings,
-            $havingBindings
-        );
-
-        return compact('sql', 'bindings');
-    }
-
-    /**
-     * Build just criteria part of the query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param bool $bindValues
-     *
-     * @return array{sql:string[]|string, bindings:array<mixed>}
-     */
-    public function criteriaOnly(array $statements, bool $bindValues = true): array
-    {
-        $sql = $bindings = [];
-        if (!isset($statements['criteria'])) {
-            return compact('sql', 'bindings');
-        }
-
-        list($sql, $bindings) = $this->buildCriteria($statements['criteria'], $bindValues);
-
-        return compact('sql', 'bindings');
-    }
-
-    /**
-     * Build a generic insert/ignore/replace query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param array<string, mixed> $data
-     * @param string $type
-     *
-     * @return array{sql:string, bindings:mixed[]}
-     *
-     * @throws Exception
-     */
-    private function doInsert(array $statements, array $data, string $type): array
-    {
-        if (!isset($statements['tables'])) {
-            throw new Exception('No table specified', 3);
-        }
-
-        $table = end($statements['tables']);
-
-        $bindings = $keys = $values = [];
-
-        foreach ($data as $key => $value) {
-            $keys[] = $key;
-
-            // Handle value as bindings
-            $isBindings = $value instanceof Binding;
-            // If this is a raw binding, extract the Raw and replace value.
-            if ($isBindings && $value->isRaw()) {
-                $value = $value->getValue();
-            }
-
-            if ($value instanceof Raw) {
-                $values[] = $this->parseRaw($value);
-            } elseif ($isBindings) {
-                $values[]   =  $value->getType();
-                $bindings[] = $value->getValue();
-            } else {
-                $values[]   =  $this->inferType($value);
-                $bindings[] = $value;
-            }
-        }
-
-        $sqlArray = [
-        $type . ' INTO',
-        $this->wrapSanitizer($table),
-        '(' . $this->arrayStr($keys, ',') . ')',
-        'VALUES',
-        '(' . $this->arrayStr($values, ',') . ')',
-        ];
-
-        if (isset($statements['onduplicate'])) {
-            if (count($statements['onduplicate']) < 1) {
-                throw new Exception('No data given.', 4);
-            }
-            list($updateStatement, $updateBindings) = $this->getUpdateStatement($statements['onduplicate']);
-            $sqlArray[]                             = 'ON DUPLICATE KEY UPDATE ' . $updateStatement;
-            $bindings                               = array_merge($bindings, $updateBindings);
-        }
-
-        $sql = $this->concatenateQuery($this->stringifyValues($sqlArray));
-
-        return compact('sql', 'bindings');
-    }
-
-    /**
-     * Attempts to stringify an array of values.
-     *
-     * @param array<string|int, string|Closure> $values
-     *
-     * @return string[]
-     */
-    protected function stringifyValues(array $values): array
-    {
-        return array_filter(array_map([$this, 'stringifyValue'], $values));
-    }
-
-    /**
-     * Attempts to stringify a single of values.
-     *
-     * @param string|Closure|Raw $value
-     *
-     * @return string|null
-     */
-    protected function stringifyValue($value): ?string
-    {
-        if ($value instanceof Closure) {
-            $value = $value();
-
-            return is_string($value) ? $value : null;
-        }
-
-        if ($value instanceof Raw) {
-            return $this->parseRaw($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Build Insert query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param array<string, mixed> $data $data
-     *
-     * @return array{sql:string, bindings:mixed[]}
-     *
-     * @throws Exception
-     */
-    public function insert($statements, array $data)
-    {
-        return $this->doInsert($statements, $data, 'INSERT');
-    }
-
-    /**
-     * Build Insert Ignore query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param array<string, mixed> $data $data
-     *
-     * @return array{sql:string, bindings:mixed[]}
-     *
-     * @throws Exception
-     */
-    public function insertIgnore($statements, array $data)
-    {
-        return $this->doInsert($statements, $data, 'INSERT IGNORE');
-    }
-
-    /**
-     * Build Insert Ignore query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param array<string, mixed> $data $data
-     *
-     * @return array{sql:string, bindings:mixed[]}
-     *
-     * @throws Exception
-     */
-    public function replace($statements, array $data)
-    {
-        return $this->doInsert($statements, $data, 'REPLACE');
-    }
-
-    /**
-     * Build fields assignment part of SET ... or ON DUBLICATE KEY UPDATE ... statements
-     *
-     * @param array<string, mixed> $data
-     *
-     * @return array{0:string,1:mixed[]}
-     */
-    private function getUpdateStatement(array $data): array
-    {
-        $bindings  = [];
-        $statement = '';
-
-        foreach ($data as $key => $value) {
-            $isBindings = $value instanceof Binding;
-            // If this is a raw binding, extract the Raw and replace value.
-            if ($isBindings && $value->isRaw()) {
-                $value = $value->getValue();
-            }
-
-            if ($value instanceof Raw) {
-                $statement .= $this->stringifyValue($this->wrapSanitizer($key)) . '=' . $value . ',';
-            } elseif ($isBindings) {
-                $statement .= $this->stringifyValue($this->wrapSanitizer($key)) . sprintf('=%s,', $value->getType());
-                $bindings[] = $value->getValue();
-            } else {
-                $statement .= $this->stringifyValue($this->wrapSanitizer($key)) . sprintf('=%s,', $this->inferType($value));
-                $bindings[] = $value;
-            }
-        }
-
-        $statement = trim($statement, ',');
-
-        return [$statement, $bindings];
-    }
-
-    /**
-     * Build update query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param array<string, mixed> $data
-     *
-     * @return array{sql:string, bindings:mixed[]}
-     *
-     * @throws Exception
-     */
-    public function update($statements, array $data)
-    {
-        if (!isset($statements['tables'])) {
-            throw new Exception('No table specified', 3);
-        } elseif (count($data) < 1) {
-            throw new Exception('No data given.', 4);
-        }
-
-        $table = end($statements['tables']);
-
-        // Update statement
-        list($updateStatement, $bindings) = $this->getUpdateStatement($data);
-
-        // Wheres
-        list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
-
-        // Limit
-        $limit = isset($statements['limit']) ? 'LIMIT ' . $statements['limit'] : '';
-
-        $sqlArray = [
-            'UPDATE',
-            $this->wrapSanitizer($table),
-            'SET ' . $updateStatement,
-            $whereCriteria,
-            $limit,
-        ];
-
-        $sql = $this->concatenateQuery($this->stringifyValues($sqlArray));
-
-        $bindings = array_merge($bindings, $whereBindings);
-
-        return compact('sql', 'bindings');
-    }
-
-    /**
-     * Build delete query
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     *
-     * @return array{sql:string, bindings:mixed[]}
-     *
-     * @throws Exception
-     */
-    public function delete($statements)
-    {
-        if (!isset($statements['tables'])) {
-            throw new Exception('No table specified', 3);
-        }
-
-        $table = end($statements['tables']);
-        // Ensure table name is a string
-        $table = $this->stringifyValue($this->wrapSanitizer($table));
-        if (null === $table) {
-            throw new Exception('Table must be a valid string.', 5);
-        }
-
-        // Wheres
-        list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
-
-        // Limit
-        $limit = isset($statements['limit']) ? 'LIMIT ' . $statements['limit'] : '';
-
-        $sqlArray = ['DELETE FROM', $table, $whereCriteria];
-        $sql      = $this->concatenateQuery($sqlArray);
-        $bindings = $whereBindings;
-
-        return compact('sql', 'bindings');
-    }
-
-    /**
-     * Array concatenating method, like implode.
-     * But it does wrap sanitizer and trims last glue
-     *
-     * @param array<string|int, string> $pieces
-     * @param string $glue
-     *
-     * @return string
-     */
-    protected function arrayStr(array $pieces, string $glue): string
-    {
-        $str = '';
-        foreach ($pieces as $key => $piece) {
-            if (!is_int($key)) {
-                $piece = $key . ' AS ' . $piece;
-            }
-
-            $str .= $piece . $glue;
-        }
-
-        return trim($str, $glue);
-    }
-
-    /**
-     * Join different part of queries with a space.
-     *
-     * @param array<string|int, string> $pieces
-     *
-     * @return string
-     */
-    protected function concatenateQuery(array $pieces): string
-    {
-        $str = '';
-        foreach ($pieces as $piece) {
-            $str = trim($str) . ' ' . trim($piece);
-        }
-
-        return trim($str);
-    }
-
-    /**
-     * Gets the type of a value, either from a binding or infered
-     *
-     * @param mixed $value
-     * @return string
-     */
-    public function getType($value): string
-    {
-        return $value instanceof Binding && $value->getType() !== null
-            ? $value->getType() : $this->inferType($value) ;
-    }
-
-    /**
-     * Get the value from a possible Bindings object.
-     *
-     * @param mixed $value
-     * @return mixed
-     */
-    public function getValue($value)
-    {
-        return $value instanceof Binding ? $value->getValue() : $value;
-    }
-
-    /**
-     * Attempts to parse a raw query, if bindings are defined then they will be bound first.
-     *
-     * @param Raw $raw
-     * @requires string
-     */
-    public function parseRaw(Raw $raw): string
-    {
-        $bindings = $raw->getBindings();
-        return 0 === count($bindings)
-            ? (string) $raw
-            : $this->interpolateQuery($raw->getValue(), $bindings);
-    }
-
-    /**
-     * Interpolates a query
-     *
-     * @param string $query
-     * @param array<mixed> $bindings
-     * @return string
-     */
-    public function interpolateQuery(string $query, array $bindings = []): string
-    {
-        if (0 === count($bindings)) {
-            return $query;
-        }
-
-
-        $bindings = array_map([$this, 'getValue'], $bindings);
-        $query = $this->connection->getDbInstance()->prepare($query, $bindings) ;
-        return is_string($query) ? $query : '';
-    }
-
-    /**
-     * Build generic criteria string and bindings from statements, like "a = b and c = ?"
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param bool $bindValues
-     *
-     * @return array{0:string,1:string[]}
-     */
-    protected function buildCriteria(array $statements, bool $bindValues = true): array
-    {
-        $criteria = '';
-        $bindings = [];
-        foreach ($statements as $statement) {
-            $key   = $statement['key'];
-            $value = $statement['value'];
-
-            // If the value is a Raw Binding, cast to raw
-            if ($value instanceof Binding && Binding::RAW === $value->getType()) {
-                /** @var Raw */
-                $value = $value->getValue();
-            }
-
-            if (is_null($value) && $key instanceof Closure) {
-                // We have a closure, a nested criteria
-
-                // Build a new NestedCriteria class, keep it by reference so any changes made
-                // in the closure should reflect here
-                $nestedCriteria = $this->container->build(NestedCriteria::class, [$this->connection]);
-
-                $nestedCriteria = &$nestedCriteria;
-                // Call the closure with our new nestedCriteria object
-                $key($nestedCriteria);
-                // Get the criteria only query from the nestedCriteria object
-                $queryObject = $nestedCriteria->getQuery('criteriaOnly', true);
-                // Merge the bindings we get from nestedCriteria object
-                $bindings = array_merge($bindings, $queryObject->getBindings());
-                // Append the sql we get from the nestedCriteria object
-                $criteria .= $statement['joiner'] . ' (' . $queryObject->getSql() . ') ';
-            } elseif (is_array($value)) {
-                // where_in or between like query
-                $criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'];
-
-                switch ($statement['operator']) {
-                    case 'BETWEEN':
-                        $bindings = array_merge($bindings, $statement['value']);
-                        $criteria .= sprintf(
-                            ' %s AND %s ',
-                            $this->getType($value[0]),
-                            $this->getType($value[1])
-                        );
-
-                        // Maybe cast the values bindings.
-                        $value[0] = $this->getValue($value[0]);
-                        $value[1] = $this->getValue($value[1]);
-
-                        // Parse any raws.
-                        $value = array_map(function ($value) {
-                            return $value instanceof Raw
-                                ? $this->parseRaw($value)
-                                : $value;
-                        }, $value);
-                        break;
-                    default:
-                        $valuePlaceholder = '';
-                        foreach ($statement['value'] as $subValue) {
-                            // Get its value.
-                            if ($this->getValue($subValue) instanceof Raw) {
-                                /** @var Raw $subValue */
-                                $subValue = $this->getValue($subValue);
-                                $valuePlaceholder .= sprintf('%s, ', $this->parseRaw($subValue));
-                                continue;
-                            }
-
-
-                            // Add in format placeholders.
-                            $valuePlaceholder .= sprintf('%s, ', $this->getType($subValue)); // glynn
-                            $bindings[] = $this->getValue($subValue);
-                        }
-
-                        $valuePlaceholder = trim($valuePlaceholder, ', ');
-                        $criteria .= ' (' . $valuePlaceholder . ') ';
-                        break;
-                }
-            } elseif ($value instanceof Raw) {
-                $value = $this->parseRaw($value);
-                $criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value ";
-            } else {
-                // Usual where like criteria
-                if (!$bindValues) {
-                    // Specially for joins
-                    // We are not binding values, lets sanitize then
-                    $value = $this->stringifyValue($this->wrapSanitizer($value)) ?? '';
-                    $criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'] . ' ' . $value . ' ';
-                } elseif ($statement['key'] instanceof Raw) {
-                    $criteria .= $statement['joiner'] . ' ' . $key . ' ';
-                    $bindings = array_merge($bindings, $statement['key']->getBindings());
-                } else {
-                    // For wheres
-                    $bindings[] = $this->getValue($value);
-
-                    $criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'] . ' '
-                    . $this->getType($value) . ' ';
-                }
-            }
-        }
-
-        // Clear all white spaces, and, or from beginning and white spaces from ending
-        $criteria = preg_replace('/^(\s?AND ?|\s?OR ?)|\s$/i', '', $criteria);
-
-        return [$criteria ?? '', $bindings];
-    }
-
-    /**
-     * Asserts the types place holder based on its value
-     *
-     * @param mixed $value
-     *
-     * @return string
-     */
-    public function inferType($value): string
-    {
-        switch (true) {
-            case is_string($value):
-                return '%s';
-            case \is_int($value):
-            case is_bool($value):
-                return '%d';
-            case is_float($value):
-                return '%f';
-            default:
-                return '';
-        }
-    }
-
-    /**
-     * Wrap values with adapter's sanitizer like, '`'
-     *
-     * @param string|Raw|Closure $value
-     *
-     * @return string|Closure
-     */
-    public function wrapSanitizer($value)
-    {
-        // Its a raw query, just cast as string, object has __toString()
-        if ($value instanceof Raw) {
-            return $this->parseRaw($value);
-        } elseif ($value instanceof Closure) {
-            return $value;
-        }
-
-        // Separate our table and fields which are joined with a ".",
-        // like my_table.id
-        $valueArr = explode('.', $value, 2);
-
-        foreach ($valueArr as $key => $subValue) {
-            // Don't wrap if we have *, which is not a usual field
-            $valueArr[$key] = '*' == trim($subValue) ? $subValue : $this->sanitizer . $subValue . $this->sanitizer;
-        }
-
-        // Join these back with "." and return
-        return implode('.', $valueArr);
-    }
-
-    /**
-     * Build criteria string and binding with various types added, like WHERE and Having
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     * @param string $key
-     * @param string $type
-     * @param bool $bindValues
-     *
-     * @return array{0:string, 1:string[]}
-     */
-    protected function buildCriteriaWithType(array $statements, string $key, string $type, bool $bindValues = true)
-    {
-        $criteria = '';
-        $bindings = [];
-
-        if (isset($statements[$key])) {
-            // Get the generic/adapter agnostic criteria string from parent
-            list($criteria, $bindings) = $this->buildCriteria($statements[$key], $bindValues);
-
-            if ($criteria) {
-                $criteria = $type . ' ' . $criteria;
-            }
-        }
-
-        // Remove any multiple whitespace.
-        $criteria = (string) preg_replace('!\s+!', ' ', $criteria);
-
-        return [$criteria, $bindings];
-    }
-
-    /**
-     * Build join string
-     *
-     * @param array<string|Closure, mixed|mixed[]> $statements
-     *
-     * @return string
-     */
-    protected function buildJoin(array $statements): string
-    {
-        $sql = '';
-
-        if (!array_key_exists('joins', $statements) || !is_array($statements['joins'])) {
-            return $sql;
-        }
-
-        foreach ($statements['joins'] as $joinArr) {
-            if (is_array($joinArr['table'])) {
-                $mainTable  = $this->stringifyValue($this->wrapSanitizer($joinArr['table'][0]));
-                $aliasTable = $this->stringifyValue($this->wrapSanitizer($joinArr['table'][1]));
-                $table      = $mainTable . ' AS ' . $aliasTable;
-            } else {
-                $table = $joinArr['table'] instanceof Raw
-                    ? $this->parseRaw($joinArr['table'])
-                    : $this->wrapSanitizer($joinArr['table']);
-            }
-            $joinBuilder = $joinArr['joinBuilder'];
-
-            /** @var string[] */
-            $sqlArr = [
-                $sql,
-                strtoupper($joinArr['type']),
-                'JOIN',
-                $table,
-                'ON',
-                $joinBuilder->getQuery('criteriaOnly', false)->getSql(),
-            ];
-
-            $sql = $this->concatenateQuery($sqlArr);
-        }
-
-        return $sql;
-    }
+	/**
+	 * @var string
+	 */
+	protected $sanitizer = '';
+
+	/**
+	 * @var \Pixie\Connection
+	 */
+	protected $connection;
+
+	/**
+	 * @var \Viocon\Container
+	 */
+	protected $container;
+
+	public function __construct(Connection $connection)
+	{
+		$this->connection = $connection;
+		$this->container  = $this->connection->getContainer();
+	}
+
+	/**
+	 * Build select query string and bindings
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 *
+	 * @throws Exception
+	 *
+	 * @return array{sql:string,bindings:mixed[]}
+	 */
+	public function select(array $statements): array
+	{
+		if (!array_key_exists('tables', $statements)) {
+			throw new Exception('No table specified.', 3);
+		} elseif (!array_key_exists('selects', $statements)) {
+			$statements['selects'][] = '*';
+		}
+
+		// From
+		$tables = $this->arrayStr($statements['tables'], ', ');
+		// Select
+		$selects = $this->arrayStr($statements['selects'], ', ');
+
+		// Wheres
+		list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
+
+		// Group bys
+		$groupBys = '';
+		if (isset($statements['groupBys']) && $groupBys = $this->arrayStr($statements['groupBys'], ', ')) {
+			$groupBys = 'GROUP BY ' . $groupBys;
+		}
+
+		// Order bys
+		$orderBys = '';
+		if (isset($statements['orderBys']) && is_array($statements['orderBys'])) {
+			foreach ($statements['orderBys'] as $orderBy) {
+				$field = $this->wrapSanitizer($orderBy['field']);
+				if ($field instanceof Closure) {
+					continue;
+				}
+				$orderBys .= $field . ' ' . $orderBy['type'] . ', ';
+			}
+
+			if ($orderBys = trim($orderBys, ', ')) {
+				$orderBys = 'ORDER BY ' . $orderBys;
+			}
+		}
+
+		// Limit and offset
+		$limit  = isset($statements['limit']) ? 'LIMIT ' . (int) $statements['limit'] : '';
+		$offset = isset($statements['offset']) ? 'OFFSET ' . (int) $statements['offset'] : '';
+
+		// Having
+		list($havingCriteria, $havingBindings) = $this->buildCriteriaWithType($statements, 'havings', 'HAVING');
+
+		// Joins
+		$joinString = $this->buildJoin($statements);
+
+		/** @var string[] */
+		$sqlArray = [
+			'SELECT' . (isset($statements['distinct']) ? ' DISTINCT' : ''),
+			$selects,
+			'FROM',
+			$tables,
+			$joinString,
+			$whereCriteria,
+			$groupBys,
+			$havingCriteria,
+			$orderBys,
+			$limit,
+			$offset,
+		];
+
+		$sql = $this->concatenateQuery($sqlArray);
+
+		$bindings = array_merge(
+			$whereBindings,
+			$havingBindings
+		);
+
+		return compact('sql', 'bindings');
+	}
+
+	/**
+	 * Build just criteria part of the query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param bool $bindValues
+	 *
+	 * @return array{sql:string[]|string, bindings:array<mixed>}
+	 */
+	public function criteriaOnly(array $statements, bool $bindValues = true): array
+	{
+		$sql = $bindings = [];
+		if (!isset($statements['criteria'])) {
+			return compact('sql', 'bindings');
+		}
+
+		list($sql, $bindings) = $this->buildCriteria($statements['criteria'], $bindValues);
+
+		return compact('sql', 'bindings');
+	}
+
+	/**
+	 * Build a generic insert/ignore/replace query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param array<string, mixed> $data
+	 * @param string $type
+	 *
+	 * @return array{sql:string, bindings:mixed[]}
+	 *
+	 * @throws Exception
+	 */
+	private function doInsert(array $statements, array $data, string $type): array
+	{
+		if (!isset($statements['tables'])) {
+			throw new Exception('No table specified', 3);
+		}
+
+		$table = end($statements['tables']);
+
+		$bindings = $keys = $values = [];
+
+		foreach ($data as $key => $value) {
+			$keys[] = $key;
+
+			// Handle value as bindings
+			$isBindings = $value instanceof Binding;
+			// If this is a raw binding, extract the Raw and replace value.
+			if ($isBindings && $value->isRaw()) {
+				$value = $value->getValue();
+			}
+
+			if ($value instanceof Raw) {
+				$values[] = $this->parseRaw($value);
+			} elseif ($isBindings) {
+				$values[]   =  $value->getType();
+				$bindings[] = $value->getValue();
+			} else {
+				$values[]   =  $this->inferType($value);
+				$bindings[] = $value;
+			}
+		}
+
+		$sqlArray = [
+		$type . ' INTO',
+		$this->wrapSanitizer($table),
+		'(' . $this->arrayStr($keys, ',') . ')',
+		'VALUES',
+		'(' . $this->arrayStr($values, ',') . ')',
+		];
+
+		if (isset($statements['onduplicate'])) {
+			if (count($statements['onduplicate']) < 1) {
+				throw new Exception('No data given.', 4);
+			}
+			list($updateStatement, $updateBindings) = $this->getUpdateStatement($statements['onduplicate']);
+			$sqlArray[]                             = 'ON DUPLICATE KEY UPDATE ' . $updateStatement;
+			$bindings                               = array_merge($bindings, $updateBindings);
+		}
+
+		$sql = $this->concatenateQuery($this->stringifyValues($sqlArray));
+
+		return compact('sql', 'bindings');
+	}
+
+	/**
+	 * Attempts to stringify an array of values.
+	 *
+	 * @param array<string|int, string|Closure> $values
+	 *
+	 * @return string[]
+	 */
+	protected function stringifyValues(array $values): array
+	{
+		return array_filter(array_map([$this, 'stringifyValue'], $values));
+	}
+
+	/**
+	 * Attempts to stringify a single of values.
+	 *
+	 * @param string|Closure|Raw $value
+	 *
+	 * @return string|null
+	 */
+	protected function stringifyValue($value): ?string
+	{
+		if ($value instanceof Closure) {
+			$value = $value();
+
+			return is_string($value) ? $value : null;
+		}
+
+		if ($value instanceof Raw) {
+			return $this->parseRaw($value);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Build Insert query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param array<string, mixed> $data $data
+	 *
+	 * @return array{sql:string, bindings:mixed[]}
+	 *
+	 * @throws Exception
+	 */
+	public function insert($statements, array $data)
+	{
+		return $this->doInsert($statements, $data, 'INSERT');
+	}
+
+	/**
+	 * Build Insert Ignore query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param array<string, mixed> $data $data
+	 *
+	 * @return array{sql:string, bindings:mixed[]}
+	 *
+	 * @throws Exception
+	 */
+	public function insertIgnore($statements, array $data)
+	{
+		return $this->doInsert($statements, $data, 'INSERT IGNORE');
+	}
+
+	/**
+	 * Build Insert Ignore query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param array<string, mixed> $data $data
+	 *
+	 * @return array{sql:string, bindings:mixed[]}
+	 *
+	 * @throws Exception
+	 */
+	public function replace($statements, array $data)
+	{
+		return $this->doInsert($statements, $data, 'REPLACE');
+	}
+
+	/**
+	 * Build fields assignment part of SET ... or ON DUBLICATE KEY UPDATE ... statements
+	 *
+	 * @param array<string, mixed> $data
+	 *
+	 * @return array{0:string,1:mixed[]}
+	 */
+	private function getUpdateStatement(array $data): array
+	{
+		$bindings  = [];
+		$statement = '';
+
+		foreach ($data as $key => $value) {
+			$isBindings = $value instanceof Binding;
+			// If this is a raw binding, extract the Raw and replace value.
+			if ($isBindings && $value->isRaw()) {
+				$value = $value->getValue();
+			}
+
+			if ($value instanceof Raw) {
+				$statement .= $this->stringifyValue($this->wrapSanitizer($key)) . '=' . $value . ',';
+			} elseif ($isBindings) {
+				$statement .= $this->stringifyValue($this->wrapSanitizer($key)) . sprintf('=%s,', $value->getType());
+				$bindings[] = $value->getValue();
+			} else {
+				$statement .= $this->stringifyValue($this->wrapSanitizer($key)) . sprintf('=%s,', $this->inferType($value));
+				$bindings[] = $value;
+			}
+		}
+
+		$statement = trim($statement, ',');
+
+		return [$statement, $bindings];
+	}
+
+	/**
+	 * Build update query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param array<string, mixed> $data
+	 *
+	 * @return array{sql:string, bindings:mixed[]}
+	 *
+	 * @throws Exception
+	 */
+	public function update($statements, array $data)
+	{
+		if (!isset($statements['tables'])) {
+			throw new Exception('No table specified', 3);
+		} elseif (count($data) < 1) {
+			throw new Exception('No data given.', 4);
+		}
+
+		$table = end($statements['tables']);
+
+		// Update statement
+		list($updateStatement, $bindings) = $this->getUpdateStatement($data);
+
+		// Wheres
+		list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
+
+		// Limit
+		$limit = isset($statements['limit']) ? 'LIMIT ' . $statements['limit'] : '';
+
+		$sqlArray = [
+			'UPDATE',
+			$this->wrapSanitizer($table),
+			'SET ' . $updateStatement,
+			$whereCriteria,
+			$limit,
+		];
+
+		$sql = $this->concatenateQuery($this->stringifyValues($sqlArray));
+
+		$bindings = array_merge($bindings, $whereBindings);
+
+		return compact('sql', 'bindings');
+	}
+
+	/**
+	 * Build delete query
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 *
+	 * @return array{sql:string, bindings:mixed[]}
+	 *
+	 * @throws Exception
+	 */
+	public function delete($statements)
+	{
+		if (!isset($statements['tables'])) {
+			throw new Exception('No table specified', 3);
+		}
+
+		$table = end($statements['tables']);
+		// Ensure table name is a string
+		$table = $this->stringifyValue($this->wrapSanitizer($table));
+		if (null === $table) {
+			throw new Exception('Table must be a valid string.', 5);
+		}
+
+		// Wheres
+		list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
+
+		// Limit
+		$limit = isset($statements['limit']) ? 'LIMIT ' . $statements['limit'] : '';
+
+		$sqlArray = ['DELETE FROM', $table, $whereCriteria];
+		$sql      = $this->concatenateQuery($sqlArray);
+		$bindings = $whereBindings;
+
+		return compact('sql', 'bindings');
+	}
+
+	/**
+	 * Array concatenating method, like implode.
+	 * But it does wrap sanitizer and trims last glue
+	 *
+	 * @param array<string|int, string> $pieces
+	 * @param string $glue
+	 *
+	 * @return string
+	 */
+	protected function arrayStr(array $pieces, string $glue): string
+	{
+		$str = '';
+		foreach ($pieces as $key => $piece) {
+			if (!is_int($key)) {
+				$piece = $key . ' AS ' . $piece;
+			}
+
+			$str .= $piece . $glue;
+		}
+
+		return trim($str, $glue);
+	}
+
+	/**
+	 * Join different part of queries with a space.
+	 *
+	 * @param array<string|int, string> $pieces
+	 *
+	 * @return string
+	 */
+	protected function concatenateQuery(array $pieces): string
+	{
+		$str = '';
+		foreach ($pieces as $piece) {
+			$str = trim($str) . ' ' . trim($piece);
+		}
+
+		return trim($str);
+	}
+
+	/**
+	 * Gets the type of a value, either from a binding or infered
+	 *
+	 * @param mixed $value
+	 * @return string
+	 */
+	public function getType($value): string
+	{
+		return $value instanceof Binding && $value->getType() !== null
+			? $value->getType() : $this->inferType($value) ;
+	}
+
+	/**
+	 * Get the value from a possible Bindings object.
+	 *
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public function getValue($value)
+	{
+		return $value instanceof Binding ? $value->getValue() : $value;
+	}
+
+	/**
+	 * Attempts to parse a raw query, if bindings are defined then they will be bound first.
+	 *
+	 * @param Raw $raw
+	 * @requires string
+	 */
+	public function parseRaw(Raw $raw): string
+	{
+		$bindings = $raw->getBindings();
+		return 0 === count($bindings)
+			? (string) $raw
+			: $this->interpolateQuery($raw->getValue(), $bindings);
+	}
+
+	/**
+	 * Interpolates a query
+	 *
+	 * @param string $query
+	 * @param array<mixed> $bindings
+	 * @return string
+	 */
+	public function interpolateQuery(string $query, array $bindings = []): string
+	{
+		if (0 === count($bindings)) {
+			return $query;
+		}
+
+
+		$bindings = array_map([$this, 'getValue'], $bindings);
+		$query = $this->connection->getDbInstance()->prepare($query, $bindings) ;
+		return is_string($query) ? $query : '';
+	}
+
+	/**
+	 * Build generic criteria string and bindings from statements, like "a = b and c = ?"
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param bool $bindValues
+	 *
+	 * @return array{0:string,1:string[]}
+	 */
+	protected function buildCriteria(array $statements, bool $bindValues = true): array
+	{
+		$criteria = '';
+		$bindings = [];
+		foreach ($statements as $statement) {
+			$key   = $statement['key'];
+			$value = $statement['value'];
+
+			// If the value is a Raw Binding, cast to raw
+			if ($value instanceof Binding && Binding::RAW === $value->getType()) {
+				/** @var Raw */
+				$value = $value->getValue();
+			}
+
+			if (is_null($value) && $key instanceof Closure) {
+				// We have a closure, a nested criteria
+
+				// Build a new NestedCriteria class, keep it by reference so any changes made
+				// in the closure should reflect here
+				$nestedCriteria = $this->container->build(NestedCriteria::class, [$this->connection]);
+
+				$nestedCriteria = &$nestedCriteria;
+				// Call the closure with our new nestedCriteria object
+				$key($nestedCriteria);
+				// Get the criteria only query from the nestedCriteria object
+				$queryObject = $nestedCriteria->getQuery('criteriaOnly', true);
+				// Merge the bindings we get from nestedCriteria object
+				$bindings = array_merge($bindings, $queryObject->getBindings());
+				// Append the sql we get from the nestedCriteria object
+				$criteria .= $statement['joiner'] . ' (' . $queryObject->getSql() . ') ';
+			} elseif (is_array($value)) {
+				// where_in or between like query
+				$criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'];
+
+				switch ($statement['operator']) {
+					case 'BETWEEN':
+						$bindings = array_merge($bindings, $statement['value']);
+						$criteria .= sprintf(
+							' %s AND %s ',
+							$this->getType($value[0]),
+							$this->getType($value[1])
+						);
+
+						// Maybe cast the values bindings.
+						$value[0] = $this->getValue($value[0]);
+						$value[1] = $this->getValue($value[1]);
+
+						// Parse any raws.
+						$value = array_map(function ($value) {
+							return $value instanceof Raw
+								? $this->parseRaw($value)
+								: $value;
+						}, $value);
+						break;
+					default:
+						$valuePlaceholder = '';
+						foreach ($statement['value'] as $subValue) {
+							// Get its value.
+							if ($this->getValue($subValue) instanceof Raw) {
+								/** @var Raw $subValue */
+								$subValue = $this->getValue($subValue);
+								$valuePlaceholder .= sprintf('%s, ', $this->parseRaw($subValue));
+								continue;
+							}
+
+
+							// Add in format placeholders.
+							$valuePlaceholder .= sprintf('%s, ', $this->getType($subValue)); // glynn
+							$bindings[] = $this->getValue($subValue);
+						}
+
+						$valuePlaceholder = trim($valuePlaceholder, ', ');
+						$criteria .= ' (' . $valuePlaceholder . ') ';
+						break;
+				}
+			} elseif ($value instanceof Raw) {
+				$value = $this->parseRaw($value);
+				$criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value ";
+			} else {
+				// Usual where like criteria
+				if (!$bindValues) {
+					// Specially for joins
+					// We are not binding values, lets sanitize then
+					$value = $this->stringifyValue($this->wrapSanitizer($value)) ?? '';
+					$criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'] . ' ' . $value . ' ';
+				} elseif ($statement['key'] instanceof Raw) {
+					$criteria .= $statement['joiner'] . ' ' . $key . ' ';
+					$bindings = array_merge($bindings, $statement['key']->getBindings());
+				} else {
+					// For wheres
+					$bindings[] = $this->getValue($value);
+
+					$criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'] . ' '
+					. $this->getType($value) . ' ';
+				}
+			}
+		}
+
+		// Clear all white spaces, and, or from beginning and white spaces from ending
+		$criteria = preg_replace('/^(\s?AND ?|\s?OR ?)|\s$/i', '', $criteria);
+
+		return [$criteria ?? '', $bindings];
+	}
+
+	/**
+	 * Asserts the types place holder based on its value
+	 *
+	 * @param mixed $value
+	 *
+	 * @return string
+	 */
+	public function inferType($value): string
+	{
+		switch (true) {
+			case is_string($value):
+				return '%s';
+			case \is_int($value):
+			case is_bool($value):
+				return '%d';
+			case is_float($value):
+				return '%f';
+			default:
+				return '';
+		}
+	}
+
+	/**
+	 * Wrap values with adapter's sanitizer like, '`'
+	 *
+	 * @param string|Raw|Closure $value
+	 *
+	 * @return string|Closure
+	 */
+	public function wrapSanitizer($value)
+	{
+		// Its a raw query, just cast as string, object has __toString()
+		if ($value instanceof Raw) {
+			return $this->parseRaw($value);
+		} elseif ($value instanceof Closure) {
+			return $value;
+		}
+
+		// Separate our table and fields which are joined with a ".",
+		// like my_table.id
+		$valueArr = explode('.', $value, 2);
+
+		foreach ($valueArr as $key => $subValue) {
+			// Don't wrap if we have *, which is not a usual field
+			$valueArr[$key] = '*' == trim($subValue) ? $subValue : $this->sanitizer . $subValue . $this->sanitizer;
+		}
+
+		// Join these back with "." and return
+		return implode('.', $valueArr);
+	}
+
+	/**
+	 * Build criteria string and binding with various types added, like WHERE and Having
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 * @param string $key
+	 * @param string $type
+	 * @param bool $bindValues
+	 *
+	 * @return array{0:string, 1:string[]}
+	 */
+	protected function buildCriteriaWithType(array $statements, string $key, string $type, bool $bindValues = true)
+	{
+		$criteria = '';
+		$bindings = [];
+
+		if (isset($statements[$key])) {
+			// Get the generic/adapter agnostic criteria string from parent
+			list($criteria, $bindings) = $this->buildCriteria($statements[$key], $bindValues);
+
+			if ($criteria) {
+				$criteria = $type . ' ' . $criteria;
+			}
+		}
+
+		// Remove any multiple whitespace.
+		$criteria = (string) preg_replace('!\s+!', ' ', $criteria);
+
+		return [$criteria, $bindings];
+	}
+
+	/**
+	 * Build join string
+	 *
+	 * @param array<string|Closure, mixed|mixed[]> $statements
+	 *
+	 * @return string
+	 */
+	protected function buildJoin(array $statements): string
+	{
+		$sql = '';
+
+		if (!array_key_exists('joins', $statements) || !is_array($statements['joins'])) {
+			return $sql;
+		}
+
+		foreach ($statements['joins'] as $joinArr) {
+			if (is_array($joinArr['table'])) {
+				$mainTable  = $this->stringifyValue($this->wrapSanitizer($joinArr['table'][0]));
+				$aliasTable = $this->stringifyValue($this->wrapSanitizer($joinArr['table'][1]));
+				$table      = $mainTable . ' AS ' . $aliasTable;
+			} else {
+				$table = $joinArr['table'] instanceof Raw
+					? $this->parseRaw($joinArr['table'])
+					: $this->wrapSanitizer($joinArr['table']);
+			}
+			$joinBuilder = $joinArr['joinBuilder'];
+
+			/** @var string[] */
+			$sqlArr = [
+				$sql,
+				strtoupper($joinArr['type']),
+				'JOIN',
+				$table,
+				'ON',
+				$joinBuilder->getQuery('criteriaOnly', false)->getSql(),
+			];
+
+			$sql = $this->concatenateQuery($sqlArr);
+		}
+
+		return $sql;
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -49,9 +49,9 @@ 
      */
     public function select(array $statements): array
     {
-        if (!array_key_exists('tables', $statements)) {
+        if ( ! array_key_exists('tables', $statements)) {
             throw new Exception('No table specified.', 3);
-        } elseif (!array_key_exists('selects', $statements)) {
+        } elseif ( ! array_key_exists('selects', $statements)) {
             $statements['selects'][] = '*';
         }
 
@@ -66,7 +66,7 @@ 
         // Group bys
         $groupBys = '';
         if (isset($statements['groupBys']) && $groupBys = $this->arrayStr($statements['groupBys'], ', ')) {
-            $groupBys = 'GROUP BY ' . $groupBys;
+            $groupBys = 'GROUP BY '.$groupBys;
         }
 
         // Order bys
@@ -77,17 +77,17 @@ 
                 if ($field instanceof Closure) {
                     continue;
                 }
-                $orderBys .= $field . ' ' . $orderBy['type'] . ', ';
+                $orderBys .= $field.' '.$orderBy['type'].', ';
             }
 
             if ($orderBys = trim($orderBys, ', ')) {
-                $orderBys = 'ORDER BY ' . $orderBys;
+                $orderBys = 'ORDER BY '.$orderBys;
             }
         }
 
         // Limit and offset
-        $limit  = isset($statements['limit']) ? 'LIMIT ' . (int) $statements['limit'] : '';
-        $offset = isset($statements['offset']) ? 'OFFSET ' . (int) $statements['offset'] : '';
+        $limit  = isset($statements['limit']) ? 'LIMIT '.(int) $statements['limit'] : '';
+        $offset = isset($statements['offset']) ? 'OFFSET '.(int) $statements['offset'] : '';
 
         // Having
         list($havingCriteria, $havingBindings) = $this->buildCriteriaWithType($statements, 'havings', 'HAVING');
@@ -97,7 +97,7 @@ 
 
         /** @var string[] */
         $sqlArray = [
-            'SELECT' . (isset($statements['distinct']) ? ' DISTINCT' : ''),
+            'SELECT'.(isset($statements['distinct']) ? ' DISTINCT' : ''),
             $selects,
             'FROM',
             $tables,
@@ -131,7 +131,7 @@ 
     public function criteriaOnly(array $statements, bool $bindValues = true): array
     {
         $sql = $bindings = [];
-        if (!isset($statements['criteria'])) {
+        if ( ! isset($statements['criteria'])) {
             return compact('sql', 'bindings');
         }
 
@@ -153,7 +153,7 @@ 
      */
     private function doInsert(array $statements, array $data, string $type): array
     {
-        if (!isset($statements['tables'])) {
+        if ( ! isset($statements['tables'])) {
             throw new Exception('No table specified', 3);
         }
 
@@ -174,20 +174,20 @@ 
             if ($value instanceof Raw) {
                 $values[] = $this->parseRaw($value);
             } elseif ($isBindings) {
-                $values[]   =  $value->getType();
+                $values[]   = $value->getType();
                 $bindings[] = $value->getValue();
             } else {
-                $values[]   =  $this->inferType($value);
+                $values[]   = $this->inferType($value);
                 $bindings[] = $value;
             }
         }
 
         $sqlArray = [
-        $type . ' INTO',
+        $type.' INTO',
         $this->wrapSanitizer($table),
-        '(' . $this->arrayStr($keys, ',') . ')',
+        '('.$this->arrayStr($keys, ',').')',
         'VALUES',
-        '(' . $this->arrayStr($values, ',') . ')',
+        '('.$this->arrayStr($values, ',').')',
         ];
 
         if (isset($statements['onduplicate'])) {
@@ -195,7 +195,7 @@ 
                 throw new Exception('No data given.', 4);
             }
             list($updateStatement, $updateBindings) = $this->getUpdateStatement($statements['onduplicate']);
-            $sqlArray[]                             = 'ON DUPLICATE KEY UPDATE ' . $updateStatement;
+            $sqlArray[]                             = 'ON DUPLICATE KEY UPDATE '.$updateStatement;
             $bindings                               = array_merge($bindings, $updateBindings);
         }
 
@@ -303,12 +303,12 @@ 
             }
 
             if ($value instanceof Raw) {
-                $statement .= $this->stringifyValue($this->wrapSanitizer($key)) . '=' . $value . ',';
+                $statement .= $this->stringifyValue($this->wrapSanitizer($key)).'='.$value.',';
             } elseif ($isBindings) {
-                $statement .= $this->stringifyValue($this->wrapSanitizer($key)) . sprintf('=%s,', $value->getType());
+                $statement .= $this->stringifyValue($this->wrapSanitizer($key)).sprintf('=%s,', $value->getType());
                 $bindings[] = $value->getValue();
             } else {
-                $statement .= $this->stringifyValue($this->wrapSanitizer($key)) . sprintf('=%s,', $this->inferType($value));
+                $statement .= $this->stringifyValue($this->wrapSanitizer($key)).sprintf('=%s,', $this->inferType($value));
                 $bindings[] = $value;
             }
         }
@@ -330,7 +330,7 @@ 
      */
     public function update($statements, array $data)
     {
-        if (!isset($statements['tables'])) {
+        if ( ! isset($statements['tables'])) {
             throw new Exception('No table specified', 3);
         } elseif (count($data) < 1) {
             throw new Exception('No data given.', 4);
@@ -345,12 +345,12 @@ 
         list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
 
         // Limit
-        $limit = isset($statements['limit']) ? 'LIMIT ' . $statements['limit'] : '';
+        $limit = isset($statements['limit']) ? 'LIMIT '.$statements['limit'] : '';
 
         $sqlArray = [
             'UPDATE',
             $this->wrapSanitizer($table),
-            'SET ' . $updateStatement,
+            'SET '.$updateStatement,
             $whereCriteria,
             $limit,
         ];
@@ -373,7 +373,7 @@ 
      */
     public function delete($statements)
     {
-        if (!isset($statements['tables'])) {
+        if ( ! isset($statements['tables'])) {
             throw new Exception('No table specified', 3);
         }
 
@@ -388,7 +388,7 @@ 
         list($whereCriteria, $whereBindings) = $this->buildCriteriaWithType($statements, 'wheres', 'WHERE');
 
         // Limit
-        $limit = isset($statements['limit']) ? 'LIMIT ' . $statements['limit'] : '';
+        $limit = isset($statements['limit']) ? 'LIMIT '.$statements['limit'] : '';
 
         $sqlArray = ['DELETE FROM', $table, $whereCriteria];
         $sql      = $this->concatenateQuery($sqlArray);
@@ -410,11 +410,11 @@ 
     {
         $str = '';
         foreach ($pieces as $key => $piece) {
-            if (!is_int($key)) {
-                $piece = $key . ' AS ' . $piece;
+            if ( ! is_int($key)) {
+                $piece = $key.' AS '.$piece;
             }
 
-            $str .= $piece . $glue;
+            $str .= $piece.$glue;
         }
 
         return trim($str, $glue);
@@ -431,7 +431,7 @@ 
     {
         $str = '';
         foreach ($pieces as $piece) {
-            $str = trim($str) . ' ' . trim($piece);
+            $str = trim($str).' '.trim($piece);
         }
 
         return trim($str);
@@ -446,7 +446,7 @@ 
     public function getType($value): string
     {
         return $value instanceof Binding && $value->getType() !== null
-            ? $value->getType() : $this->inferType($value) ;
+            ? $value->getType() : $this->inferType($value);
     }
 
     /**
@@ -489,7 +489,7 @@ 
 
 
         $bindings = array_map([$this, 'getValue'], $bindings);
-        $query = $this->connection->getDbInstance()->prepare($query, $bindings) ;
+        $query = $this->connection->getDbInstance()->prepare($query, $bindings);
         return is_string($query) ? $query : '';
     }
 
@@ -530,10 +530,10 @@ 
                 // Merge the bindings we get from nestedCriteria object
                 $bindings = array_merge($bindings, $queryObject->getBindings());
                 // Append the sql we get from the nestedCriteria object
-                $criteria .= $statement['joiner'] . ' (' . $queryObject->getSql() . ') ';
+                $criteria .= $statement['joiner'].' ('.$queryObject->getSql().') ';
             } elseif (is_array($value)) {
                 // where_in or between like query
-                $criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'];
+                $criteria .= $statement['joiner'].' '.$key.' '.$statement['operator'];
 
                 switch ($statement['operator']) {
                     case 'BETWEEN':
@@ -549,7 +549,7 @@ 
                         $value[1] = $this->getValue($value[1]);
 
                         // Parse any raws.
-                        $value = array_map(function ($value) {
+                        $value = array_map(function($value) {
                             return $value instanceof Raw
                                 ? $this->parseRaw($value)
                                 : $value;
@@ -573,7 +573,7 @@ 
                         }
 
                         $valuePlaceholder = trim($valuePlaceholder, ', ');
-                        $criteria .= ' (' . $valuePlaceholder . ') ';
+                        $criteria .= ' ('.$valuePlaceholder.') ';
                         break;
                 }
             } elseif ($value instanceof Raw) {
@@ -581,20 +581,20 @@ 
                 $criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value ";
             } else {
                 // Usual where like criteria
-                if (!$bindValues) {
+                if ( ! $bindValues) {
                     // Specially for joins
                     // We are not binding values, lets sanitize then
                     $value = $this->stringifyValue($this->wrapSanitizer($value)) ?? '';
-                    $criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'] . ' ' . $value . ' ';
+                    $criteria .= $statement['joiner'].' '.$key.' '.$statement['operator'].' '.$value.' ';
                 } elseif ($statement['key'] instanceof Raw) {
-                    $criteria .= $statement['joiner'] . ' ' . $key . ' ';
+                    $criteria .= $statement['joiner'].' '.$key.' ';
                     $bindings = array_merge($bindings, $statement['key']->getBindings());
                 } else {
                     // For wheres
                     $bindings[] = $this->getValue($value);
 
-                    $criteria .= $statement['joiner'] . ' ' . $key . ' ' . $statement['operator'] . ' '
-                    . $this->getType($value) . ' ';
+                    $criteria .= $statement['joiner'].' '.$key.' '.$statement['operator'].' '
+                    . $this->getType($value).' ';
                 }
             }
         }
@@ -649,7 +649,7 @@ 
 
         foreach ($valueArr as $key => $subValue) {
             // Don't wrap if we have *, which is not a usual field
-            $valueArr[$key] = '*' == trim($subValue) ? $subValue : $this->sanitizer . $subValue . $this->sanitizer;
+            $valueArr[$key] = '*' == trim($subValue) ? $subValue : $this->sanitizer.$subValue.$this->sanitizer;
         }
 
         // Join these back with "." and return
@@ -676,7 +676,7 @@ 
             list($criteria, $bindings) = $this->buildCriteria($statements[$key], $bindValues);
 
             if ($criteria) {
-                $criteria = $type . ' ' . $criteria;
+                $criteria = $type.' '.$criteria;
             }
         }
 
@@ -697,7 +697,7 @@ 
     {
         $sql = '';
 
-        if (!array_key_exists('joins', $statements) || !is_array($statements['joins'])) {
+        if ( ! array_key_exists('joins', $statements) || ! is_array($statements['joins'])) {
             return $sql;
         }
 
@@ -705,7 +705,7 @@ 
             if (is_array($joinArr['table'])) {
                 $mainTable  = $this->stringifyValue($this->wrapSanitizer($joinArr['table'][0]));
                 $aliasTable = $this->stringifyValue($this->wrapSanitizer($joinArr['table'][1]));
-                $table      = $mainTable . ' AS ' . $aliasTable;
+                $table      = $mainTable.' AS '.$aliasTable;
             } else {
                 $table = $joinArr['table'] instanceof Raw
                     ? $this->parseRaw($joinArr['table'])

src/QueryBuilder/TablePrefixer.php

Indentation +63 added lines, -63 removed lines

@@ -9,77 +9,77 @@
 
 trait TablePrefixer
 {
-    /**
-         * Add table prefix (if given) on given string.
-         *
-         * @param array<string|int, string|int|float|bool|Raw|Closure>|string|int|float|bool|Raw|Closure     $values
-         * @param bool $tableFieldMix If we have mixes of field and table names with a "."
-         *
-         * @return mixed|mixed[]
-         */
-    public function addTablePrefix($values, bool $tableFieldMix = true)
-    {
-        if (is_null($this->getTablePrefix())) {
-            return $values;
-        }
+	/**
+	 * Add table prefix (if given) on given string.
+	 *
+	 * @param array<string|int, string|int|float|bool|Raw|Closure>|string|int|float|bool|Raw|Closure     $values
+	 * @param bool $tableFieldMix If we have mixes of field and table names with a "."
+	 *
+	 * @return mixed|mixed[]
+	 */
+	public function addTablePrefix($values, bool $tableFieldMix = true)
+	{
+		if (is_null($this->getTablePrefix())) {
+			return $values;
+		}
 
-        // $value will be an array and we will add prefix to all table names
+		// $value will be an array and we will add prefix to all table names
 
-        // If supplied value is not an array then make it one
-        $single = false;
-        if (!is_array($values)) {
-            $values = [$values];
-            // We had single value, so should return a single value
-            $single = true;
-        }
+		// If supplied value is not an array then make it one
+		$single = false;
+		if (!is_array($values)) {
+			$values = [$values];
+			// We had single value, so should return a single value
+			$single = true;
+		}
 
-        $return = [];
+		$return = [];
 
-        foreach ($values as $key => $value) {
-            // It's a raw query, just add it to our return array and continue next
-            if ($value instanceof Raw || $value instanceof Closure) {
-                $return[$key] = $value;
-                continue;
-            }
+		foreach ($values as $key => $value) {
+			// It's a raw query, just add it to our return array and continue next
+			if ($value instanceof Raw || $value instanceof Closure) {
+				$return[$key] = $value;
+				continue;
+			}
 
-            // If key is not integer, it is likely a alias mapping,
-            // so we need to change prefix target
-            $target = &$value;
-            if (!is_int($key)) {
-                $target = &$key;
-            }
+			// If key is not integer, it is likely a alias mapping,
+			// so we need to change prefix target
+			$target = &$value;
+			if (!is_int($key)) {
+				$target = &$key;
+			}
 
-            // Do prefix if the target is an expression or function.
-            if (
-                !$tableFieldMix
-                || (
-                    is_string($target) // Must be a string
-                    && (bool) preg_match('/^[A-Za-z0-9_.]+$/', $target) // Can only contain letters, numbers, underscore and full stops
-                    && 1 === \substr_count($target, '.') // Contains a single full stop ONLY.
-                )
-            ) {
-                $target = $this->getTablePrefix() . $target;
-            }
+			// Do prefix if the target is an expression or function.
+			if (
+				!$tableFieldMix
+				|| (
+					is_string($target) // Must be a string
+					&& (bool) preg_match('/^[A-Za-z0-9_.]+$/', $target) // Can only contain letters, numbers, underscore and full stops
+					&& 1 === \substr_count($target, '.') // Contains a single full stop ONLY.
+				)
+			) {
+				$target = $this->getTablePrefix() . $target;
+			}
 
-            $return[$key] = $value;
-        }
+			$return[$key] = $value;
+		}
 
-        // If we had single value then we should return a single value (end value of the array)
-        return true === $single ? end($return) : $return;
-    }
+		// If we had single value then we should return a single value (end value of the array)
+		return true === $single ? end($return) : $return;
+	}
 
-    /**
-     * Returns the table prefix if defined in connection
-     *
-     * @return string|null
-     */
-    protected function getTablePrefix(): ?string
-    {
-        $adapterConfig = $this->getConnection()->getAdapterConfig();
-        return isset($adapterConfig[Connection::PREFIX])
-            ? $adapterConfig[Connection::PREFIX]
-            : null;
-    }
+	/**
+	 * Returns the table prefix if defined in connection
+	 *
+	 * @return string|null
+	 */
+	protected function getTablePrefix(): ?string
+	{
+		$adapterConfig = $this->getConnection()->getAdapterConfig();
+		return isset($adapterConfig[Connection::PREFIX])
+			? $adapterConfig[Connection::PREFIX]
+			: null;
+	}
 
-    abstract public function getConnection(): Connection;
+	abstract public function getConnection(): Connection;
 }

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
         // If supplied value is not an array then make it one
         $single = false;
-        if (!is_array($values)) {
+        if ( ! is_array($values)) {
             $values = [$values];
             // We had single value, so should return a single value
             $single = true;
@@ -45,20 +45,20 @@ 
             // If key is not integer, it is likely a alias mapping,
             // so we need to change prefix target
             $target = &$value;
-            if (!is_int($key)) {
+            if ( ! is_int($key)) {
                 $target = &$key;
             }
 
             // Do prefix if the target is an expression or function.
             if (
-                !$tableFieldMix
+                ! $tableFieldMix
                 || (
                     is_string($target) // Must be a string
                     && (bool) preg_match('/^[A-Za-z0-9_.]+$/', $target) // Can only contain letters, numbers, underscore and full stops
                     && 1 === \substr_count($target, '.') // Contains a single full stop ONLY.
                 )
             ) {
-                $target = $this->getTablePrefix() . $target;
+                $target = $this->getTablePrefix().$target;
             }
 
             $return[$key] = $value;

src/QueryBuilder/QueryBuilderHandler.php

Indentation +1485 added lines, -1485 removed lines

@@ -24,1489 +24,1489 @@
 
 class QueryBuilderHandler implements HasConnection
 {
-    /**
-     * @method add
-     */
-    use TablePrefixer;
-
-    /**
-     * @var \Viocon\Container
-     */
-    protected $container;
-
-    /**
-     * @var Connection
-     */
-    protected $connection;
-
-    /**
-     * @var array<string, mixed[]|mixed>
-     */
-    protected $statements = [];
-
-    /**
-     * @var wpdb
-     */
-    protected $dbInstance;
-
-    /**
-     * @var string|string[]|null
-     */
-    protected $sqlStatement = null;
-
-    /**
-     * @var string|null
-     */
-    protected $tablePrefix = null;
-
-    /**
-     * @var WPDBAdapter
-     */
-    protected $adapterInstance;
-
-    /**
-     * The mode to return results as.
-     * Accepts WPDB constants or class names.
-     *
-     * @var string
-     */
-    protected $fetchMode;
-
-    /**
-     * Custom args used to construct models for hydrator
-     *
-     * @var array<int, mixed>|null
-     */
-    protected $hydratorConstructorArgs;
-
-    /**
-     * Handler for Json Selectors
-     *
-     * @var JsonHandler
-     */
-    protected $jsonHandler;
-
-    /**
-     * @param \Pixie\Connection|null $connection
-     * @param string $fetchMode
-     * @param mixed[] $hydratorConstructorArgs
-     *
-     * @throws Exception if no connection passed and not previously established
-     */
-    final public function __construct(
-        Connection $connection = null,
-        string $fetchMode = \OBJECT,
-        ?array $hydratorConstructorArgs = null
-    ) {
-        if (is_null($connection)) {
-            // throws if connection not already established.
-            $connection = Connection::getStoredConnection();
-        }
-
-        // Set all dependencies from connection.
-        $this->connection = $connection;
-        $this->container  = $this->connection->getContainer();
-        $this->dbInstance = $this->connection->getDbInstance();
-        $this->setAdapterConfig($this->connection->getAdapterConfig());
-
-        // Set up optional hydration details.
-        $this->setFetchMode($fetchMode);
-        $this->hydratorConstructorArgs = $hydratorConstructorArgs;
-
-        // Query builder adapter instance
-        $this->adapterInstance = $this->container->build(
-            WPDBAdapter::class,
-            [$this->connection]
-        );
-
-        // Setup JSON Selector handler.
-        $this->jsonHandler = new JsonHandler($connection);
-    }
-
-    /**
-     * Sets the config for WPDB
-     *
-     * @param array<string, mixed> $adapterConfig
-     *
-     * @return void
-     */
-    protected function setAdapterConfig(array $adapterConfig): void
-    {
-        if (isset($adapterConfig[Connection::PREFIX])) {
-            $this->tablePrefix = $adapterConfig[Connection::PREFIX];
-        }
-    }
-
-    /**
-     * Fetch query results as object of specified type
-     *
-     * @param string $className
-     * @param array<int, mixed> $constructorArgs
-     * @return static
-     */
-    public function asObject($className, $constructorArgs = array()): self
-    {
-        return $this->setFetchMode($className, $constructorArgs);
-    }
-
-    /**
-     * Set the fetch mode
-     *
-     * @param string $mode
-     * @param array<int, mixed>|null $constructorArgs
-     *
-     * @return static
-     */
-    public function setFetchMode(string $mode, ?array $constructorArgs = null): self
-    {
-        $this->fetchMode               = $mode;
-        $this->hydratorConstructorArgs = $constructorArgs;
-
-        return $this;
-    }
-
-    /**
-     * @param Connection|null $connection
-     *
-     * @return static
-     *
-     * @throws Exception
-     */
-    public function newQuery(Connection $connection = null): self
-    {
-        if (is_null($connection)) {
-            $connection = $this->connection;
-        }
-
-        $newQuery = $this->constructCurrentBuilderClass($connection);
-        $newQuery->setFetchMode($this->getFetchMode(), $this->hydratorConstructorArgs);
-
-        return $newQuery;
-    }
-
-    /**
-     * Returns a new instance of the current, with the passed connection.
-     *
-     * @param \Pixie\Connection $connection
-     *
-     * @return static
-     */
-    protected function constructCurrentBuilderClass(Connection $connection): self
-    {
-        return new static($connection);
-    }
-
-    /**
-     * Interpolates a query
-     *
-     * @param string $query
-     * @param array<mixed> $bindings
-     * @return string
-     */
-    public function interpolateQuery(string $query, array $bindings = []): string
-    {
-        return $this->adapterInstance->interpolateQuery($query, $bindings);
-    }
-
-    /**
-     * @param string           $sql
-     * @param array<int,mixed> $bindings
-     *
-     * @return static
-     */
-    public function query($sql, $bindings = []): self
-    {
-        list($this->sqlStatement) = $this->statement($sql, $bindings);
-
-        return $this;
-    }
-
-    /**
-     * @param string           $sql
-     * @param array<int,mixed> $bindings
-     *
-     * @return array{0:string, 1:float}
-     */
-    public function statement(string $sql, $bindings = []): array
-    {
-        $start        = microtime(true);
-        $sqlStatement = empty($bindings) ? $sql : $this->interpolateQuery($sql, $bindings);
-
-        if (!is_string($sqlStatement)) {
-            throw new Exception('Could not interpolate query', 1);
-        }
-
-        return [$sqlStatement, microtime(true) - $start];
-    }
-
-    /**
-     * Get all rows
-     *
-     * @return array<mixed,mixed>|null
-     *
-     * @throws Exception
-     */
-    public function get()
-    {
-        $eventResult = $this->fireEvents('before-select');
-        if (!is_null($eventResult)) {
-            return $eventResult;
-        }
-        $executionTime = 0;
-        if (is_null($this->sqlStatement)) {
-            $queryObject = $this->getQuery('select');
-            $statement   = $this->statement(
-                $queryObject->getSql(),
-                $queryObject->getBindings()
-            );
-
-            $this->sqlStatement = $statement[0];
-            $executionTime      = $statement[1];
-        }
-
-        $start  = microtime(true);
-        $result = $this->dbInstance()->get_results(
-            is_array($this->sqlStatement) ? (end($this->sqlStatement) ?: '') : $this->sqlStatement,
-            // If we are using the hydrator, return as OBJECT and let the hydrator map the correct model.
-            $this->useHydrator() ? OBJECT : $this->getFetchMode()
-        );
-        $executionTime += microtime(true) - $start;
-        $this->sqlStatement = null;
-
-        // Ensure we have an array of results.
-        if (!is_array($result) && null !== $result) {
-            $result = [$result];
-        }
-
-        // Maybe hydrate the results.
-        if (null !== $result && $this->useHydrator()) {
-            $result = $this->getHydrator()->fromMany($result);
-        }
-
-        $this->fireEvents('after-select', $result, $executionTime);
-
-        return $result;
-    }
-
-    /**
-     * Returns a populated instance of the Hydrator.
-     *
-     * @return Hydrator
-     */
-    protected function getHydrator(): Hydrator /* @phpstan-ignore-line */
-    {
-        $hydrator = new Hydrator($this->getFetchMode(), $this->hydratorConstructorArgs ?? []); /* @phpstan-ignore-line */
-
-        return $hydrator;
-    }
-
-    /**
-     * Checks if the results should be mapped via the hydrator
-     *
-     * @return bool
-     */
-    protected function useHydrator(): bool
-    {
-        return !in_array($this->getFetchMode(), [\ARRAY_A, \ARRAY_N, \OBJECT, \OBJECT_K]);
-    }
-
-    /**
-     * Find all matching a simple where condition.
-     *
-     * Shortcut of ->where('key','=','value')->limit(1)->get();
-     *
-     * @return \stdClass\array<mixed,mixed>|object|null Can return any object using hydrator
-     */
-    public function first()
-    {
-        $this->limit(1);
-        $result = $this->get();
-
-        return empty($result) ? null : $result[0];
-    }
-
-    /**
-     * Find all matching a simple where condition.
-     *
-     * Shortcut of ->where('key','=','value')->get();
-     *
-     * @param string $fieldName
-     * @param mixed $value
-     *
-     * @return array<mixed,mixed>|null Can return any object using hydrator
-     */
-    public function findAll($fieldName, $value)
-    {
-        $this->where($fieldName, '=', $value);
-
-        return $this->get();
-    }
-
-    /**
-     * @param string $fieldName
-     * @param mixed $value
-     *
-     * @return \stdClass\array<mixed,mixed>|object|null Can return any object using hydrator
-     */
-    public function find($value, $fieldName = 'id')
-    {
-        $this->where($fieldName, '=', $value);
-
-        return $this->first();
-    }
-
-    /**
-     * @param string $fieldName
-     * @param mixed $value
-     *
-     * @return \stdClass\array<mixed,mixed>|object Can return any object using hydrator
-     * @throws Exception If fails to find
-     */
-    public function findOrFail($value, $fieldName = 'id')
-    {
-        $result = $this->find($value, $fieldName);
-        if (null === $result) {
-            throw new Exception("Failed to find {$fieldName}={$value}", 1);
-        }
-        return $result;
-    }
-
-    /**
-     * Used to handle all aggregation method.
-     *
-     * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
-     *
-     * @param string $type
-     * @param string $field
-     *
-     * @return float
-     */
-    protected function aggregate(string $type, string $field = '*'): float
-    {
-        // Verify that field exists
-        if ('*' !== $field && true === isset($this->statements['selects']) && false === \in_array($field, $this->statements['selects'], true)) {
-            throw new \Exception(sprintf('Failed %s query - the column %s hasn\'t been selected in the query.', $type, $field));
-        }
-
-        if (false === isset($this->statements['tables'])) {
-            throw new Exception('No table selected');
-        }
-
-        $count = $this
-            ->table($this->subQuery($this, 'count'))
-            ->select([$this->raw(sprintf('%s(%s) AS field', strtoupper($type), $field))])
-            ->first();
-
-        return true === isset($count->field) ? (float)$count->field : 0;
-    }
-
-    /**
-     * Get count of all the rows for the current query
-     *
-     * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
-     *
-     * @param string $field
-     *
-     * @return int
-     *
-     * @throws Exception
-     */
-    public function count(string $field = '*'): int
-    {
-        return (int)$this->aggregate('count', $field);
-    }
-
-    /**
-     * Get the sum for a field in the current query
-     *
-     * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
-     *
-     * @param string $field
-     *
-     * @return float
-     *
-     * @throws Exception
-     */
-    public function sum(string $field): float
-    {
-        return $this->aggregate('sum', $field);
-    }
-
-    /**
-     * Get the average for a field in the current query
-     *
-     * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
-     *
-     * @param string $field
-     *
-     * @return float
-     *
-     * @throws Exception
-     */
-    public function average(string $field): float
-    {
-        return $this->aggregate('avg', $field);
-    }
-
-    /**
-     * Get the minimum for a field in the current query
-     *
-     * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
-     *
-     * @param string $field
-     *
-     * @return float
-     *
-     * @throws Exception
-     */
-    public function min(string $field): float
-    {
-        return $this->aggregate('min', $field);
-    }
-
-    /**
-     * Get the maximum for a field in the current query
-     *
-     * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
-     *
-     * @param string $field
-     *
-     * @return float
-     *
-     * @throws Exception
-     */
-    public function max(string $field): float
-    {
-        return $this->aggregate('max', $field);
-    }
-
-    /**
-     * @param string $type
-     * @param bool|array<mixed, mixed> $dataToBePassed
-     *
-     * @return mixed
-     *
-     * @throws Exception
-     */
-    public function getQuery(string $type = 'select', $dataToBePassed = [])
-    {
-        $allowedTypes = ['select', 'insert', 'insertignore', 'replace', 'delete', 'update', 'criteriaonly'];
-        if (!in_array(strtolower($type), $allowedTypes)) {
-            throw new Exception($type . ' is not a known type.', 2);
-        }
-
-        $queryArr = $this->adapterInstance->$type($this->statements, $dataToBePassed);
-
-        return $this->container->build(
-            QueryObject::class,
-            [$queryArr['sql'], $queryArr['bindings'], $this->dbInstance]
-        );
-    }
-
-    /**
-     * @param QueryBuilderHandler $queryBuilder
-     * @param string|null $alias
-     *
-     * @return Raw
-     */
-    public function subQuery(QueryBuilderHandler $queryBuilder, ?string $alias = null)
-    {
-        $sql = '(' . $queryBuilder->getQuery()->getRawSql() . ')';
-        if (is_string($alias) && 0 !== mb_strlen($alias)) {
-            $sql = $sql . ' as ' . $alias;
-        }
-
-        return $queryBuilder->raw($sql);
-    }
-
-    /**
-     * Handles the various insert operations based on the type.
-     *
-     * @param array<int|string, mixed|mixed[]> $data
-     * @param string $type
-     *
-     * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
-     */
-    private function doInsert(array $data, string $type)
-    {
-        $eventResult = $this->fireEvents('before-insert');
-        if (!is_null($eventResult)) {
-            return $eventResult;
-        }
-
-        // If first value is not an array () not a batch insert)
-        if (!is_array(current($data))) {
-            $queryObject = $this->getQuery($type, $data);
-
-            list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
-            $this->dbInstance->get_results($preparedQuery);
-
-            // Check we have a result.
-            $return = 1 === $this->dbInstance->rows_affected ? $this->dbInstance->insert_id : null;
-        } else {
-            // Its a batch insert
-            $return        = [];
-            $executionTime = 0;
-            foreach ($data as $subData) {
-                $queryObject = $this->getQuery($type, $subData);
-
-                list($preparedQuery, $time) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
-                $this->dbInstance->get_results($preparedQuery);
-                $executionTime += $time;
-
-                if (1 === $this->dbInstance->rows_affected) {
-                    $return[] = $this->dbInstance->insert_id;
-                }
-            }
-        }
-
-        $this->fireEvents('after-insert', $return, $executionTime);
-
-        return $return;
-    }
-
-    /**
-     * @param array<int|string, mixed|mixed[]> $data either key=>value array for single or array of arrays for bulk
-     *
-     * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
-     */
-    public function insert($data)
-    {
-        return $this->doInsert($data, 'insert');
-    }
-
-    /**
-     *
-     * @param array<int|string, mixed|mixed[]> $data either key=>value array for single or array of arrays for bulk
-     *
-     * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
-     */
-    public function insertIgnore($data)
-    {
-        return $this->doInsert($data, 'insertignore');
-    }
-
-    /**
-     *
-     * @param array<int|string, mixed|mixed[]> $data either key=>value array for single or array of arrays for bulk
-     *
-     * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
-     */
-    public function replace($data)
-    {
-        return $this->doInsert($data, 'replace');
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     *
-     * @return int|null
-     */
-    public function update($data)
-    {
-        $eventResult = $this->fireEvents('before-update');
-        if (!is_null($eventResult)) {
-            return $eventResult;
-        }
-        $queryObject                         = $this->getQuery('update', $data);
-        list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
-
-        $this->dbInstance()->get_results($preparedQuery);
-        $this->fireEvents('after-update', $queryObject, $executionTime);
-
-        return 0 !== $this->dbInstance()->rows_affected
-            ? $this->dbInstance()->rows_affected
-            : null;
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     *
-     * @return int|null will return row id for insert and bool for success/fail on update
-     */
-    public function updateOrInsert($data)
-    {
-        if ($this->first()) {
-            return $this->update($data);
-        }
-
-        return $this->insert($data);
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     *
-     * @return static
-     */
-    public function onDuplicateKeyUpdate($data)
-    {
-        $this->addStatement('onduplicate', $data);
-
-        return $this;
-    }
-
-    /**
-     * @return int number of rows effected
-     */
-    public function delete(): int
-    {
-        $eventResult = $this->fireEvents('before-delete');
-        if (!is_null($eventResult)) {
-            return $eventResult;
-        }
-
-        $queryObject = $this->getQuery('delete');
-
-        list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
-        $this->dbInstance()->get_results($preparedQuery);
-        $this->fireEvents('after-delete', $queryObject, $executionTime);
-
-        return $this->dbInstance()->rows_affected;
-    }
-
-    /**
-     * @param string|Raw ...$tables Single table or array of tables
-     *
-     * @return static
-     *
-     * @throws Exception
-     */
-    public function table(...$tables)
-    {
-        $instance =  $this->constructCurrentBuilderClass($this->connection);
-        $this->setFetchMode($this->getFetchMode(), $this->hydratorConstructorArgs);
-        $tables = $this->addTablePrefix($tables, false);
-        $instance->addStatement('tables', $tables);
-
-        return $instance;
-    }
-
-    /**
-     * @param string|Raw ...$tables Single table or array of tables
-     *
-     * @return static
-     */
-    public function from(...$tables): self
-    {
-        $tables = $this->addTablePrefix($tables, false);
-        $this->addStatement('tables', $tables);
-
-        return $this;
-    }
-
-    /**
-     * @param string|string[]|Raw[]|array<string, string> $fields
-     *
-     * @return static
-     */
-    public function select($fields): self
-    {
-        if (!is_array($fields)) {
-            $fields = func_get_args();
-        }
-
-        foreach ($fields as $field => $alias) {
-            // If we have a JSON expression
-            if ($this->jsonHandler->isJsonSelector($field)) {
-                $field = $this->jsonHandler->extractAndUnquoteFromJsonSelector($field);
-            }
-
-            // If no alias passed, but field is for JSON. thrown an exception.
-            if (is_numeric($field) && is_string($alias) && $this->jsonHandler->isJsonSelector($alias)) {
-                throw new Exception("An alias must be used if you wish to select from JSON Object", 1);
-            }
-
-            // Treat each array as a single table, to retain order added
-            $field = is_numeric($field)
-                ? $field = $alias // If single colum
-                : $field = [$field => $alias]; // Has alias
-
-            $field = $this->addTablePrefix($field);
-            $this->addStatement('selects', $field);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param string|string[]|Raw[]|array<string, string> $fields
-     *
-     * @return static
-     */
-    public function selectDistinct($fields)
-    {
-        $this->select($fields);
-        $this->addStatement('distinct', true);
-
-        return $this;
-    }
-
-    /**
-     * @param string|string[] $field either the single field or an array of fields
-     *
-     * @return static
-     */
-    public function groupBy($field): self
-    {
-        $field = $this->addTablePrefix($field);
-        $this->addStatement('groupBys', $field);
-
-        return $this;
-    }
-
-    /**
-     * @param string|array<string|int, mixed> $fields
-     * @param string          $defaultDirection
-     *
-     * @return static
-     */
-    public function orderBy($fields, string $defaultDirection = 'ASC'): self
-    {
-        if (!is_array($fields)) {
-            $fields = [$fields];
-        }
-
-        foreach ($fields as $key => $value) {
-            $field = $key;
-            $type  = $value;
-            if (is_int($key)) {
-                $field = $value;
-                $type  = $defaultDirection;
-            }
-
-            if ($this->jsonHandler->isJsonSelector($field)) {
-                $field = $this->jsonHandler->extractAndUnquoteFromJsonSelector($field);
-            }
-
-            if (!$field instanceof Raw) {
-                $field = $this->addTablePrefix($field);
-            }
-            $this->statements['orderBys'][] = compact('field', 'type');
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param string|Raw $key The database column which holds the JSON value
-     * @param string|Raw|string[] $jsonKey The json key/index to search
-     * @param string $defaultDirection
-     * @return static
-     */
-    public function orderByJson($key, $jsonKey, string $defaultDirection = 'ASC'): self
-    {
-        $key = $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($key, $jsonKey);
-        return $this->orderBy($key, $defaultDirection);
-    }
-
-    /**
-     * @param int $limit
-     *
-     * @return static
-     */
-    public function limit(int $limit): self
-    {
-        $this->statements['limit'] = $limit;
-
-        return $this;
-    }
-
-    /**
-     * @param int $offset
-     *
-     * @return static
-     */
-    public function offset(int $offset): self
-    {
-        $this->statements['offset'] = $offset;
-
-        return $this;
-    }
-
-    /**
-     * @param string|string[]|Raw|Raw[]       $key
-     * @param string $operator
-     * @param mixed $value
-     * @param string $joiner
-     *
-     * @return static
-     */
-    public function having($key, string $operator, $value, string $joiner = 'AND')
-    {
-        $key                           = $this->addTablePrefix($key);
-        $this->statements['havings'][] = compact('key', 'operator', 'value', 'joiner');
-
-        return $this;
-    }
-
-    /**
-     * @param string|string[]|Raw|Raw[]       $key
-     * @param string $operator
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function orHaving($key, $operator, $value)
-    {
-        return $this->having($key, $operator, $value, 'OR');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     *
-     * @return static
-     */
-    public function where($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereHandler($key, $operator, $value);
-    }
-
-    /**
-     * @param string|Raw|\Closure(QueryBuilderHandler):void $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     *
-     * @return static
-     */
-    public function orWhere($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereHandler($key, $operator, $value, 'OR');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     *
-     * @return static
-     */
-    public function whereNot($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereHandler($key, $operator, $value, 'AND NOT');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     *
-     * @return static
-     */
-    public function orWhereNot($key, $operator = null, $value = null)
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereHandler($key, $operator, $value, 'OR NOT');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param mixed[]|string|Raw $values
-     *
-     * @return static
-     */
-    public function whereIn($key, $values): self
-    {
-        return $this->whereHandler($key, 'IN', $values, 'AND');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param mixed[]|string|Raw $values
-     *
-     * @return static
-     */
-    public function whereNotIn($key, $values): self
-    {
-        return $this->whereHandler($key, 'NOT IN', $values, 'AND');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param mixed[]|string|Raw $values
-     *
-     * @return static
-     */
-    public function orWhereIn($key, $values): self
-    {
-        return $this->whereHandler($key, 'IN', $values, 'OR');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param mixed[]|string|Raw $values
-     *
-     * @return static
-     */
-    public function orWhereNotIn($key, $values): self
-    {
-        return $this->whereHandler($key, 'NOT IN', $values, 'OR');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param mixed $valueFrom
-     * @param mixed $valueTo
-     *
-     * @return static
-     */
-    public function whereBetween($key, $valueFrom, $valueTo): self
-    {
-        return $this->whereHandler($key, 'BETWEEN', [$valueFrom, $valueTo], 'AND');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param mixed $valueFrom
-     * @param mixed $valueTo
-     *
-     * @return static
-     */
-    public function orWhereBetween($key, $valueFrom, $valueTo): self
-    {
-        return $this->whereHandler($key, 'BETWEEN', [$valueFrom, $valueTo], 'OR');
-    }
-
-    /**
-     * Handles all function call based where conditions
-     *
-     * @param string|Raw $key
-     * @param string $function
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return static
-     */
-    protected function whereFunctionCallHandler($key, $function, $operator, $value): self
-    {
-        $key = \sprintf('%s(%s)', $function, $this->addTablePrefix($key));
-        return $this->where($key, $operator, $value);
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return self
-     */
-    public function whereMonth($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallHandler($key, 'MONTH', $operator, $value);
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return self
-     */
-    public function whereDay($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallHandler($key, 'DAY', $operator, $value);
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return self
-     */
-    public function whereYear($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallHandler($key, 'YEAR', $operator, $value);
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return self
-     */
-    public function whereDate($key, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (2 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallHandler($key, 'DATE', $operator, $value);
-    }
-
-    /**
-     * @param string|Raw $key
-     *
-     * @return static
-     */
-    public function whereNull($key): self
-    {
-        return $this->whereNullHandler($key);
-    }
-
-    /**
-     * @param string|Raw $key
-     *
-     * @return static
-     */
-    public function whereNotNull($key): self
-    {
-        return $this->whereNullHandler($key, 'NOT');
-    }
-
-    /**
-     * @param string|Raw $key
-     *
-     * @return static
-     */
-    public function orWhereNull($key): self
-    {
-        return $this->whereNullHandler($key, '', 'or');
-    }
-
-    /**
-     * @param string|Raw $key
-     *
-     * @return static
-     */
-    public function orWhereNotNull($key): self
-    {
-        return $this->whereNullHandler($key, 'NOT', 'or');
-    }
-
-    /**
-     * @param string|Raw $key
-     * @param string $prefix
-     * @param string $operator
-     *
-     * @return static
-     */
-    protected function whereNullHandler($key, string $prefix = '', $operator = ''): self
-    {
-        $prefix = 0 === mb_strlen($prefix) ? '' : " {$prefix}";
-
-        if ($key instanceof Raw) {
-            $key = $this->adapterInstance->parseRaw($key);
-        }
-
-        $key = $this->addTablePrefix($key);
-        if ($key instanceof Closure) {
-            throw new Exception('Key used for whereNull condition must be a string or raw exrpession.', 1);
-        }
-
-        return $this->{$operator . 'Where'}($this->raw("{$key} IS{$prefix} NULL"));
-    }
-
-
-    /**
-     * Runs a transaction
-     *
-     * @param \Closure(Transaction):void $callback
-     *
-     * @return static
-     */
-    public function transaction(Closure $callback): self
-    {
-        try {
-            // Begin the transaction
-            $this->dbInstance->query('START TRANSACTION');
-
-            // Get the Transaction class
-            $transaction = $this->container->build(Transaction::class, [$this->connection]);
-
-            $this->handleTransactionCall($callback, $transaction);
-
-            // If no errors have been thrown or the transaction wasn't completed within
-            $this->dbInstance->query('COMMIT');
-
-            return $this;
-        } catch (TransactionHaltException $e) {
-            // Commit or rollback behavior has been handled in the closure, so exit
-            return $this;
-        } catch (\Exception $e) {
-            // something happened, rollback changes
-            $this->dbInstance->query('ROLLBACK');
-
-            return $this;
-        }
-    }
-
-    /**
-     * Handles the transaction call.
-     * Catches any WPDB Errors (printed)
-     *
-     * @param Closure    $callback
-     * @param Transaction $transaction
-     *
-     * @return void
-     * @throws Exception
-     */
-    protected function handleTransactionCall(Closure $callback, Transaction $transaction): void
-    {
-        try {
-            ob_start();
-            $callback($transaction);
-            $output = ob_get_clean() ?: '';
-        } catch (Throwable $th) {
-            ob_end_clean();
-            throw $th;
-        }
-
-        // If we caught an error, throw an exception.
-        if (0 !== mb_strlen($output)) {
-            throw new Exception($output);
-        }
-    }
-
-    /*************************************************************************/
-    /*************************************************************************/
-    /*************************************************************************/
-    /**                              JOIN JOIN                              **/
-    /**                                 JOIN                                **/
-    /**                              JOIN JOIN                              **/
-    /*************************************************************************/
-    /*************************************************************************/
-    /*************************************************************************/
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw|Closure $key
-     * @param string|null $operator
-     * @param mixed $value
-     * @param string $type
-     *
-     * @return static
-     */
-    public function join($table, $key, ?string $operator = null, $value = null, $type = 'inner')
-    {
-        // Potentially cast key from JSON
-        if ($this->jsonHandler->isJsonSelector($key)) {
-            /** @var string $key */
-            $key = $this->jsonHandler->extractAndUnquoteFromJsonSelector($key); /** @phpstan-ignore-line */
-        }
-
-        // Potentially cast value from json
-        if ($this->jsonHandler->isJsonSelector($value)) {
-            /** @var string $value */
-            $value = $this->jsonHandler->extractAndUnquoteFromJsonSelector($value);
-        }
-
-        if (!$key instanceof Closure) {
-            $key = function ($joinBuilder) use ($key, $operator, $value) {
-                $joinBuilder->on($key, $operator, $value);
-            };
-        }
-
-        // Build a new JoinBuilder class, keep it by reference so any changes made
-        // in the closure should reflect here
-        $joinBuilder = $this->container->build(JoinBuilder::class, [$this->connection]);
-        $joinBuilder = &$joinBuilder;
-        // Call the closure with our new joinBuilder object
-        $key($joinBuilder);
-        $table = $this->addTablePrefix($table, false);
-        // Get the criteria only query from the joinBuilder object
-        $this->statements['joins'][] = compact('type', 'table', 'joinBuilder');
-        return $this;
-    }
-
-
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw|Closure $key
-     * @param string|null $operator
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function leftJoin($table, $key, $operator = null, $value = null)
-    {
-        return $this->join($table, $key, $operator, $value, 'left');
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw|Closure $key
-     * @param string|null $operator
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function rightJoin($table, $key, $operator = null, $value = null)
-    {
-        return $this->join($table, $key, $operator, $value, 'right');
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw|Closure $key
-     * @param string|null $operator
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function innerJoin($table, $key, $operator = null, $value = null)
-    {
-        return $this->join($table, $key, $operator, $value, 'inner');
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw|Closure $key
-     * @param string|null $operator
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function crossJoin($table, $key, $operator = null, $value = null)
-    {
-        return $this->join($table, $key, $operator, $value, 'cross');
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw|Closure $key
-     * @param string|null $operator
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function outerJoin($table, $key, $operator = null, $value = null)
-    {
-        return $this->join($table, $key, $operator, $value, 'outer');
-    }
-
-    /**
-     * Shortcut to join 2 tables on the same key name with equals
-     *
-     * @param string $table
-     * @param string $key
-     * @param string $type
-     * @return self
-     * @throws Exception If base table is set as more than 1 or 0
-     */
-    public function joinUsing(string $table, string $key, string $type = 'INNER'): self
-    {
-        if (!array_key_exists('tables', $this->statements) || count($this->statements['tables']) !== 1) {
-            throw new Exception("JoinUsing can only be used with a single table set as the base of the query", 1);
-        }
-        $baseTable = end($this->statements['tables']);
-
-        // Potentialy cast key from JSON
-        if ($this->jsonHandler->isJsonSelector($key)) {
-            $key = $this->jsonHandler->extractAndUnquoteFromJsonSelector($key);
-        }
-
-        $remoteKey = $table = $this->addTablePrefix("{$table}.{$key}", true);
-        $localKey = $table = $this->addTablePrefix("{$baseTable}.{$key}", true);
-        return $this->join($table, $remoteKey, '=', $localKey, $type);
-    }
-
-    /**
-     * Add a raw query
-     *
-     * @param string|Raw $value
-     * @param mixed|mixed[] $bindings
-     *
-     * @return Raw
-     */
-    public function raw($value, $bindings = []): Raw
-    {
-        return new Raw($value, $bindings);
-    }
-
-    /**
-     * Return wpdb instance
-     *
-     * @return wpdb
-     */
-    public function dbInstance(): wpdb
-    {
-        return $this->dbInstance;
-    }
-
-    /**
-     * @param Connection $connection
-     *
-     * @return static
-     */
-    public function setConnection(Connection $connection): self
-    {
-        $this->connection = $connection;
-
-        return $this;
-    }
-
-    /**
-     * @return Connection
-     */
-    public function getConnection()
-    {
-        return $this->connection;
-    }
-
-    /**
-     * @param string|Raw|Closure $key
-     * @param string|null      $operator
-     * @param mixed|null       $value
-     * @param string $joiner
-     *
-     * @return static
-     */
-    protected function whereHandler($key, $operator = null, $value = null, $joiner = 'AND')
-    {
-        $key = $this->addTablePrefix($key);
-        if ($key instanceof Raw) {
-            $key = $this->adapterInstance->parseRaw($key);
-        }
-
-        if ($this->jsonHandler->isJsonSelector($key)) {
-            $key = $this->jsonHandler->extractAndUnquoteFromJsonSelector($key);
-        }
-
-        $this->statements['wheres'][] = compact('key', 'operator', 'value', 'joiner');
-        return $this;
-    }
-
-
-
-    /**
-     * @param string $key
-     * @param mixed|mixed[]|bool $value
-     *
-     * @return void
-     */
-    protected function addStatement($key, $value)
-    {
-        if (!is_array($value)) {
-            $value = [$value];
-        }
-
-        if (!array_key_exists($key, $this->statements)) {
-            $this->statements[$key] = $value;
-        } else {
-            $this->statements[$key] = array_merge($this->statements[$key], $value);
-        }
-    }
-
-    /**
-     * @param string $event
-     * @param string|Raw $table
-     *
-     * @return callable|null
-     */
-    public function getEvent(string $event, $table = ':any'): ?callable
-    {
-        return $this->connection->getEventHandler()->getEvent($event, $table);
-    }
-
-    /**
-     * @param string $event
-     * @param string|Raw $table
-     * @param Closure $action
-     *
-     * @return void
-     */
-    public function registerEvent($event, $table, Closure $action): void
-    {
-        $table = $table ?: ':any';
-
-        if (':any' != $table) {
-            $table = $this->addTablePrefix($table, false);
-        }
-
-        $this->connection->getEventHandler()->registerEvent($event, $table, $action);
-    }
-
-    /**
-     * @param string $event
-     * @param string|Raw $table
-     *
-     * @return void
-     */
-    public function removeEvent(string $event, $table = ':any')
-    {
-        if (':any' != $table) {
-            $table = $this->addTablePrefix($table, false);
-        }
-
-        $this->connection->getEventHandler()->removeEvent($event, $table);
-    }
-
-    /**
-     * @param string $event
-     *
-     * @return mixed
-     */
-    public function fireEvents(string $event)
-    {
-        $params = func_get_args(); // @todo Replace this with an easier to read alteratnive
-        array_unshift($params, $this);
-
-        return call_user_func_array([$this->connection->getEventHandler(), 'fireEvents'], $params);
-    }
-
-    /**
-     * @return array<string, mixed[]>
-     */
-    public function getStatements()
-    {
-        return $this->statements;
-    }
-
-    /**
-     * @return string will return WPDB Fetch mode
-     */
-    public function getFetchMode()
-    {
-        return null !== $this->fetchMode
-            ? $this->fetchMode
-            : \OBJECT;
-    }
-
-    /**
-     * Returns an NEW instance of the JSON builder populated with the same connection and hydrator details.
-     *
-     * @return JsonQueryBuilder
-     */
-    public function jsonBuilder(): JsonQueryBuilder
-    {
-        return new JsonQueryBuilder($this->getConnection(), $this->getFetchMode(), $this->hydratorConstructorArgs);
-    }
+	/**
+	 * @method add
+	 */
+	use TablePrefixer;
+
+	/**
+	 * @var \Viocon\Container
+	 */
+	protected $container;
+
+	/**
+	 * @var Connection
+	 */
+	protected $connection;
+
+	/**
+	 * @var array<string, mixed[]|mixed>
+	 */
+	protected $statements = [];
+
+	/**
+	 * @var wpdb
+	 */
+	protected $dbInstance;
+
+	/**
+	 * @var string|string[]|null
+	 */
+	protected $sqlStatement = null;
+
+	/**
+	 * @var string|null
+	 */
+	protected $tablePrefix = null;
+
+	/**
+	 * @var WPDBAdapter
+	 */
+	protected $adapterInstance;
+
+	/**
+	 * The mode to return results as.
+	 * Accepts WPDB constants or class names.
+	 *
+	 * @var string
+	 */
+	protected $fetchMode;
+
+	/**
+	 * Custom args used to construct models for hydrator
+	 *
+	 * @var array<int, mixed>|null
+	 */
+	protected $hydratorConstructorArgs;
+
+	/**
+	 * Handler for Json Selectors
+	 *
+	 * @var JsonHandler
+	 */
+	protected $jsonHandler;
+
+	/**
+	 * @param \Pixie\Connection|null $connection
+	 * @param string $fetchMode
+	 * @param mixed[] $hydratorConstructorArgs
+	 *
+	 * @throws Exception if no connection passed and not previously established
+	 */
+	final public function __construct(
+		Connection $connection = null,
+		string $fetchMode = \OBJECT,
+		?array $hydratorConstructorArgs = null
+	) {
+		if (is_null($connection)) {
+			// throws if connection not already established.
+			$connection = Connection::getStoredConnection();
+		}
+
+		// Set all dependencies from connection.
+		$this->connection = $connection;
+		$this->container  = $this->connection->getContainer();
+		$this->dbInstance = $this->connection->getDbInstance();
+		$this->setAdapterConfig($this->connection->getAdapterConfig());
+
+		// Set up optional hydration details.
+		$this->setFetchMode($fetchMode);
+		$this->hydratorConstructorArgs = $hydratorConstructorArgs;
+
+		// Query builder adapter instance
+		$this->adapterInstance = $this->container->build(
+			WPDBAdapter::class,
+			[$this->connection]
+		);
+
+		// Setup JSON Selector handler.
+		$this->jsonHandler = new JsonHandler($connection);
+	}
+
+	/**
+	 * Sets the config for WPDB
+	 *
+	 * @param array<string, mixed> $adapterConfig
+	 *
+	 * @return void
+	 */
+	protected function setAdapterConfig(array $adapterConfig): void
+	{
+		if (isset($adapterConfig[Connection::PREFIX])) {
+			$this->tablePrefix = $adapterConfig[Connection::PREFIX];
+		}
+	}
+
+	/**
+	 * Fetch query results as object of specified type
+	 *
+	 * @param string $className
+	 * @param array<int, mixed> $constructorArgs
+	 * @return static
+	 */
+	public function asObject($className, $constructorArgs = array()): self
+	{
+		return $this->setFetchMode($className, $constructorArgs);
+	}
+
+	/**
+	 * Set the fetch mode
+	 *
+	 * @param string $mode
+	 * @param array<int, mixed>|null $constructorArgs
+	 *
+	 * @return static
+	 */
+	public function setFetchMode(string $mode, ?array $constructorArgs = null): self
+	{
+		$this->fetchMode               = $mode;
+		$this->hydratorConstructorArgs = $constructorArgs;
+
+		return $this;
+	}
+
+	/**
+	 * @param Connection|null $connection
+	 *
+	 * @return static
+	 *
+	 * @throws Exception
+	 */
+	public function newQuery(Connection $connection = null): self
+	{
+		if (is_null($connection)) {
+			$connection = $this->connection;
+		}
+
+		$newQuery = $this->constructCurrentBuilderClass($connection);
+		$newQuery->setFetchMode($this->getFetchMode(), $this->hydratorConstructorArgs);
+
+		return $newQuery;
+	}
+
+	/**
+	 * Returns a new instance of the current, with the passed connection.
+	 *
+	 * @param \Pixie\Connection $connection
+	 *
+	 * @return static
+	 */
+	protected function constructCurrentBuilderClass(Connection $connection): self
+	{
+		return new static($connection);
+	}
+
+	/**
+	 * Interpolates a query
+	 *
+	 * @param string $query
+	 * @param array<mixed> $bindings
+	 * @return string
+	 */
+	public function interpolateQuery(string $query, array $bindings = []): string
+	{
+		return $this->adapterInstance->interpolateQuery($query, $bindings);
+	}
+
+	/**
+	 * @param string           $sql
+	 * @param array<int,mixed> $bindings
+	 *
+	 * @return static
+	 */
+	public function query($sql, $bindings = []): self
+	{
+		list($this->sqlStatement) = $this->statement($sql, $bindings);
+
+		return $this;
+	}
+
+	/**
+	 * @param string           $sql
+	 * @param array<int,mixed> $bindings
+	 *
+	 * @return array{0:string, 1:float}
+	 */
+	public function statement(string $sql, $bindings = []): array
+	{
+		$start        = microtime(true);
+		$sqlStatement = empty($bindings) ? $sql : $this->interpolateQuery($sql, $bindings);
+
+		if (!is_string($sqlStatement)) {
+			throw new Exception('Could not interpolate query', 1);
+		}
+
+		return [$sqlStatement, microtime(true) - $start];
+	}
+
+	/**
+	 * Get all rows
+	 *
+	 * @return array<mixed,mixed>|null
+	 *
+	 * @throws Exception
+	 */
+	public function get()
+	{
+		$eventResult = $this->fireEvents('before-select');
+		if (!is_null($eventResult)) {
+			return $eventResult;
+		}
+		$executionTime = 0;
+		if (is_null($this->sqlStatement)) {
+			$queryObject = $this->getQuery('select');
+			$statement   = $this->statement(
+				$queryObject->getSql(),
+				$queryObject->getBindings()
+			);
+
+			$this->sqlStatement = $statement[0];
+			$executionTime      = $statement[1];
+		}
+
+		$start  = microtime(true);
+		$result = $this->dbInstance()->get_results(
+			is_array($this->sqlStatement) ? (end($this->sqlStatement) ?: '') : $this->sqlStatement,
+			// If we are using the hydrator, return as OBJECT and let the hydrator map the correct model.
+			$this->useHydrator() ? OBJECT : $this->getFetchMode()
+		);
+		$executionTime += microtime(true) - $start;
+		$this->sqlStatement = null;
+
+		// Ensure we have an array of results.
+		if (!is_array($result) && null !== $result) {
+			$result = [$result];
+		}
+
+		// Maybe hydrate the results.
+		if (null !== $result && $this->useHydrator()) {
+			$result = $this->getHydrator()->fromMany($result);
+		}
+
+		$this->fireEvents('after-select', $result, $executionTime);
+
+		return $result;
+	}
+
+	/**
+	 * Returns a populated instance of the Hydrator.
+	 *
+	 * @return Hydrator
+	 */
+	protected function getHydrator(): Hydrator /* @phpstan-ignore-line */
+	{
+		$hydrator = new Hydrator($this->getFetchMode(), $this->hydratorConstructorArgs ?? []); /* @phpstan-ignore-line */
+
+		return $hydrator;
+	}
+
+	/**
+	 * Checks if the results should be mapped via the hydrator
+	 *
+	 * @return bool
+	 */
+	protected function useHydrator(): bool
+	{
+		return !in_array($this->getFetchMode(), [\ARRAY_A, \ARRAY_N, \OBJECT, \OBJECT_K]);
+	}
+
+	/**
+	 * Find all matching a simple where condition.
+	 *
+	 * Shortcut of ->where('key','=','value')->limit(1)->get();
+	 *
+	 * @return \stdClass\array<mixed,mixed>|object|null Can return any object using hydrator
+	 */
+	public function first()
+	{
+		$this->limit(1);
+		$result = $this->get();
+
+		return empty($result) ? null : $result[0];
+	}
+
+	/**
+	 * Find all matching a simple where condition.
+	 *
+	 * Shortcut of ->where('key','=','value')->get();
+	 *
+	 * @param string $fieldName
+	 * @param mixed $value
+	 *
+	 * @return array<mixed,mixed>|null Can return any object using hydrator
+	 */
+	public function findAll($fieldName, $value)
+	{
+		$this->where($fieldName, '=', $value);
+
+		return $this->get();
+	}
+
+	/**
+	 * @param string $fieldName
+	 * @param mixed $value
+	 *
+	 * @return \stdClass\array<mixed,mixed>|object|null Can return any object using hydrator
+	 */
+	public function find($value, $fieldName = 'id')
+	{
+		$this->where($fieldName, '=', $value);
+
+		return $this->first();
+	}
+
+	/**
+	 * @param string $fieldName
+	 * @param mixed $value
+	 *
+	 * @return \stdClass\array<mixed,mixed>|object Can return any object using hydrator
+	 * @throws Exception If fails to find
+	 */
+	public function findOrFail($value, $fieldName = 'id')
+	{
+		$result = $this->find($value, $fieldName);
+		if (null === $result) {
+			throw new Exception("Failed to find {$fieldName}={$value}", 1);
+		}
+		return $result;
+	}
+
+	/**
+	 * Used to handle all aggregation method.
+	 *
+	 * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
+	 *
+	 * @param string $type
+	 * @param string $field
+	 *
+	 * @return float
+	 */
+	protected function aggregate(string $type, string $field = '*'): float
+	{
+		// Verify that field exists
+		if ('*' !== $field && true === isset($this->statements['selects']) && false === \in_array($field, $this->statements['selects'], true)) {
+			throw new \Exception(sprintf('Failed %s query - the column %s hasn\'t been selected in the query.', $type, $field));
+		}
+
+		if (false === isset($this->statements['tables'])) {
+			throw new Exception('No table selected');
+		}
+
+		$count = $this
+			->table($this->subQuery($this, 'count'))
+			->select([$this->raw(sprintf('%s(%s) AS field', strtoupper($type), $field))])
+			->first();
+
+		return true === isset($count->field) ? (float)$count->field : 0;
+	}
+
+	/**
+	 * Get count of all the rows for the current query
+	 *
+	 * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
+	 *
+	 * @param string $field
+	 *
+	 * @return int
+	 *
+	 * @throws Exception
+	 */
+	public function count(string $field = '*'): int
+	{
+		return (int)$this->aggregate('count', $field);
+	}
+
+	/**
+	 * Get the sum for a field in the current query
+	 *
+	 * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
+	 *
+	 * @param string $field
+	 *
+	 * @return float
+	 *
+	 * @throws Exception
+	 */
+	public function sum(string $field): float
+	{
+		return $this->aggregate('sum', $field);
+	}
+
+	/**
+	 * Get the average for a field in the current query
+	 *
+	 * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
+	 *
+	 * @param string $field
+	 *
+	 * @return float
+	 *
+	 * @throws Exception
+	 */
+	public function average(string $field): float
+	{
+		return $this->aggregate('avg', $field);
+	}
+
+	/**
+	 * Get the minimum for a field in the current query
+	 *
+	 * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
+	 *
+	 * @param string $field
+	 *
+	 * @return float
+	 *
+	 * @throws Exception
+	 */
+	public function min(string $field): float
+	{
+		return $this->aggregate('min', $field);
+	}
+
+	/**
+	 * Get the maximum for a field in the current query
+	 *
+	 * @see Taken from the pecee-pixie library - https://github.com/skipperbent/pecee-pixie/
+	 *
+	 * @param string $field
+	 *
+	 * @return float
+	 *
+	 * @throws Exception
+	 */
+	public function max(string $field): float
+	{
+		return $this->aggregate('max', $field);
+	}
+
+	/**
+	 * @param string $type
+	 * @param bool|array<mixed, mixed> $dataToBePassed
+	 *
+	 * @return mixed
+	 *
+	 * @throws Exception
+	 */
+	public function getQuery(string $type = 'select', $dataToBePassed = [])
+	{
+		$allowedTypes = ['select', 'insert', 'insertignore', 'replace', 'delete', 'update', 'criteriaonly'];
+		if (!in_array(strtolower($type), $allowedTypes)) {
+			throw new Exception($type . ' is not a known type.', 2);
+		}
+
+		$queryArr = $this->adapterInstance->$type($this->statements, $dataToBePassed);
+
+		return $this->container->build(
+			QueryObject::class,
+			[$queryArr['sql'], $queryArr['bindings'], $this->dbInstance]
+		);
+	}
+
+	/**
+	 * @param QueryBuilderHandler $queryBuilder
+	 * @param string|null $alias
+	 *
+	 * @return Raw
+	 */
+	public function subQuery(QueryBuilderHandler $queryBuilder, ?string $alias = null)
+	{
+		$sql = '(' . $queryBuilder->getQuery()->getRawSql() . ')';
+		if (is_string($alias) && 0 !== mb_strlen($alias)) {
+			$sql = $sql . ' as ' . $alias;
+		}
+
+		return $queryBuilder->raw($sql);
+	}
+
+	/**
+	 * Handles the various insert operations based on the type.
+	 *
+	 * @param array<int|string, mixed|mixed[]> $data
+	 * @param string $type
+	 *
+	 * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
+	 */
+	private function doInsert(array $data, string $type)
+	{
+		$eventResult = $this->fireEvents('before-insert');
+		if (!is_null($eventResult)) {
+			return $eventResult;
+		}
+
+		// If first value is not an array () not a batch insert)
+		if (!is_array(current($data))) {
+			$queryObject = $this->getQuery($type, $data);
+
+			list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
+			$this->dbInstance->get_results($preparedQuery);
+
+			// Check we have a result.
+			$return = 1 === $this->dbInstance->rows_affected ? $this->dbInstance->insert_id : null;
+		} else {
+			// Its a batch insert
+			$return        = [];
+			$executionTime = 0;
+			foreach ($data as $subData) {
+				$queryObject = $this->getQuery($type, $subData);
+
+				list($preparedQuery, $time) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
+				$this->dbInstance->get_results($preparedQuery);
+				$executionTime += $time;
+
+				if (1 === $this->dbInstance->rows_affected) {
+					$return[] = $this->dbInstance->insert_id;
+				}
+			}
+		}
+
+		$this->fireEvents('after-insert', $return, $executionTime);
+
+		return $return;
+	}
+
+	/**
+	 * @param array<int|string, mixed|mixed[]> $data either key=>value array for single or array of arrays for bulk
+	 *
+	 * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
+	 */
+	public function insert($data)
+	{
+		return $this->doInsert($data, 'insert');
+	}
+
+	/**
+	 *
+	 * @param array<int|string, mixed|mixed[]> $data either key=>value array for single or array of arrays for bulk
+	 *
+	 * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
+	 */
+	public function insertIgnore($data)
+	{
+		return $this->doInsert($data, 'insertignore');
+	}
+
+	/**
+	 *
+	 * @param array<int|string, mixed|mixed[]> $data either key=>value array for single or array of arrays for bulk
+	 *
+	 * @return int|int[]|mixed|null can return a single row id, array of row ids, null (for failed) or any other value short circuited from event
+	 */
+	public function replace($data)
+	{
+		return $this->doInsert($data, 'replace');
+	}
+
+	/**
+	 * @param array<string, mixed> $data
+	 *
+	 * @return int|null
+	 */
+	public function update($data)
+	{
+		$eventResult = $this->fireEvents('before-update');
+		if (!is_null($eventResult)) {
+			return $eventResult;
+		}
+		$queryObject                         = $this->getQuery('update', $data);
+		list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
+
+		$this->dbInstance()->get_results($preparedQuery);
+		$this->fireEvents('after-update', $queryObject, $executionTime);
+
+		return 0 !== $this->dbInstance()->rows_affected
+			? $this->dbInstance()->rows_affected
+			: null;
+	}
+
+	/**
+	 * @param array<string, mixed> $data
+	 *
+	 * @return int|null will return row id for insert and bool for success/fail on update
+	 */
+	public function updateOrInsert($data)
+	{
+		if ($this->first()) {
+			return $this->update($data);
+		}
+
+		return $this->insert($data);
+	}
+
+	/**
+	 * @param array<string, mixed> $data
+	 *
+	 * @return static
+	 */
+	public function onDuplicateKeyUpdate($data)
+	{
+		$this->addStatement('onduplicate', $data);
+
+		return $this;
+	}
+
+	/**
+	 * @return int number of rows effected
+	 */
+	public function delete(): int
+	{
+		$eventResult = $this->fireEvents('before-delete');
+		if (!is_null($eventResult)) {
+			return $eventResult;
+		}
+
+		$queryObject = $this->getQuery('delete');
+
+		list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
+		$this->dbInstance()->get_results($preparedQuery);
+		$this->fireEvents('after-delete', $queryObject, $executionTime);
+
+		return $this->dbInstance()->rows_affected;
+	}
+
+	/**
+	 * @param string|Raw ...$tables Single table or array of tables
+	 *
+	 * @return static
+	 *
+	 * @throws Exception
+	 */
+	public function table(...$tables)
+	{
+		$instance =  $this->constructCurrentBuilderClass($this->connection);
+		$this->setFetchMode($this->getFetchMode(), $this->hydratorConstructorArgs);
+		$tables = $this->addTablePrefix($tables, false);
+		$instance->addStatement('tables', $tables);
+
+		return $instance;
+	}
+
+	/**
+	 * @param string|Raw ...$tables Single table or array of tables
+	 *
+	 * @return static
+	 */
+	public function from(...$tables): self
+	{
+		$tables = $this->addTablePrefix($tables, false);
+		$this->addStatement('tables', $tables);
+
+		return $this;
+	}
+
+	/**
+	 * @param string|string[]|Raw[]|array<string, string> $fields
+	 *
+	 * @return static
+	 */
+	public function select($fields): self
+	{
+		if (!is_array($fields)) {
+			$fields = func_get_args();
+		}
+
+		foreach ($fields as $field => $alias) {
+			// If we have a JSON expression
+			if ($this->jsonHandler->isJsonSelector($field)) {
+				$field = $this->jsonHandler->extractAndUnquoteFromJsonSelector($field);
+			}
+
+			// If no alias passed, but field is for JSON. thrown an exception.
+			if (is_numeric($field) && is_string($alias) && $this->jsonHandler->isJsonSelector($alias)) {
+				throw new Exception("An alias must be used if you wish to select from JSON Object", 1);
+			}
+
+			// Treat each array as a single table, to retain order added
+			$field = is_numeric($field)
+				? $field = $alias // If single colum
+				: $field = [$field => $alias]; // Has alias
+
+			$field = $this->addTablePrefix($field);
+			$this->addStatement('selects', $field);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param string|string[]|Raw[]|array<string, string> $fields
+	 *
+	 * @return static
+	 */
+	public function selectDistinct($fields)
+	{
+		$this->select($fields);
+		$this->addStatement('distinct', true);
+
+		return $this;
+	}
+
+	/**
+	 * @param string|string[] $field either the single field or an array of fields
+	 *
+	 * @return static
+	 */
+	public function groupBy($field): self
+	{
+		$field = $this->addTablePrefix($field);
+		$this->addStatement('groupBys', $field);
+
+		return $this;
+	}
+
+	/**
+	 * @param string|array<string|int, mixed> $fields
+	 * @param string          $defaultDirection
+	 *
+	 * @return static
+	 */
+	public function orderBy($fields, string $defaultDirection = 'ASC'): self
+	{
+		if (!is_array($fields)) {
+			$fields = [$fields];
+		}
+
+		foreach ($fields as $key => $value) {
+			$field = $key;
+			$type  = $value;
+			if (is_int($key)) {
+				$field = $value;
+				$type  = $defaultDirection;
+			}
+
+			if ($this->jsonHandler->isJsonSelector($field)) {
+				$field = $this->jsonHandler->extractAndUnquoteFromJsonSelector($field);
+			}
+
+			if (!$field instanceof Raw) {
+				$field = $this->addTablePrefix($field);
+			}
+			$this->statements['orderBys'][] = compact('field', 'type');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string $defaultDirection
+	 * @return static
+	 */
+	public function orderByJson($key, $jsonKey, string $defaultDirection = 'ASC'): self
+	{
+		$key = $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($key, $jsonKey);
+		return $this->orderBy($key, $defaultDirection);
+	}
+
+	/**
+	 * @param int $limit
+	 *
+	 * @return static
+	 */
+	public function limit(int $limit): self
+	{
+		$this->statements['limit'] = $limit;
+
+		return $this;
+	}
+
+	/**
+	 * @param int $offset
+	 *
+	 * @return static
+	 */
+	public function offset(int $offset): self
+	{
+		$this->statements['offset'] = $offset;
+
+		return $this;
+	}
+
+	/**
+	 * @param string|string[]|Raw|Raw[]       $key
+	 * @param string $operator
+	 * @param mixed $value
+	 * @param string $joiner
+	 *
+	 * @return static
+	 */
+	public function having($key, string $operator, $value, string $joiner = 'AND')
+	{
+		$key                           = $this->addTablePrefix($key);
+		$this->statements['havings'][] = compact('key', 'operator', 'value', 'joiner');
+
+		return $this;
+	}
+
+	/**
+	 * @param string|string[]|Raw|Raw[]       $key
+	 * @param string $operator
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function orHaving($key, $operator, $value)
+	{
+		return $this->having($key, $operator, $value, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 *
+	 * @return static
+	 */
+	public function where($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereHandler($key, $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw|\Closure(QueryBuilderHandler):void $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 *
+	 * @return static
+	 */
+	public function orWhere($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereHandler($key, $operator, $value, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 *
+	 * @return static
+	 */
+	public function whereNot($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereHandler($key, $operator, $value, 'AND NOT');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 *
+	 * @return static
+	 */
+	public function orWhereNot($key, $operator = null, $value = null)
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereHandler($key, $operator, $value, 'OR NOT');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param mixed[]|string|Raw $values
+	 *
+	 * @return static
+	 */
+	public function whereIn($key, $values): self
+	{
+		return $this->whereHandler($key, 'IN', $values, 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param mixed[]|string|Raw $values
+	 *
+	 * @return static
+	 */
+	public function whereNotIn($key, $values): self
+	{
+		return $this->whereHandler($key, 'NOT IN', $values, 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param mixed[]|string|Raw $values
+	 *
+	 * @return static
+	 */
+	public function orWhereIn($key, $values): self
+	{
+		return $this->whereHandler($key, 'IN', $values, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param mixed[]|string|Raw $values
+	 *
+	 * @return static
+	 */
+	public function orWhereNotIn($key, $values): self
+	{
+		return $this->whereHandler($key, 'NOT IN', $values, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param mixed $valueFrom
+	 * @param mixed $valueTo
+	 *
+	 * @return static
+	 */
+	public function whereBetween($key, $valueFrom, $valueTo): self
+	{
+		return $this->whereHandler($key, 'BETWEEN', [$valueFrom, $valueTo], 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param mixed $valueFrom
+	 * @param mixed $valueTo
+	 *
+	 * @return static
+	 */
+	public function orWhereBetween($key, $valueFrom, $valueTo): self
+	{
+		return $this->whereHandler($key, 'BETWEEN', [$valueFrom, $valueTo], 'OR');
+	}
+
+	/**
+	 * Handles all function call based where conditions
+	 *
+	 * @param string|Raw $key
+	 * @param string $function
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	protected function whereFunctionCallHandler($key, $function, $operator, $value): self
+	{
+		$key = \sprintf('%s(%s)', $function, $this->addTablePrefix($key));
+		return $this->where($key, $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return self
+	 */
+	public function whereMonth($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallHandler($key, 'MONTH', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return self
+	 */
+	public function whereDay($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallHandler($key, 'DAY', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return self
+	 */
+	public function whereYear($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallHandler($key, 'YEAR', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return self
+	 */
+	public function whereDate($key, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (2 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallHandler($key, 'DATE', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key
+	 *
+	 * @return static
+	 */
+	public function whereNull($key): self
+	{
+		return $this->whereNullHandler($key);
+	}
+
+	/**
+	 * @param string|Raw $key
+	 *
+	 * @return static
+	 */
+	public function whereNotNull($key): self
+	{
+		return $this->whereNullHandler($key, 'NOT');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 *
+	 * @return static
+	 */
+	public function orWhereNull($key): self
+	{
+		return $this->whereNullHandler($key, '', 'or');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 *
+	 * @return static
+	 */
+	public function orWhereNotNull($key): self
+	{
+		return $this->whereNullHandler($key, 'NOT', 'or');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string $prefix
+	 * @param string $operator
+	 *
+	 * @return static
+	 */
+	protected function whereNullHandler($key, string $prefix = '', $operator = ''): self
+	{
+		$prefix = 0 === mb_strlen($prefix) ? '' : " {$prefix}";
+
+		if ($key instanceof Raw) {
+			$key = $this->adapterInstance->parseRaw($key);
+		}
+
+		$key = $this->addTablePrefix($key);
+		if ($key instanceof Closure) {
+			throw new Exception('Key used for whereNull condition must be a string or raw exrpession.', 1);
+		}
+
+		return $this->{$operator . 'Where'}($this->raw("{$key} IS{$prefix} NULL"));
+	}
+
+
+	/**
+	 * Runs a transaction
+	 *
+	 * @param \Closure(Transaction):void $callback
+	 *
+	 * @return static
+	 */
+	public function transaction(Closure $callback): self
+	{
+		try {
+			// Begin the transaction
+			$this->dbInstance->query('START TRANSACTION');
+
+			// Get the Transaction class
+			$transaction = $this->container->build(Transaction::class, [$this->connection]);
+
+			$this->handleTransactionCall($callback, $transaction);
+
+			// If no errors have been thrown or the transaction wasn't completed within
+			$this->dbInstance->query('COMMIT');
+
+			return $this;
+		} catch (TransactionHaltException $e) {
+			// Commit or rollback behavior has been handled in the closure, so exit
+			return $this;
+		} catch (\Exception $e) {
+			// something happened, rollback changes
+			$this->dbInstance->query('ROLLBACK');
+
+			return $this;
+		}
+	}
+
+	/**
+	 * Handles the transaction call.
+	 * Catches any WPDB Errors (printed)
+	 *
+	 * @param Closure    $callback
+	 * @param Transaction $transaction
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	protected function handleTransactionCall(Closure $callback, Transaction $transaction): void
+	{
+		try {
+			ob_start();
+			$callback($transaction);
+			$output = ob_get_clean() ?: '';
+		} catch (Throwable $th) {
+			ob_end_clean();
+			throw $th;
+		}
+
+		// If we caught an error, throw an exception.
+		if (0 !== mb_strlen($output)) {
+			throw new Exception($output);
+		}
+	}
+
+	/*************************************************************************/
+	/*************************************************************************/
+	/*************************************************************************/
+	/**                              JOIN JOIN                              **/
+	/**                                 JOIN                                **/
+	/**                              JOIN JOIN                              **/
+	/*************************************************************************/
+	/*************************************************************************/
+	/*************************************************************************/
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw|Closure $key
+	 * @param string|null $operator
+	 * @param mixed $value
+	 * @param string $type
+	 *
+	 * @return static
+	 */
+	public function join($table, $key, ?string $operator = null, $value = null, $type = 'inner')
+	{
+		// Potentially cast key from JSON
+		if ($this->jsonHandler->isJsonSelector($key)) {
+			/** @var string $key */
+			$key = $this->jsonHandler->extractAndUnquoteFromJsonSelector($key); /** @phpstan-ignore-line */
+		}
+
+		// Potentially cast value from json
+		if ($this->jsonHandler->isJsonSelector($value)) {
+			/** @var string $value */
+			$value = $this->jsonHandler->extractAndUnquoteFromJsonSelector($value);
+		}
+
+		if (!$key instanceof Closure) {
+			$key = function ($joinBuilder) use ($key, $operator, $value) {
+				$joinBuilder->on($key, $operator, $value);
+			};
+		}
+
+		// Build a new JoinBuilder class, keep it by reference so any changes made
+		// in the closure should reflect here
+		$joinBuilder = $this->container->build(JoinBuilder::class, [$this->connection]);
+		$joinBuilder = &$joinBuilder;
+		// Call the closure with our new joinBuilder object
+		$key($joinBuilder);
+		$table = $this->addTablePrefix($table, false);
+		// Get the criteria only query from the joinBuilder object
+		$this->statements['joins'][] = compact('type', 'table', 'joinBuilder');
+		return $this;
+	}
+
+
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw|Closure $key
+	 * @param string|null $operator
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function leftJoin($table, $key, $operator = null, $value = null)
+	{
+		return $this->join($table, $key, $operator, $value, 'left');
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw|Closure $key
+	 * @param string|null $operator
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function rightJoin($table, $key, $operator = null, $value = null)
+	{
+		return $this->join($table, $key, $operator, $value, 'right');
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw|Closure $key
+	 * @param string|null $operator
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function innerJoin($table, $key, $operator = null, $value = null)
+	{
+		return $this->join($table, $key, $operator, $value, 'inner');
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw|Closure $key
+	 * @param string|null $operator
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function crossJoin($table, $key, $operator = null, $value = null)
+	{
+		return $this->join($table, $key, $operator, $value, 'cross');
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw|Closure $key
+	 * @param string|null $operator
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function outerJoin($table, $key, $operator = null, $value = null)
+	{
+		return $this->join($table, $key, $operator, $value, 'outer');
+	}
+
+	/**
+	 * Shortcut to join 2 tables on the same key name with equals
+	 *
+	 * @param string $table
+	 * @param string $key
+	 * @param string $type
+	 * @return self
+	 * @throws Exception If base table is set as more than 1 or 0
+	 */
+	public function joinUsing(string $table, string $key, string $type = 'INNER'): self
+	{
+		if (!array_key_exists('tables', $this->statements) || count($this->statements['tables']) !== 1) {
+			throw new Exception("JoinUsing can only be used with a single table set as the base of the query", 1);
+		}
+		$baseTable = end($this->statements['tables']);
+
+		// Potentialy cast key from JSON
+		if ($this->jsonHandler->isJsonSelector($key)) {
+			$key = $this->jsonHandler->extractAndUnquoteFromJsonSelector($key);
+		}
+
+		$remoteKey = $table = $this->addTablePrefix("{$table}.{$key}", true);
+		$localKey = $table = $this->addTablePrefix("{$baseTable}.{$key}", true);
+		return $this->join($table, $remoteKey, '=', $localKey, $type);
+	}
+
+	/**
+	 * Add a raw query
+	 *
+	 * @param string|Raw $value
+	 * @param mixed|mixed[] $bindings
+	 *
+	 * @return Raw
+	 */
+	public function raw($value, $bindings = []): Raw
+	{
+		return new Raw($value, $bindings);
+	}
+
+	/**
+	 * Return wpdb instance
+	 *
+	 * @return wpdb
+	 */
+	public function dbInstance(): wpdb
+	{
+		return $this->dbInstance;
+	}
+
+	/**
+	 * @param Connection $connection
+	 *
+	 * @return static
+	 */
+	public function setConnection(Connection $connection): self
+	{
+		$this->connection = $connection;
+
+		return $this;
+	}
+
+	/**
+	 * @return Connection
+	 */
+	public function getConnection()
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * @param string|Raw|Closure $key
+	 * @param string|null      $operator
+	 * @param mixed|null       $value
+	 * @param string $joiner
+	 *
+	 * @return static
+	 */
+	protected function whereHandler($key, $operator = null, $value = null, $joiner = 'AND')
+	{
+		$key = $this->addTablePrefix($key);
+		if ($key instanceof Raw) {
+			$key = $this->adapterInstance->parseRaw($key);
+		}
+
+		if ($this->jsonHandler->isJsonSelector($key)) {
+			$key = $this->jsonHandler->extractAndUnquoteFromJsonSelector($key);
+		}
+
+		$this->statements['wheres'][] = compact('key', 'operator', 'value', 'joiner');
+		return $this;
+	}
+
+
+
+	/**
+	 * @param string $key
+	 * @param mixed|mixed[]|bool $value
+	 *
+	 * @return void
+	 */
+	protected function addStatement($key, $value)
+	{
+		if (!is_array($value)) {
+			$value = [$value];
+		}
+
+		if (!array_key_exists($key, $this->statements)) {
+			$this->statements[$key] = $value;
+		} else {
+			$this->statements[$key] = array_merge($this->statements[$key], $value);
+		}
+	}
+
+	/**
+	 * @param string $event
+	 * @param string|Raw $table
+	 *
+	 * @return callable|null
+	 */
+	public function getEvent(string $event, $table = ':any'): ?callable
+	{
+		return $this->connection->getEventHandler()->getEvent($event, $table);
+	}
+
+	/**
+	 * @param string $event
+	 * @param string|Raw $table
+	 * @param Closure $action
+	 *
+	 * @return void
+	 */
+	public function registerEvent($event, $table, Closure $action): void
+	{
+		$table = $table ?: ':any';
+
+		if (':any' != $table) {
+			$table = $this->addTablePrefix($table, false);
+		}
+
+		$this->connection->getEventHandler()->registerEvent($event, $table, $action);
+	}
+
+	/**
+	 * @param string $event
+	 * @param string|Raw $table
+	 *
+	 * @return void
+	 */
+	public function removeEvent(string $event, $table = ':any')
+	{
+		if (':any' != $table) {
+			$table = $this->addTablePrefix($table, false);
+		}
+
+		$this->connection->getEventHandler()->removeEvent($event, $table);
+	}
+
+	/**
+	 * @param string $event
+	 *
+	 * @return mixed
+	 */
+	public function fireEvents(string $event)
+	{
+		$params = func_get_args(); // @todo Replace this with an easier to read alteratnive
+		array_unshift($params, $this);
+
+		return call_user_func_array([$this->connection->getEventHandler(), 'fireEvents'], $params);
+	}
+
+	/**
+	 * @return array<string, mixed[]>
+	 */
+	public function getStatements()
+	{
+		return $this->statements;
+	}
+
+	/**
+	 * @return string will return WPDB Fetch mode
+	 */
+	public function getFetchMode()
+	{
+		return null !== $this->fetchMode
+			? $this->fetchMode
+			: \OBJECT;
+	}
+
+	/**
+	 * Returns an NEW instance of the JSON builder populated with the same connection and hydrator details.
+	 *
+	 * @return JsonQueryBuilder
+	 */
+	public function jsonBuilder(): JsonQueryBuilder
+	{
+		return new JsonQueryBuilder($this->getConnection(), $this->getFetchMode(), $this->hydratorConstructorArgs);
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -232,7 +232,7 @@ 
         $start        = microtime(true);
         $sqlStatement = empty($bindings) ? $sql : $this->interpolateQuery($sql, $bindings);
 
-        if (!is_string($sqlStatement)) {
+        if ( ! is_string($sqlStatement)) {
             throw new Exception('Could not interpolate query', 1);
         }
 
@@ -249,7 +249,7 @@ 
     public function get()
     {
         $eventResult = $this->fireEvents('before-select');
-        if (!is_null($eventResult)) {
+        if ( ! is_null($eventResult)) {
             return $eventResult;
         }
         $executionTime = 0;
@@ -274,7 +274,7 @@ 
         $this->sqlStatement = null;
 
         // Ensure we have an array of results.
-        if (!is_array($result) && null !== $result) {
+        if ( ! is_array($result) && null !== $result) {
             $result = [$result];
         }
 
@@ -307,7 +307,7 @@ 
      */
     protected function useHydrator(): bool
     {
-        return !in_array($this->getFetchMode(), [\ARRAY_A, \ARRAY_N, \OBJECT, \OBJECT_K]);
+        return ! in_array($this->getFetchMode(), [\ARRAY_A, \ARRAY_N, \OBJECT, \OBJECT_K]);
     }
 
     /**
@@ -397,7 +397,7 @@ 
             ->select([$this->raw(sprintf('%s(%s) AS field', strtoupper($type), $field))])
             ->first();
 
-        return true === isset($count->field) ? (float)$count->field : 0;
+        return true === isset($count->field) ? (float) $count->field : 0;
     }
 
     /**
@@ -413,7 +413,7 @@ 
      */
     public function count(string $field = '*'): int
     {
-        return (int)$this->aggregate('count', $field);
+        return (int) $this->aggregate('count', $field);
     }
 
     /**
@@ -491,8 +491,8 @@ 
     public function getQuery(string $type = 'select', $dataToBePassed = [])
     {
         $allowedTypes = ['select', 'insert', 'insertignore', 'replace', 'delete', 'update', 'criteriaonly'];
-        if (!in_array(strtolower($type), $allowedTypes)) {
-            throw new Exception($type . ' is not a known type.', 2);
+        if ( ! in_array(strtolower($type), $allowedTypes)) {
+            throw new Exception($type.' is not a known type.', 2);
         }
 
         $queryArr = $this->adapterInstance->$type($this->statements, $dataToBePassed);
@@ -511,9 +511,9 @@ 
      */
     public function subQuery(QueryBuilderHandler $queryBuilder, ?string $alias = null)
     {
-        $sql = '(' . $queryBuilder->getQuery()->getRawSql() . ')';
+        $sql = '('.$queryBuilder->getQuery()->getRawSql().')';
         if (is_string($alias) && 0 !== mb_strlen($alias)) {
-            $sql = $sql . ' as ' . $alias;
+            $sql = $sql.' as '.$alias;
         }
 
         return $queryBuilder->raw($sql);
@@ -530,12 +530,12 @@ 
     private function doInsert(array $data, string $type)
     {
         $eventResult = $this->fireEvents('before-insert');
-        if (!is_null($eventResult)) {
+        if ( ! is_null($eventResult)) {
             return $eventResult;
         }
 
         // If first value is not an array () not a batch insert)
-        if (!is_array(current($data))) {
+        if ( ! is_array(current($data))) {
             $queryObject = $this->getQuery($type, $data);
 
             list($preparedQuery, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
@@ -605,7 +605,7 @@ 
     public function update($data)
     {
         $eventResult = $this->fireEvents('before-update');
-        if (!is_null($eventResult)) {
+        if ( ! is_null($eventResult)) {
             return $eventResult;
         }
         $queryObject                         = $this->getQuery('update', $data);
@@ -651,7 +651,7 @@ 
     public function delete(): int
     {
         $eventResult = $this->fireEvents('before-delete');
-        if (!is_null($eventResult)) {
+        if ( ! is_null($eventResult)) {
             return $eventResult;
         }
 
@@ -673,7 +673,7 @@ 
      */
     public function table(...$tables)
     {
-        $instance =  $this->constructCurrentBuilderClass($this->connection);
+        $instance = $this->constructCurrentBuilderClass($this->connection);
         $this->setFetchMode($this->getFetchMode(), $this->hydratorConstructorArgs);
         $tables = $this->addTablePrefix($tables, false);
         $instance->addStatement('tables', $tables);
@@ -701,7 +701,7 @@ 
      */
     public function select($fields): self
     {
-        if (!is_array($fields)) {
+        if ( ! is_array($fields)) {
             $fields = func_get_args();
         }
 
@@ -762,7 +762,7 @@ 
      */
     public function orderBy($fields, string $defaultDirection = 'ASC'): self
     {
-        if (!is_array($fields)) {
+        if ( ! is_array($fields)) {
             $fields = [$fields];
         }
 
@@ -778,7 +778,7 @@ 
                 $field = $this->jsonHandler->extractAndUnquoteFromJsonSelector($field);
             }
 
-            if (!$field instanceof Raw) {
+            if ( ! $field instanceof Raw) {
                 $field = $this->addTablePrefix($field);
             }
             $this->statements['orderBys'][] = compact('field', 'type');
@@ -1130,7 +1130,7 @@ 
             throw new Exception('Key used for whereNull condition must be a string or raw exrpession.', 1);
         }
 
-        return $this->{$operator . 'Where'}($this->raw("{$key} IS{$prefix} NULL"));
+        return $this->{$operator.'Where'}($this->raw("{$key} IS{$prefix} NULL"));
     }
 
 
@@ -1227,8 +1227,8 @@ 
             $value = $this->jsonHandler->extractAndUnquoteFromJsonSelector($value);
         }
 
-        if (!$key instanceof Closure) {
-            $key = function ($joinBuilder) use ($key, $operator, $value) {
+        if ( ! $key instanceof Closure) {
+            $key = function($joinBuilder) use ($key, $operator, $value) {
                 $joinBuilder->on($key, $operator, $value);
             };
         }
@@ -1323,7 +1323,7 @@ 
      */
     public function joinUsing(string $table, string $key, string $type = 'INNER'): self
     {
-        if (!array_key_exists('tables', $this->statements) || count($this->statements['tables']) !== 1) {
+        if ( ! array_key_exists('tables', $this->statements) || count($this->statements['tables']) !== 1) {
             throw new Exception("JoinUsing can only be used with a single table set as the base of the query", 1);
         }
         $baseTable = end($this->statements['tables']);
@@ -1414,11 +1414,11 @@ 
      */
     protected function addStatement($key, $value)
     {
-        if (!is_array($value)) {
+        if ( ! is_array($value)) {
             $value = [$value];
         }
 
-        if (!array_key_exists($key, $this->statements)) {
+        if ( ! array_key_exists($key, $this->statements)) {
             $this->statements[$key] = $value;
         } else {
             $this->statements[$key] = array_merge($this->statements[$key], $value);

src/QueryBuilder/JsonQueryBuilder.php

Indentation +444 added lines, -444 removed lines

@@ -4,448 +4,448 @@
 
 class JsonQueryBuilder extends QueryBuilderHandler
 {
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function whereJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'AND');
-    }
-
-    /**
-     * @param string|Raw $key The database column which holds the JSON value
-     * @param string|Raw|string[] $jsonKey The json key/index to search
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return static
-     */
-    public function whereNotJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'AND NOT');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function orWhereJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'OR');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function orWhereNotJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-
-        return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'OR NOT');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param mixed[] $values
-    * @return static
-    */
-    public function whereInJson($key, $jsonKey, $values): self
-    {
-        return $this->whereJsonHandler($key, $jsonKey, 'IN', $values, 'AND');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param mixed[] $values
-    * @return static
-    */
-    public function whereNotInJson($key, $jsonKey, $values): self
-    {
-        return $this->whereJsonHandler($key, $jsonKey, 'NOT IN', $values, 'AND');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param mixed[] $values
-    * @return static
-    */
-    public function orWhereInJson($key, $jsonKey, $values): self
-    {
-        return $this->whereJsonHandler($key, $jsonKey, 'IN', $values, 'OR');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param mixed[] $values
-    * @return static
-    */
-    public function orWhereNotInJson($key, $jsonKey, $values): self
-    {
-        return $this->whereJsonHandler($key, $jsonKey, 'NOT IN', $values, 'OR');
-    }
-
-    /**
-     * @param string|Raw $key
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-     * @param mixed $valueFrom
-     * @param mixed $valueTo
-     *
-     * @return static
-     */
-    public function whereBetweenJson($key, $jsonKey, $valueFrom, $valueTo): self
-    {
-        return $this->whereJsonHandler($key, $jsonKey, 'BETWEEN', [$valueFrom, $valueTo], 'AND');
-    }
-
-    /**
-     * @param string|Raw $key
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-     * @param mixed $valueFrom
-     * @param mixed $valueTo
-     *
-     * @return static
-     */
-    public function orWhereBetweenJson($key, $jsonKey, $valueFrom, $valueTo): self
-    {
-        return $this->whereJsonHandler($key, $jsonKey, 'BETWEEN', [$valueFrom, $valueTo], 'OR');
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function whereDayJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'DAY', $operator, $value);
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function whereMonthJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'MONTH', $operator, $value);
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function whereYearJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'YEAR', $operator, $value);
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @return static
-    */
-    public function whereDateJson($key, $jsonKey, $operator = null, $value = null): self
-    {
-        // If two params are given then assume operator is =
-        if (3 === func_num_args()) {
-            $value    = $operator;
-            $operator = '=';
-        }
-        return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'DATE', $operator, $value);
-    }
-
-    /**
-     * Maps a function call for a JSON where condition
-     *
-     * @param string|Raw $key
-     * @param string|Raw|string[] $jsonKey
-     * @param string $function
-     * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-     * @param mixed|null $value
-     * @return static
-     */
-    protected function whereFunctionCallJsonHandler($key, $jsonKey, $function, $operator, $value): self
-    {
-        // Handle potential raw values.
-        if ($key instanceof Raw) {
-            $key = $this->adapterInstance->parseRaw($key);
-        }
-        if ($jsonKey instanceof Raw) {
-            $jsonKey = $this->adapterInstance->parseRaw($jsonKey);
-        }
-
-        return $this->whereFunctionCallHandler(
-            $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($key, $jsonKey),
-            $function,
-            $operator,
-            $value
-        );
-    }
-
-    /**
-    * @param string|Raw $key The database column which holds the JSON value
-    * @param string|Raw|string[] $jsonKey The json key/index to search
-    * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
-    * @param mixed|null $value
-    * @param string $joiner
-    * @return static
-    */
-    protected function whereJsonHandler($key, $jsonKey, $operator = null, $value = null, string $joiner = 'AND'): self
-    {
-        // Handle potential raw values.
-        if ($key instanceof Raw) {
-            $key = $this->adapterInstance->parseRaw($key);
-        }
-        if ($jsonKey instanceof Raw) {
-            $jsonKey = $this->adapterInstance->parseRaw($jsonKey);
-        }
-
-        return $this->whereHandler(
-            $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($key, $jsonKey),
-            $operator,
-            $value,
-            $joiner
-        );
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw $remoteColumn
-     * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
-     * @param string $operator
-     * @param string|Raw $localColumn
-     * @param string|Raw|string[]|null $localJsonKeys
-     * @param string $type
-     *
-     * @return static
-     */
-    public function joinJson(
-        $table,
-        $remoteColumn,
-        $remoteJsonKeys,
-        string $operator,
-        $localColumn,
-        $localJsonKeys,
-        $type = 'inner'
-    ): self {
-        // Convert key if json
-        if (null !== $localJsonKeys) {
-            $localColumn = $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($localColumn, $localJsonKeys);
-        }
-
-        // Convert key if json
-        if (null !== $remoteJsonKeys) {
-            $remoteColumn = $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($remoteColumn, $remoteJsonKeys);
-        }
-
-        return $this->join($table, $remoteColumn, $operator, $localColumn, $type);
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw $remoteColumn
-     * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
-     * @param string $operator
-     * @param string|Raw $localColumn
-     * @param string|Raw|string[]|null $localJsonKeys
-     *
-     * @return static
-     */
-    public function leftJoinJson(
-        $table,
-        $remoteColumn,
-        $remoteJsonKeys,
-        string $operator,
-        $localColumn,
-        $localJsonKeys
-    ): self {
-        return $this->joinJson(
-            $table,
-            $remoteColumn,
-            $remoteJsonKeys,
-            $operator,
-            $localColumn,
-            $localJsonKeys,
-            'left'
-        );
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw $remoteColumn
-     * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
-     * @param string $operator
-     * @param string|Raw $localColumn
-     * @param string|Raw|string[]|null $localJsonKeys
-     *
-     * @return static
-     */
-    public function rightJoinJson(
-        $table,
-        $remoteColumn,
-        $remoteJsonKeys,
-        string $operator,
-        $localColumn,
-        $localJsonKeys
-    ): self {
-        return $this->joinJson(
-            $table,
-            $remoteColumn,
-            $remoteJsonKeys,
-            $operator,
-            $localColumn,
-            $localJsonKeys,
-            'right'
-        );
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw $remoteColumn
-     * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
-     * @param string $operator
-     * @param string|Raw $localColumn
-     * @param string|Raw|string[]|null $localJsonKeys
-     *
-     * @return static
-     */
-    public function outerJoinJson(
-        $table,
-        $remoteColumn,
-        $remoteJsonKeys,
-        string $operator,
-        $localColumn,
-        $localJsonKeys
-    ): self {
-        return $this->joinJson(
-            $table,
-            $remoteColumn,
-            $remoteJsonKeys,
-            $operator,
-            $localColumn,
-            $localJsonKeys,
-            'outer'
-        );
-    }
-
-    /**
-     * @param string|Raw $table
-     * @param string|Raw $remoteColumn
-     * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
-     * @param string $operator
-     * @param string|Raw $localColumn
-     * @param string|Raw|string[]|null $localJsonKeys
-     *
-     * @return static
-     */
-    public function crossJoinJson(
-        $table,
-        $remoteColumn,
-        $remoteJsonKeys,
-        string $operator,
-        $localColumn,
-        $localJsonKeys
-    ): self {
-        return $this->joinJson(
-            $table,
-            $remoteColumn,
-            $remoteJsonKeys,
-            $operator,
-            $localColumn,
-            $localJsonKeys,
-            'cross'
-        );
-    }
-
-
-
-    // JSON
-
-    /**
-     * @param string|Raw $key The database column which holds the JSON value
-     * @param string|Raw|string[] $jsonKey The json key/index to search
-     * @param string|null $alias The alias used to define the value in results, if not defined will use json_{$jsonKey}
-     * @return static
-     */
-    public function selectJson($key, $jsonKey, ?string $alias = null): self
-    {
-        // Handle potential raw values.
-        if ($key instanceof Raw) {
-            $key = $this->adapterInstance->parseRaw($key);
-        }
-        if ($jsonKey instanceof Raw) {
-            $jsonKey = $this->adapterInstance->parseRaw($jsonKey);
-        }
-
-        // If deeply nested jsonKey.
-        if (is_array($jsonKey)) {
-            $jsonKey = \implode('.', $jsonKey);
-        }
-
-        // Add any possible prefixes to the key
-        $key = $this->addTablePrefix($key, true);
-
-        $alias = null === $alias ? "json_{$jsonKey}" : $alias;
-        return  $this->select(new Raw("JSON_UNQUOTE(JSON_EXTRACT({$key}, \"$.{$jsonKey}\")) as {$alias}"));
-    }
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function whereJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function whereNotJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'AND NOT');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function orWhereJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function orWhereNotJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+
+		return $this->whereJsonHandler($key, $jsonKey, $operator, $value, 'OR NOT');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param mixed[] $values
+	 * @return static
+	 */
+	public function whereInJson($key, $jsonKey, $values): self
+	{
+		return $this->whereJsonHandler($key, $jsonKey, 'IN', $values, 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param mixed[] $values
+	 * @return static
+	 */
+	public function whereNotInJson($key, $jsonKey, $values): self
+	{
+		return $this->whereJsonHandler($key, $jsonKey, 'NOT IN', $values, 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param mixed[] $values
+	 * @return static
+	 */
+	public function orWhereInJson($key, $jsonKey, $values): self
+	{
+		return $this->whereJsonHandler($key, $jsonKey, 'IN', $values, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param mixed[] $values
+	 * @return static
+	 */
+	public function orWhereNotInJson($key, $jsonKey, $values): self
+	{
+		return $this->whereJsonHandler($key, $jsonKey, 'NOT IN', $values, 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param mixed $valueFrom
+	 * @param mixed $valueTo
+	 *
+	 * @return static
+	 */
+	public function whereBetweenJson($key, $jsonKey, $valueFrom, $valueTo): self
+	{
+		return $this->whereJsonHandler($key, $jsonKey, 'BETWEEN', [$valueFrom, $valueTo], 'AND');
+	}
+
+	/**
+	 * @param string|Raw $key
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param mixed $valueFrom
+	 * @param mixed $valueTo
+	 *
+	 * @return static
+	 */
+	public function orWhereBetweenJson($key, $jsonKey, $valueFrom, $valueTo): self
+	{
+		return $this->whereJsonHandler($key, $jsonKey, 'BETWEEN', [$valueFrom, $valueTo], 'OR');
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function whereDayJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'DAY', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function whereMonthJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'MONTH', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function whereYearJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'YEAR', $operator, $value);
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	public function whereDateJson($key, $jsonKey, $operator = null, $value = null): self
+	{
+		// If two params are given then assume operator is =
+		if (3 === func_num_args()) {
+			$value    = $operator;
+			$operator = '=';
+		}
+		return $this->whereFunctionCallJsonHandler($key, $jsonKey, 'DATE', $operator, $value);
+	}
+
+	/**
+	 * Maps a function call for a JSON where condition
+	 *
+	 * @param string|Raw $key
+	 * @param string|Raw|string[] $jsonKey
+	 * @param string $function
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @return static
+	 */
+	protected function whereFunctionCallJsonHandler($key, $jsonKey, $function, $operator, $value): self
+	{
+		// Handle potential raw values.
+		if ($key instanceof Raw) {
+			$key = $this->adapterInstance->parseRaw($key);
+		}
+		if ($jsonKey instanceof Raw) {
+			$jsonKey = $this->adapterInstance->parseRaw($jsonKey);
+		}
+
+		return $this->whereFunctionCallHandler(
+			$this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($key, $jsonKey),
+			$function,
+			$operator,
+			$value
+		);
+	}
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|mixed|null $operator Can be used as value, if 3rd arg not passed
+	 * @param mixed|null $value
+	 * @param string $joiner
+	 * @return static
+	 */
+	protected function whereJsonHandler($key, $jsonKey, $operator = null, $value = null, string $joiner = 'AND'): self
+	{
+		// Handle potential raw values.
+		if ($key instanceof Raw) {
+			$key = $this->adapterInstance->parseRaw($key);
+		}
+		if ($jsonKey instanceof Raw) {
+			$jsonKey = $this->adapterInstance->parseRaw($jsonKey);
+		}
+
+		return $this->whereHandler(
+			$this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($key, $jsonKey),
+			$operator,
+			$value,
+			$joiner
+		);
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw $remoteColumn
+	 * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
+	 * @param string $operator
+	 * @param string|Raw $localColumn
+	 * @param string|Raw|string[]|null $localJsonKeys
+	 * @param string $type
+	 *
+	 * @return static
+	 */
+	public function joinJson(
+		$table,
+		$remoteColumn,
+		$remoteJsonKeys,
+		string $operator,
+		$localColumn,
+		$localJsonKeys,
+		$type = 'inner'
+	): self {
+		// Convert key if json
+		if (null !== $localJsonKeys) {
+			$localColumn = $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($localColumn, $localJsonKeys);
+		}
+
+		// Convert key if json
+		if (null !== $remoteJsonKeys) {
+			$remoteColumn = $this->jsonHandler->jsonExpressionFactory()->extractAndUnquote($remoteColumn, $remoteJsonKeys);
+		}
+
+		return $this->join($table, $remoteColumn, $operator, $localColumn, $type);
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw $remoteColumn
+	 * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
+	 * @param string $operator
+	 * @param string|Raw $localColumn
+	 * @param string|Raw|string[]|null $localJsonKeys
+	 *
+	 * @return static
+	 */
+	public function leftJoinJson(
+		$table,
+		$remoteColumn,
+		$remoteJsonKeys,
+		string $operator,
+		$localColumn,
+		$localJsonKeys
+	): self {
+		return $this->joinJson(
+			$table,
+			$remoteColumn,
+			$remoteJsonKeys,
+			$operator,
+			$localColumn,
+			$localJsonKeys,
+			'left'
+		);
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw $remoteColumn
+	 * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
+	 * @param string $operator
+	 * @param string|Raw $localColumn
+	 * @param string|Raw|string[]|null $localJsonKeys
+	 *
+	 * @return static
+	 */
+	public function rightJoinJson(
+		$table,
+		$remoteColumn,
+		$remoteJsonKeys,
+		string $operator,
+		$localColumn,
+		$localJsonKeys
+	): self {
+		return $this->joinJson(
+			$table,
+			$remoteColumn,
+			$remoteJsonKeys,
+			$operator,
+			$localColumn,
+			$localJsonKeys,
+			'right'
+		);
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw $remoteColumn
+	 * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
+	 * @param string $operator
+	 * @param string|Raw $localColumn
+	 * @param string|Raw|string[]|null $localJsonKeys
+	 *
+	 * @return static
+	 */
+	public function outerJoinJson(
+		$table,
+		$remoteColumn,
+		$remoteJsonKeys,
+		string $operator,
+		$localColumn,
+		$localJsonKeys
+	): self {
+		return $this->joinJson(
+			$table,
+			$remoteColumn,
+			$remoteJsonKeys,
+			$operator,
+			$localColumn,
+			$localJsonKeys,
+			'outer'
+		);
+	}
+
+	/**
+	 * @param string|Raw $table
+	 * @param string|Raw $remoteColumn
+	 * @param string|Raw|string[]|null $remoteJsonKeys The json key/index to search
+	 * @param string $operator
+	 * @param string|Raw $localColumn
+	 * @param string|Raw|string[]|null $localJsonKeys
+	 *
+	 * @return static
+	 */
+	public function crossJoinJson(
+		$table,
+		$remoteColumn,
+		$remoteJsonKeys,
+		string $operator,
+		$localColumn,
+		$localJsonKeys
+	): self {
+		return $this->joinJson(
+			$table,
+			$remoteColumn,
+			$remoteJsonKeys,
+			$operator,
+			$localColumn,
+			$localJsonKeys,
+			'cross'
+		);
+	}
+
+
+
+	// JSON
+
+	/**
+	 * @param string|Raw $key The database column which holds the JSON value
+	 * @param string|Raw|string[] $jsonKey The json key/index to search
+	 * @param string|null $alias The alias used to define the value in results, if not defined will use json_{$jsonKey}
+	 * @return static
+	 */
+	public function selectJson($key, $jsonKey, ?string $alias = null): self
+	{
+		// Handle potential raw values.
+		if ($key instanceof Raw) {
+			$key = $this->adapterInstance->parseRaw($key);
+		}
+		if ($jsonKey instanceof Raw) {
+			$jsonKey = $this->adapterInstance->parseRaw($jsonKey);
+		}
+
+		// If deeply nested jsonKey.
+		if (is_array($jsonKey)) {
+			$jsonKey = \implode('.', $jsonKey);
+		}
+
+		// Add any possible prefixes to the key
+		$key = $this->addTablePrefix($key, true);
+
+		$alias = null === $alias ? "json_{$jsonKey}" : $alias;
+		return  $this->select(new Raw("JSON_UNQUOTE(JSON_EXTRACT({$key}, \"$.{$jsonKey}\")) as {$alias}"));
+	}
 }

src/JSON/JsonSelectorHandler.php

Indentation +71 added lines, -71 removed lines

@@ -9,86 +9,86 @@
 
 class JsonSelectorHandler implements HasConnection
 {
-    use TablePrefixer;
+	use TablePrefixer;
 
-    /** @var Connection */
-    protected $connection;
+	/** @var Connection */
+	protected $connection;
 
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
+	public function __construct(Connection $connection)
+	{
+		$this->connection = $connection;
+	}
 
-    /**
-     * Returns the current connection instance.
-     *
-     * @return connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
+	/**
+	 * Returns the current connection instance.
+	 *
+	 * @return connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
 
-    /**
-     * Checks if the passed expression is for JSON
-     * this->denotes->json
-     *
-     * @param string $expression
-     * @return bool
-     */
-    public function isJsonSelector($expression): bool
-    {
-        return is_string($expression)
-        && 2 <= count(array_diff(explode('->', $expression), array("")));
-    }
+	/**
+	 * Checks if the passed expression is for JSON
+	 * this->denotes->json
+	 *
+	 * @param string $expression
+	 * @return bool
+	 */
+	public function isJsonSelector($expression): bool
+	{
+		return is_string($expression)
+		&& 2 <= count(array_diff(explode('->', $expression), array("")));
+	}
 
-    /**
-    * Gets the column name form a potential array
-    *
-    * @param string $expression
-    * @return string
-    * @throws Exception If invalid JSON Selector string passed.
-    */
-    public function getColumn(string $expression): string
-    {
-        return $this->toJsonSelector($expression)->getColumn();
-    }
+	/**
+	 * Gets the column name form a potential array
+	 *
+	 * @param string $expression
+	 * @return string
+	 * @throws Exception If invalid JSON Selector string passed.
+	 */
+	public function getColumn(string $expression): string
+	{
+		return $this->toJsonSelector($expression)->getColumn();
+	}
 
-    /**
-     * Gets all JSON object keys while removing the column name.
-     *
-     * @param string $expression
-     * @return string[]
-     * @throws Exception If invalid JSON Selector string passed.
-     */
-    public function getNodes(string $expression): array
-    {
-        return $this->toJsonSelector($expression)->getNodes();
-    }
+	/**
+	 * Gets all JSON object keys while removing the column name.
+	 *
+	 * @param string $expression
+	 * @return string[]
+	 * @throws Exception If invalid JSON Selector string passed.
+	 */
+	public function getNodes(string $expression): array
+	{
+		return $this->toJsonSelector($expression)->getNodes();
+	}
 
-    /**
-     * Casts a valid JSON selector to a JsonSelector object.
-     *
-     * @param string $expression
-     * @return JsonSelector
-     * @throws Exception If invalid JSON Selector string passed.
-     */
-    public function toJsonSelector(string $expression): JsonSelector
-    {
-        if (! $this->isJsonSelector($expression)) {
-            throw new Exception('JSON expression must contain at least 2 values, the table column and at least 1 node.', 1);
-        }
+	/**
+	 * Casts a valid JSON selector to a JsonSelector object.
+	 *
+	 * @param string $expression
+	 * @return JsonSelector
+	 * @throws Exception If invalid JSON Selector string passed.
+	 */
+	public function toJsonSelector(string $expression): JsonSelector
+	{
+		if (! $this->isJsonSelector($expression)) {
+			throw new Exception('JSON expression must contain at least 2 values, the table column and at least 1 node.', 1);
+		}
 
-        /** @var string[] Check done above. */
-        $parts = array_diff(explode('->', $expression), array(""));
+		/** @var string[] Check done above. */
+		$parts = array_diff(explode('->', $expression), array(""));
 
-        $column = array_shift($parts);
-        $nodes = $parts;
+		$column = array_shift($parts);
+		$nodes = $parts;
 
-        if (! is_string($column)) {
-            throw new Exception('JSON expression must contain a valid column name', 1);
-        }
+		if (! is_string($column)) {
+			throw new Exception('JSON expression must contain a valid column name', 1);
+		}
 
-        return new JsonSelector($column, $nodes);
-    }
+		return new JsonSelector($column, $nodes);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
      */
     public function toJsonSelector(string $expression): JsonSelector
     {
-        if (! $this->isJsonSelector($expression)) {
+        if ( ! $this->isJsonSelector($expression)) {
             throw new Exception('JSON expression must contain at least 2 values, the table column and at least 1 node.', 1);
         }
 
@@ -85,7 +85,7 @@ 
         $column = array_shift($parts);
         $nodes = $parts;
 
-        if (! is_string($column)) {
+        if ( ! is_string($column)) {
             throw new Exception('JSON expression must contain a valid column name', 1);
         }
 

src/JSON/JsonSelector.php

Indentation +39 added lines, -39 removed lines

@@ -4,47 +4,47 @@
 
 class JsonSelector
 {
-    /**
-     * The table column
-     *
-     * @var string
-     */
-    protected $column;
+	/**
+	 * The table column
+	 *
+	 * @var string
+	 */
+	protected $column;
 
-    /**
-     * JSON Nodes
-     *
-     * @var string[]
-     */
-    protected $nodes;
+	/**
+	 * JSON Nodes
+	 *
+	 * @var string[]
+	 */
+	protected $nodes;
 
-    /**
-     * @param string $column
-     * @param string[] $nodes
-     */
-    public function __construct(string $column, array $nodes)
-    {
-        $this->column = $column;
-        $this->nodes = $nodes;
-    }
+	/**
+	 * @param string $column
+	 * @param string[] $nodes
+	 */
+	public function __construct(string $column, array $nodes)
+	{
+		$this->column = $column;
+		$this->nodes = $nodes;
+	}
 
-    /**
-     * Get the table column
-     *
-     * @return string
-     */
-    public function getColumn(): string
-    {
-        return $this->column;
-    }
+	/**
+	 * Get the table column
+	 *
+	 * @return string
+	 */
+	public function getColumn(): string
+	{
+		return $this->column;
+	}
 
-    /**
-     * Get jSON Nodes
-     *
-     * @return string[]
-     */
-    public function getNodes(): array
-    {
-        return $this->nodes;
-    }
+	/**
+	 * Get jSON Nodes
+	 *
+	 * @return string[]
+	 */
+	public function getNodes(): array
+	{
+		return $this->nodes;
+	}
 }

src/JSON/JsonHandler.php

Indentation +54 added lines, -54 removed lines

@@ -6,65 +6,65 @@
 
 class JsonHandler
 {
-    /** @var Connection */
-    protected $connection;
+	/** @var Connection */
+	protected $connection;
 
-    /** @var JsonSelectorHandler */
-    protected $jsonSelectorHandler;
+	/** @var JsonSelectorHandler */
+	protected $jsonSelectorHandler;
 
-    /** @var JsonExpressionFactory */
-    protected $jsonExpressionFactory;
+	/** @var JsonExpressionFactory */
+	protected $jsonExpressionFactory;
 
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-        $this->jsonSelectorHandler = new JsonSelectorHandler($connection);
-        $this->jsonExpressionFactory = new JsonExpressionFactory($connection);
-    }
+	public function __construct(Connection $connection)
+	{
+		$this->connection = $connection;
+		$this->jsonSelectorHandler = new JsonSelectorHandler($connection);
+		$this->jsonExpressionFactory = new JsonExpressionFactory($connection);
+	}
 
-    /**
-     * Returns the JSON Selector Handler
-     *
-     * @return JsonSelectorHandler
-     */
-    public function jsonSelectorHandler(): JsonSelectorHandler
-    {
-        return $this->jsonSelectorHandler;
-    }
+	/**
+	 * Returns the JSON Selector Handler
+	 *
+	 * @return JsonSelectorHandler
+	 */
+	public function jsonSelectorHandler(): JsonSelectorHandler
+	{
+		return $this->jsonSelectorHandler;
+	}
 
-    /**
-     * Returns the JSON Expression library
-     *
-     * @return JsonExpressionFactory
-     */
-    public function jsonExpressionFactory(): JsonExpressionFactory
-    {
-        return $this->jsonExpressionFactory;
-    }
+	/**
+	 * Returns the JSON Expression library
+	 *
+	 * @return JsonExpressionFactory
+	 */
+	public function jsonExpressionFactory(): JsonExpressionFactory
+	{
+		return $this->jsonExpressionFactory;
+	}
 
-    /**
-     * Parses a JSON selector and returns as an Extract and Unquote expression.
-     *
-     * @param string $selector
-     * @return string
-     */
-    public function extractAndUnquoteFromJsonSelector(string $selector): string
-    {
-        $selector = $this->jsonSelectorHandler()->toJsonSelector($selector);
-        return $this->jsonExpressionFactory()->extractAndUnquote(
-            $selector->getColumn(),
-            $selector->getNodes()
-        );
-    }
+	/**
+	 * Parses a JSON selector and returns as an Extract and Unquote expression.
+	 *
+	 * @param string $selector
+	 * @return string
+	 */
+	public function extractAndUnquoteFromJsonSelector(string $selector): string
+	{
+		$selector = $this->jsonSelectorHandler()->toJsonSelector($selector);
+		return $this->jsonExpressionFactory()->extractAndUnquote(
+			$selector->getColumn(),
+			$selector->getNodes()
+		);
+	}
 
-    /**
-     * Checks if the passed values is a valid JSON Selector
-     *
-     * @param mixed $expression
-     * @return bool
-     */
-    public function isJsonSelector($expression): bool
-    {
-        return $this->jsonSelectorHandler()->isJsonSelector($expression);
-    }
+	/**
+	 * Checks if the passed values is a valid JSON Selector
+	 *
+	 * @param mixed $expression
+	 * @return bool
+	 */
+	public function isJsonSelector($expression): bool
+	{
+		return $this->jsonSelectorHandler()->isJsonSelector($expression);
+	}
 }

src/JSON/JsonExpressionFactory.php

Indentation +45 added lines, -45 removed lines

@@ -8,57 +8,57 @@
 
 class JsonExpressionFactory
 {
-    use TablePrefixer;
+	use TablePrefixer;
 
-    /** @var Connection */
-    protected $connection;
+	/** @var Connection */
+	protected $connection;
 
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
+	public function __construct(Connection $connection)
+	{
+		$this->connection = $connection;
+	}
 
-    /**
-     * Returns the current connection instance.
-     *
-     * @return connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
+	/**
+	 * Returns the current connection instance.
+	 *
+	 * @return connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
 
-    /**
-     * @param string          $column  The database column which holds the JSON value
-     * @param string|string[] $nodes   The json key/index to search
-     * @return \Pixie\QueryBuilder\Raw
-     */
-    public function extractAndUnquote(string $column, $nodes): Raw
-    {
+	/**
+	 * @param string          $column  The database column which holds the JSON value
+	 * @param string|string[] $nodes   The json key/index to search
+	 * @return \Pixie\QueryBuilder\Raw
+	 */
+	public function extractAndUnquote(string $column, $nodes): Raw
+	{
 
-        // Unpack any nodes.
-        if (is_array($nodes)) {
-            $nodes = \implode('.', $nodes);
-        }
+		// Unpack any nodes.
+		if (is_array($nodes)) {
+			$nodes = \implode('.', $nodes);
+		}
 
-        // Add any possible prefixes to the key
-        $column = $this->addTablePrefix($column, true);
+		// Add any possible prefixes to the key
+		$column = $this->addTablePrefix($column, true);
 
-        return new Raw("JSON_UNQUOTE(JSON_EXTRACT({$column}, \"$.{$nodes}\"))");
-    }
+		return new Raw("JSON_UNQUOTE(JSON_EXTRACT({$column}, \"$.{$nodes}\"))");
+	}
 
-    /**
-     * @param string          $column  The database column which holds the JSON value
-     * @param string|string[] $nodes   The json key/index to search
-     * @param string|null     $alias   The alias to apply to this expression. Will be set as "json_{$column}" if not defined.
-     * @return \Pixie\QueryBuilder\Raw
-     */
-    public function extractAndUnquoteWithAlias(string $column, $nodes, ?string $alias = null): Raw
-    {
-        return new Raw(sprintf(
-            "%s AS %s",
-            $this->extractAndUnquote($column, $nodes)->getValue(),
-            null === $alias ? "json_{$column}" : $alias
-        ));
-    }
+	/**
+	 * @param string          $column  The database column which holds the JSON value
+	 * @param string|string[] $nodes   The json key/index to search
+	 * @param string|null     $alias   The alias to apply to this expression. Will be set as "json_{$column}" if not defined.
+	 * @return \Pixie\QueryBuilder\Raw
+	 */
+	public function extractAndUnquoteWithAlias(string $column, $nodes, ?string $alias = null): Raw
+	{
+		return new Raw(sprintf(
+			"%s AS %s",
+			$this->extractAndUnquote($column, $nodes)->getValue(),
+			null === $alias ? "json_{$column}" : $alias
+		));
+	}
 }