Connection::query() and Fluent::execute() returns only resultset, not…

… the number of affected rows (BC break)

src/Dibi/Connection.php

@@ -187,10 +187,9 @@ final public function getDriver(): Driver
 	/**
 	 * Generates (translates) and executes SQL query.
 	 * @param  mixed  ...$args
-	 * @return Result|int|null   result set or number of affected rows
 	 * @throws Exception
 	 */
-	final public function query(...$args)
+	final public function query(...$args): ?Result
 	{
 		return $this->nativeQuery($this->translateArgs($args));
 	}
@@ -257,10 +256,9 @@ protected function translateArgs(array $args): string
 
 	/**
 	 * Executes the SQL query.
-	 * @return Result|int|null   result set or number of affected rows
 	 * @throws Exception
 	 */
-	final public function nativeQuery(string $sql)
+	final public function nativeQuery(string $sql): ?Result
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -278,12 +276,7 @@ final public function nativeQuery(string $sql)
 			throw $e;
 		}
 
-		if ($res) {
-			$res = $this->createResultSet($res);
-		} else {
-			$res = $this->driver->getAffectedRows();
-		}
-
+		$res = $res ? $this->createResultSet($res) : null;
 		if ($event) {
 			$this->onEvent($event->done($res));
 		}

src/Dibi/Fluent.php

@@ -380,10 +380,7 @@ public function count(): int
 	}
 
 
-	/**
-	 * @return Result|int
-	 */
-	private function query($args)
+	private function query($args): ?Result
 	{
 		$res = $this->connection->query($args);
 		foreach ($this->setups as $setup) {

src/Dibi/dibi.php

@@ -13,8 +13,8 @@
  * store connections info.
  *
  * @method void disconnect()
- * @method Dibi\Result|int|null query(...$args)
- * @method Dibi\Result|int|null nativeQuery(...$args)
+ * @method Dibi\Result|null query(...$args)
+ * @method Dibi\Result|null nativeQuery(...$args)
  * @method bool test(...$args)
  * @method Dibi\DataSource dataSource(...$args)
  * @method Dibi\Row|null fetch(...$args)

src/Dibi/interfaces.php

@@ -214,10 +214,9 @@ function getDriver(): Driver;
 
 	/**
 	 * Generates (translates) and executes SQL query.
-	 * @return Result|int|null   result set or number of affected rows
 	 * @throws Exception
 	 */
-	function query(...$args);
+	function query(...$args): ?Result;
 
 	/**
 	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.

tests/dibi/Fluent.fetch.phpt

@@ -54,4 +54,5 @@ if (!in_array($config['system'], ['odbc', 'sqlsrv'], true)) {
 
 // affected rows
 $res = $conn->update('products', ['title' => 'new'])->execute();
-Assert::same(3, $res);
+Assert::null($res);
+Assert::same(3, $conn->getAffectedRows());