Fix double query running in dbquery

danielholmes · Mar 19, 2018 · 816b876 · 816b876
1 parent 7504313
commit 816b876
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "dholmes/bga-workbench",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "library",
   "description": "BoardGameArena Workbench",
   "minimum-stability": "stable",

diff --git a/src/BGAWorkbench/Stubs/APP_DbObject.inc.php b/src/BGAWorkbench/Stubs/APP_DbObject.inc.php
@@ -10,17 +10,21 @@ class APP_DbObject extends APP_Object
 
     /**
      * @param string $sql
-     * @return a mysqli_result
+     * @return mysqli_result
      */
     public static function DbQuery($sql)
     {
+        // Haven't yet found equivalent result type of mysqli->query via doctrine
         $conn = self::getDbConnection();
-        self::$affectedRows = $conn->executeQuery($sql)->rowCount();
+        //self::$affectedRows = $conn->executeQuery($sql)->rowCount();
         $host = $conn->getHost();
         if (!is_null($conn->getPort())) {
             $host .= ':' . $conn->getPort();
         }
-        return (new mysqli($host, $conn->getUsername(), $conn->getPassword(), $conn->getDatabase()))->query($sql);
+        $miConn = new mysqli($host, $conn->getUsername(), $conn->getPassword(), $conn->getDatabase());
+        $result = $miConn->query($sql);
+        self::$affectedRows = $miConn->affected_rows;
+        return $result;
     }
 
     /**