Merge pull request #136 from skipperbent/v4-development

Version 4.15.0

Author: skipperbent

.phpunit.result.cache

@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":7432:{a:2:{s:7:"defects";a:47:{s:39:"Pecee\Pixie\QueryBuilderTest::testAlias";i:4;s:45:"Pecee\Pixie\QueryBuilderTest::testDeleteQuery";i:4;s:50:"Pecee\Pixie\QueryBuilderTest::testEventPropagation";i:4;s:51:"Pecee\Pixie\QueryBuilderTest::testInsertIgnoreQuery";i:4;s:65:"Pecee\Pixie\QueryBuilderTest::testInsertOnDuplicateKeyUpdateQuery";i:4;s:45:"Pecee\Pixie\QueryBuilderTest::testInsertQuery";i:4;s:70:"Pecee\Pixie\QueryBuilderTest::testIsPossibleToUseSubqueryInWhereClause";i:4;s:73:"Pecee\Pixie\QueryBuilderTest::testIsPossibleToUseSubqueryInWhereNotClause";i:4;s:52:"Pecee\Pixie\QueryBuilderTest::testOrderByFlexibility";i:4;s:61:"Pecee\Pixie\QueryBuilderTest::testRawStatementsWithinCriteria";i:4;s:61:"Pecee\Pixie\QueryBuilderTest::testRawStatementWithinStatement";i:4;s:58:"Pecee\Pixie\QueryBuilderTest::testRawStatementWithinSelect";i:3;s:46:"Pecee\Pixie\QueryBuilderTest::testReplaceQuery";i:4;s:47:"Pecee\Pixie\QueryBuilderTest::testSelectAliases";i:4;s:48:"Pecee\Pixie\QueryBuilderTest::testSelectDistinct";i:4;s:62:"Pecee\Pixie\QueryBuilderTest::testSelectDistinctAndSelectCalls";i:4;s:64:"Pecee\Pixie\QueryBuilderTest::testSelectDistinctWithSingleColumn";i:4;s:51:"Pecee\Pixie\QueryBuilderTest::testSelectFlexibility";i:4;s:45:"Pecee\Pixie\QueryBuilderTest::testSelectQuery";i:3;s:71:"Pecee\Pixie\QueryBuilderTest::testSelectQueryWithNestedCriteriaAndJoins";i:4;s:53:"Pecee\Pixie\QueryBuilderTest::testSelectQueryWithNull";i:4;s:55:"Pecee\Pixie\QueryBuilderTest::testSelectWithQueryEvents";i:4;s:52:"Pecee\Pixie\QueryBuilderTest::testStandaloneWhereNot";i:4;s:45:"Pecee\Pixie\QueryBuilderTest::testUpdateQuery";i:4;s:53:"Pecee\Pixie\QueryBuilderTest::testDeleteAdvancedQuery";i:4;s:53:"Pecee\Pixie\QueryBuilderTest::testUpdateAdvancedQuery";i:4;s:46:"Pecee\Pixie\QueryBuilderTest::testFromSubQuery";i:4;s:44:"Pecee\Pixie\QueryBuilderTest::testTableAlias";i:4;s:54:"Pecee\Pixie\QueryBuilderTest::testWhereNotNullSubQuery";i:4;s:43:"Pecee\Pixie\QueryBuilderTest::testJoinUsing";i:4;s:55:"Pecee\Pixie\QueryBuilderTest::testJoinQueryBuilderUsing";i:4;s:60:"Pecee\Pixie\CustomExceptionsTest::testTableNotFoundException";i:4;s:61:"Pecee\Pixie\CustomExceptionsTest::testColumnNotFoundException";i:4;s:61:"Pecee\Pixie\CustomExceptionsTest::testDuplicateEntryException";i:4;s:75:"Pecee\Pixie\CustomExceptionsTest::testQueryAggregateColumnNotFoundException";i:4;s:57:"Pecee\Pixie\CustomExceptionsTest::testForeignKeyException";i:4;s:54:"Pecee\Pixie\CustomExceptionsTest::testNotNullException";i:4;s:53:"Pecee\Pixie\QueryBuilderAggregateTest::testQueryCount";i:4;s:59:"Pecee\Pixie\QueryBuilderAggregateTest::testSqliteQueryCount";i:4;s:51:"Pecee\Pixie\QueryBuilderAggregateTest::testQuerySum";i:4;s:57:"Pecee\Pixie\QueryBuilderAggregateTest::testSqliteQuerySum";i:4;s:55:"Pecee\Pixie\QueryBuilderAggregateTest::testQueryAverage";i:4;s:61:"Pecee\Pixie\QueryBuilderAggregateTest::testSqliteQueryAverage";i:4;s:50:"Pecee\Pixie\TransactionTest::testTransactionResult";i:4;s:51:"Pecee\Pixie\TransactionTest::testNestedTransactions";i:4;s:58:"Pecee\Pixie\TransactionTest::testTransactionMultipleInsert";i:4;s:42:"Pecee\Pixie\TransactionTest::testLastQuery";i:4;}s:5:"times";a:64:{s:39:"Pecee\Pixie\QueryBuilderTest::testAlias";d:0.001;s:45:"Pecee\Pixie\QueryBuilderTest::testDeleteQuery";d:0;s:50:"Pecee\Pixie\QueryBuilderTest::testEventPropagation";d:0.001;s:51:"Pecee\Pixie\QueryBuilderTest::testInsertIgnoreQuery";d:0;s:65:"Pecee\Pixie\QueryBuilderTest::testInsertOnDuplicateKeyUpdateQuery";d:0;s:45:"Pecee\Pixie\QueryBuilderTest::testInsertQuery";d:0;s:70:"Pecee\Pixie\QueryBuilderTest::testIsPossibleToUseSubqueryInWhereClause";d:0;s:73:"Pecee\Pixie\QueryBuilderTest::testIsPossibleToUseSubqueryInWhereNotClause";d:0;s:52:"Pecee\Pixie\QueryBuilderTest::testOrderByFlexibility";d:0;s:61:"Pecee\Pixie\QueryBuilderTest::testRawStatementsWithinCriteria";d:0;s:61:"Pecee\Pixie\QueryBuilderTest::testRawStatementWithinStatement";d:0.001;s:58:"Pecee\Pixie\QueryBuilderTest::testRawStatementWithinSelect";d:0;s:46:"Pecee\Pixie\QueryBuilderTest::testReplaceQuery";d:0;s:47:"Pecee\Pixie\QueryBuilderTest::testSelectAliases";d:0;s:48:"Pecee\Pixie\QueryBuilderTest::testSelectDistinct";d:0;s:62:"Pecee\Pixie\QueryBuilderTest::testSelectDistinctAndSelectCalls";d:0;s:64:"Pecee\Pixie\QueryBuilderTest::testSelectDistinctWithSingleColumn";d:0;s:51:"Pecee\Pixie\QueryBuilderTest::testSelectFlexibility";d:0;s:45:"Pecee\Pixie\QueryBuilderTest::testSelectQuery";d:0.001;s:71:"Pecee\Pixie\QueryBuilderTest::testSelectQueryWithNestedCriteriaAndJoins";d:0.001;s:53:"Pecee\Pixie\QueryBuilderTest::testSelectQueryWithNull";d:0;s:55:"Pecee\Pixie\QueryBuilderTest::testSelectWithQueryEvents";d:0.001;s:52:"Pecee\Pixie\QueryBuilderTest::testStandaloneWhereNot";d:0;s:45:"Pecee\Pixie\QueryBuilderTest::testUpdateQuery";d:0.001;s:53:"Pecee\Pixie\QueryBuilderTest::testDeleteAdvancedQuery";d:0;s:53:"Pecee\Pixie\QueryBuilderTest::testUpdateAdvancedQuery";d:0.001;s:46:"Pecee\Pixie\QueryBuilderTest::testFromSubQuery";d:0;s:44:"Pecee\Pixie\QueryBuilderTest::testTableAlias";d:0;s:54:"Pecee\Pixie\QueryBuilderTest::testWhereNotNullSubQuery";d:0;s:43:"Pecee\Pixie\QueryBuilderTest::testJoinUsing";d:0;s:55:"Pecee\Pixie\QueryBuilderTest::testJoinQueryBuilderUsing";d:0;s:42:"Pecee\Pixie\ConnectionTest::testConnection";d:0.051;s:47:"Pecee\Pixie\ConnectionTest::testMultiConnection";d:0.001;s:57:"Pecee\Pixie\CustomExceptionsTest::testConnectionException";d:0.005;s:60:"Pecee\Pixie\CustomExceptionsTest::testTableNotFoundException";d:0.053;s:61:"Pecee\Pixie\CustomExceptionsTest::testColumnNotFoundException";d:0.056;s:61:"Pecee\Pixie\CustomExceptionsTest::testDuplicateEntryException";d:0.051;s:75:"Pecee\Pixie\CustomExceptionsTest::testQueryAggregateColumnNotFoundException";d:0.048;s:57:"Pecee\Pixie\CustomExceptionsTest::testForeignKeyException";d:0.047;s:54:"Pecee\Pixie\CustomExceptionsTest::testNotNullException";d:0.04;s:45:"Pecee\Pixie\NoTableSubQueryTest::testRawQuery";d:0.001;s:53:"Pecee\Pixie\QueryBuilderAggregateTest::testQueryCount";d:0.037;s:59:"Pecee\Pixie\QueryBuilderAggregateTest::testSqliteQueryCount";d:0.002;s:51:"Pecee\Pixie\QueryBuilderAggregateTest::testQuerySum";d:0.038;s:57:"Pecee\Pixie\QueryBuilderAggregateTest::testSqliteQuerySum";d:0.002;s:55:"Pecee\Pixie\QueryBuilderAggregateTest::testQueryAverage";d:0.041;s:61:"Pecee\Pixie\QueryBuilderAggregateTest::testSqliteQueryAverage";d:0.001;s:44:"Pecee\Pixie\QueryBuilder::testFalseBoolWhere";d:0;s:59:"Pecee\Pixie\QueryBuilder::testInsertQueryReturnsIdForInsert";d:0.002;s:65:"Pecee\Pixie\QueryBuilder::testInsertQueryReturnsIdForInsertIgnore";d:0;s:68:"Pecee\Pixie\QueryBuilder::testInsertQueryReturnsNullForIgnoredInsert";d:0;s:38:"Pecee\Pixie\QueryBuilder::testRawQuery";d:0;s:43:"Pecee\Pixie\QueryBuilder::testNullableWhere";d:0;s:42:"Pecee\Pixie\QueryBuilder::testWhereBetween";d:0;s:35:"Pecee\Pixie\QueryBuilder::testUnion";d:0.001;s:43:"Pecee\Pixie\QueryBuilder::testUnionSubQuery";d:0;s:44:"Pecee\Pixie\QueryBuilder::testQueryOverwrite";d:0.001;s:40:"Pecee\Pixie\QueryBuilder::testGetColumns";d:0.001;s:42:"Pecee\Pixie\QueryBuilder::testQueryPartFor";d:0.001;s:41:"Pecee\Pixie\QueryBuilder::testRemoveQuery";d:0.001;s:50:"Pecee\Pixie\TransactionTest::testTransactionResult";d:0.043;s:51:"Pecee\Pixie\TransactionTest::testNestedTransactions";d:0.051;s:58:"Pecee\Pixie\TransactionTest::testTransactionMultipleInsert";d:0.046;s:42:"Pecee\Pixie\TransactionTest::testLastQuery";d:0.042;}}}

