diff --git a/dibi/dibi.php b/dibi/dibi.php
index b2588514..7041f5bb 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -247,7 +247,7 @@ class dibi
      * Generates and executes SQL query - Monostate for DibiDriver::query()
      *
      * @param  array|mixed    one or more arguments
-     * @return int|DibiResult
+     * @return DibiResult|TRUE
      * @throws DibiException
      */
     public static function query($args)
@@ -263,7 +263,7 @@ class dibi
      * Executes the SQL query - Monostate for DibiDriver::nativeQuery()
      *
      * @param string        SQL statement.
-     * @return object|bool  Result set object or TRUE on success, FALSE on failure
+     * @return DibiResult|TRUE
      */
     public static function nativeQuery($sql)
     {
diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php
index 29c82c53..7ed47947 100644
--- a/dibi/drivers/mssql.php
+++ b/dibi/drivers/mssql.php
@@ -74,10 +74,9 @@ class DibiMsSqlDriver extends DibiDriver
 
         if ($res === FALSE) {
             throw new DibiDatabaseException('Query error', 0, $sql);
-
-        } elseif (is_resource($res)) {
-            return new DibiMSSqlResult($res);
         }
+
+        return is_resource($res) ? new DibiMSSqlResult($res) : TRUE;
     }
 
 
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index 86a4bd61..24671261 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -105,10 +105,9 @@ class DibiMySqlDriver extends DibiDriver
 
         if ($res === FALSE) {
             throw new DibiDatabaseException(mysql_error($connection), mysql_errno($connection), $sql);
-
-        } elseif (is_resource($res)) {
-            return new DibiMySqlResult($res);
         }
+
+        return is_resource($res) ? new DibiMySqlResult($res) : TRUE;
     }
 
 
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 54025ad1..40dd453d 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -79,10 +79,9 @@ class DibiMySqliDriver extends DibiDriver
 
         if ($res === FALSE) {
             throw new DibiDatabaseException(mysqli_error($connection), mysqli_errno($connection), $sql);
-
-        } elseif (is_object($res)) {
-            return new DibiMySqliResult($res);
         }
+
+        return is_object($res) ? new DibiMySqliResult($res) : TRUE;
     }
 
 
diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php
index 9ae68b8a..e26b96e2 100644
--- a/dibi/drivers/odbc.php
+++ b/dibi/drivers/odbc.php
@@ -105,10 +105,9 @@ class DibiOdbcDriver extends DibiDriver
 
         if ($res === FALSE) {
             throw new DibiDatabaseException(odbc_errormsg($connection), odbc_error($connection), $sql);
-
-        } elseif (is_resource($res)) {
-            return new DibiOdbcResult($res);
         }
+
+        return is_resource($res) ? new DibiOdbcResult($res) : TRUE;
     }
 
 
diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index a9362806..7f03668b 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -64,16 +64,14 @@ class DibiPdoDriver extends DibiDriver
     protected function doQuery($sql)
     {
         $res = $this->getConnection()->query($sql);
-        if ($res instanceof PDOStatement) {
-            return new DibiPdoResult($res);
-        }
+        return $res instanceof PDOStatement ? new DibiPdoResult($res) : TRUE;
     }
 
 
 
     public function affectedRows()
     {
-        // not implemented
+        throw new DibiException(__METHOD__ . ' is not implemented');
     }
 
 
diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php
index 9fa5af26..497eee14 100644
--- a/dibi/drivers/postgre.php
+++ b/dibi/drivers/postgre.php
@@ -99,10 +99,9 @@ class DibiPostgreDriver extends DibiDriver
 
         if ($res === FALSE) {
             throw new DibiDatabaseException(pg_last_error($connection), 0, $sql);
-
-        } elseif (is_resource($res)) {
-            return new DibiPostgreResult($res);
         }
+
+        return is_resource($res) ? new DibiPostgreResult($res) : TRUE;
     }
 
 
diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php
index 2d5a6815..4bccadd5 100644
--- a/dibi/drivers/sqlite.php
+++ b/dibi/drivers/sqlite.php
@@ -77,10 +77,9 @@ class DibiSqliteDriver extends DibiDriver
         if ($res === FALSE) {
             $code = sqlite_last_error($connection);
             throw new DibiDatabaseException(sqlite_error_string($code), $code, $sql);
-
-        } elseif (is_resource($res)) {
-            return new DibiSqliteResult($res);
         }
+
+        return is_resource($res) ? new DibiSqliteResult($res) : TRUE;
     }
 
 
diff --git a/dibi/libs/driver.php b/dibi/libs/driver.php
index 5c0004f3..2323c359 100644
--- a/dibi/libs/driver.php
+++ b/dibi/libs/driver.php
@@ -114,7 +114,7 @@ abstract class DibiDriver
      * Generates (translates) and executes SQL query
      *
      * @param  array|mixed    one or more arguments
-     * @return int|DibiResult
+     * @return DibiResult|TRUE
      * @throws DibiException
      */
     final public function query($args)
@@ -153,7 +153,7 @@ abstract class DibiDriver
      * Executes the SQL query
      *
      * @param string        SQL statement.
-     * @return DibiResult|NULL  Result set object
+     * @return DibiResult|TRUE  Result set object
      * @throws DibiException
      */
     public function nativeQuery($sql)
@@ -170,7 +170,7 @@ abstract class DibiDriver
      * Internal: Executes the SQL query
      *
      * @param string       SQL statement.
-     * @return DibiResult|NULL  Result set object
+     * @return DibiResult|TRUE  Result set object
      * @throws DibiDatabaseException
      */
     abstract protected function doQuery($sql);
diff --git a/dibi/libs/logger.php b/dibi/libs/logger.php
index 71a87ecc..e452974e 100644
--- a/dibi/libs/logger.php
+++ b/dibi/libs/logger.php
@@ -76,6 +76,7 @@ final class DibiLogger
                 . ";\n-- " . date('Y-m-d H:i:s')
                 . "\n\n"
             );
+            return;
         }
     }