Merge pull request #124 from skipperbent/v4-development

Version 4.12.2

README.md

@@ -1,7 +1,7 @@
 # pecee/pixie: Advanced lightweight querybuilder
 
 A lightweight, expressive, framework agnostic query builder for PHP it can also be referred as a Database Abstraction Layer.
-Pixie supports MySQL, SQLite and PostgreSQL will handle all your query sanitization, table alias, unions among many other things, with a unified API.
+Pixie supports MySQL, MS-SQL, SQLite and PostgreSQL will handle all your query sanitization, table alias, unions among many other things, with a unified API.
 
 The syntax is similar to Laravel's query builder "Eloquent", but with less overhead.
 
@@ -1268,4 +1268,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

src/Pecee/Pixie/QueryBuilder/Adapters/BaseAdapter.php

@@ -137,13 +137,13 @@ protected function buildCriteria(array $statements, bool $bindValues = true): ar
 
             $key = $statement['key'];
 
+            $key = $this->wrapSanitizer($key);
+
             // Add alias non-existing
-            if($this->aliasPrefix !== null && strpos($key, '.') === false) {
+            if(is_string($key) && $this->aliasPrefix !== null && strpos($key, '.') === false) {
                 $key = $this->aliasPrefix . '.' . $key;
             }
 
-            $key = $this->wrapSanitizer($key);
-
             if ($statement['key'] instanceof Raw) {
                 $bindings[] = $statement['key']->getBindings();
             }