README.md

@@ -1105,16 +1105,16 @@ The event needs a custom callback function with a `EventArguments` object as par
 **Examples:**
 
 ```php
-$queryBuilder->registerEvent(EventHandler::EVENT_BEFORE_SELECT, 'users', function(EventArguments $arguments)
+$queryBuilder->registerEvent(EventHandler::EVENT_BEFORE_SELECT, function(EventArguments $arguments)
 {
     $arguments
         ->getQueryBuilder()
         ->where('status', '!=', 'banned');
-});
+}, 'users');
 ```
 Now every time a select query occurs on `users` table, it will add this where criteria, so banned users don't get access.
 
-The syntax is `registerEvent('event type', 'table name', action in a closure)`.
+The syntax is `registerEvent('event type', action in a closure, 'table name')`.
 
 If you want the event to be performed when **any table is being queried**, provide `':any'` as table name.
 
@@ -1123,7 +1123,7 @@ If you want the event to be performed when **any table is being queried**, provi
 After inserting data into `my_table`, details will be inserted into another table
 
 ```php
-$queryBuilder->registerEvent(EventHandler::EVENT_AFTER_INSERT, 'my_table', function(EventArguments $arguments)
+$queryBuilder->registerEvent(EventHandler::EVENT_AFTER_INSERT, function(EventArguments $arguments)
 {
     $arguments
         ->getQueryBuilder()
@@ -1132,13 +1132,13 @@ $queryBuilder->registerEvent(EventHandler::EVENT_AFTER_INSERT, 'my_table', funct
         'details' => 'Meh',
         'age' => 5
     ));
-});
+}, 'my_table');
 ```
 
 Whenever data is inserted into `person_details` table, set the timestamp field `created_at`, so we don't have to specify it everywhere:
 
 ```php
-$queryBuilder->registerEvent(EventHandler::EVENT_AFTER_INSERT, 'person_details', function(EventArguments $arguments)
+$queryBuilder->registerEvent(EventHandler::EVENT_AFTER_INSERT, function(EventArguments $arguments)
 {
     $arguments
         ->getQueryBuilder()
@@ -1147,13 +1147,13 @@ $queryBuilder->registerEvent(EventHandler::EVENT_AFTER_INSERT, 'person_details',
         ->update([
             'created_at' => date('Y-m-d H:i:s')
         ]);
-});
+}, 'person_details');
 ```
 
 After deleting from `my_table` delete the relations:
 
 ```php
-$queryBuilder->registerEvent(EventHandler::EVENT_AFTER_DELETE, 'my_table', function(EventArguments $arguments)
+$queryBuilder->registerEvent(EventHandler::EVENT_AFTER_DELETE, function(EventArguments $arguments)
 {
     $bindings = $arguments->getQuery()->getBindings();
 
@@ -1162,7 +1162,7 @@ $queryBuilder->registerEvent(EventHandler::EVENT_AFTER_DELETE, 'my_table', funct
         ->table('person_details')
         ->where('person_id', $binding[0])
         ->delete();
-});
+}, 'my_table');
 ```
 
 Pixie passes the current instance of query builder as first parameter of your closure so you can build queries with this object, you can do anything like usual query builder (`QB`).

composer.json

@@ -38,7 +38,7 @@
     "ext-pdo": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
+    "phpunit/phpunit": "^8.0",
     "mockery/mockery": "^1",
     "ext-pdo_sqlite": "*",
     "phpstan/phpstan": "^0",
@@ -60,4 +60,4 @@
     ],
     "phpstan": "phpstan analyse"
   }
-}
+}

src/Pecee/Pixie/Connection.php

@@ -201,14 +201,14 @@ public function getLastQuery(): ?QueryObject
      * Register new event
      *
      * @param string $name
-     * @param string|null $table
      * @param \Closure $action
+     * @param string $table
      *
      * @return void
      */
-    public function registerEvent($name, $table = null, \Closure $action): void
+    public function registerEvent(string $name, \Closure $action, string $table = EventHandler::TABLE_ANY): void
     {
-        $this->getEventHandler()->registerEvent($name, $table, $action);
+        $this->getEventHandler()->registerEvent($name, $action, $table);
     }
 
     /**
@@ -225,4 +225,4 @@ public function __destruct()
         $this->close();
     }
 
-}
+}

src/Pecee/Pixie/Event/EventHandler.php

@@ -177,12 +177,12 @@ public function getEvents(): array
 
     /**
      * @param string $event
-     * @param string|null $table
      * @param \Closure $action
+     * @param string $table
      *
      * @return void
      */
-    public function registerEvent(string $event, ?string $table = null, \Closure $action): void
+    public function registerEvent(string $event, \Closure $action, string $table = EventHandler::TABLE_ANY): void
     {
         $this->events[$table ?? static::TABLE_ANY][$event] = $action;
     }

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

@@ -60,6 +60,23 @@ abstract class BaseAdapter
      */
     protected $connection;
 
+    /**
+     * Join different part of queries with a space.
+     *
+     * @param array $pieces
+     *
+     * @return string
+     */
+    protected function concatenateQuery(array $pieces): string
+    {
+        $str = '';
+        foreach ($pieces as $piece) {
+            $str = trim($str) . ' ' . trim($piece);
+        }
+
+        return trim($str);
+    }
+
     /**
      * Alias prefix
      * @var string|null
@@ -306,23 +323,6 @@ protected function buildJoin(array $statements): string
         return $sql;
     }
 
-    /**
-     * Join different part of queries with a space.
-     *
-     * @param array $pieces
-     *
-     * @return string
-     */
-    protected function concatenateQuery(array $pieces): string
-    {
-        $str = '';
-        foreach ($pieces as $piece) {
-            $str = trim($str) . ' ' . trim($piece);
-        }
-
-        return trim($str);
-    }
-
     /**
      * Return table name with alias
      * eg. foo as f
@@ -527,14 +527,13 @@ public function replace(array $statements, array $data): array
     }
 
     /**
-     * Build select query string and bindings
+     * Sets select statements and returns status of distinct tables.
      *
      * @param array $statements
-     *
-     * @throws Exception
-     * @return array
+     * @param array $bindings
+     * @return bool Returns true if distinct tables are found.
      */
-    public function select(array $statements): array
+    protected function setSelectStatement(array &$statements, array &$bindings): bool
     {
         $hasDistincts = false;
 
@@ -551,13 +550,36 @@ public function select(array $statements): array
             $statements['selects'] = ['*'];
         }
 
+
+        foreach ((array)$statements['selects'] as $select) {
+            if ($select instanceof Raw) {
+                $bindings += $select->getBindings();
+            }
+        }
+
+        return $hasDistincts;
+    }
+
+    /**
+     * Build select query string and bindings
+     *
+     * @param array $statements
+     *
+     * @throws Exception
+     * @return array
+     */
+    public function select(array $statements): array
+    {
+        $bindings = [];
+
+        $hasDistincts = $this->setSelectStatement($statements, $bindings);
+
         // From
         $fromEnabled = false;
         $tables = '';
 
         if (isset($statements['tables']) === true) {
             $tablesFound = [];
-
             foreach ((array)$statements['tables'] as $table) {
                 if ($table instanceof Raw) {
                     $t = $table;
@@ -596,6 +618,7 @@ public function select(array $statements): array
         $sql = $this->buildUnion($statements, $sql);
 
         $bindings = array_merge(
+            $bindings,
             $whereBindings,
             $havingBindings
         );

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

@@ -57,20 +57,8 @@ protected function buildQueryPart(string $section, array $statements): string
      */
     public function select(array $statements): array
     {
-        $hasDistincts = false;
-
-        if (isset($statements['distincts']) === true && \count($statements['distincts']) > 0) {
-            $hasDistincts = true;
-
-            if (isset($statements['selects']) === true && \count($statements['selects']) > 0) {
-                $statements['selects'] = array_merge($statements['distincts'], $statements['selects']);
-            } else {
-                $statements['selects'] = $statements['distincts'];
-            }
-
-        } else if (isset($statements['selects']) === false) {
-            $statements['selects'] = ['*'];
-        }
+        $bindings = [];
+        $hasDistincts = $this->setSelectStatement($statements, $bindings);
 
         // From
         $fromEnabled = false;
@@ -123,6 +111,7 @@ public function select(array $statements): array
         $sql = $this->buildUnion($statements, $sql);
 
         $bindings = array_merge(
+            $bindings,
             $whereBindings,
             $havingBindings
         );

src/Pecee/Pixie/QueryBuilder/QueryBuilderHandler.php

@@ -1516,14 +1516,14 @@ public function query(string $sql, array $bindings = []): self
      * Register new event
      *
      * @param string $name
-     * @param string|null $table
      * @param \Closure $action
+     * @param string $table
      *
      * @return void
      */
-    public function registerEvent(string $name, ?string $table = null, \Closure $action): void
+    public function registerEvent(string $name, \Closure $action, string $table = EventHandler::TABLE_ANY): void
     {
-        $this->connection->getEventHandler()->registerEvent($name, $table, $action);
+        $this->connection->getEventHandler()->registerEvent($name, $action, $table);
     }
 
     /**

tests/Pecee/Pixie/ConnectionTest.php

@@ -26,7 +26,7 @@ class ConnectionTest extends TestCase
      */
     protected $builder;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -85,4 +85,4 @@ public function testMultiConnection()
         $this->assertEquals($adapterConfigOne['host'], $connectionOneHost);
         $this->assertEquals($adapterConfigTwo['host'], $connectionTwoHost);
     }
-}
+}

tests/Pecee/Pixie/QueryBuilderAggregateTest.php

@@ -10,17 +10,17 @@
 class QueryBuilderAggregateTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp(): void
     {
-        return parent::setUp();
+        parent::setUp();
 
-        $this->builder->query('TRUNCATE `animal`');
+        /*$this->builder->query('TRUNCATE `animal`');
 
         $qb->from('animal')->insert([
             ['name' => 'mouse', 'number_of_legs' => 28],
             ['name' => 'horse', 'number_of_legs' => 4],
             ['name' => 'cat', 'number_of_legs' => 8],
-        ]);
+        ]);*/
 
     }
 
@@ -80,4 +80,4 @@ public function testSqliteQueryAverage()
         $this->assertEquals(13.3333333333333, $count);
     }
 
-}
+}