Alter CI_DB_pdo_result::num_rows()

narfbg · narfbg · commit 31380e88dd6a · 2012-07-09T15:53:19.000+03:00
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php
@@ -26,26 +26,27 @@
  */
 class CI_DB_pdo_result extends CI_DB_result {
 
+	public $num_rows;
+
 	/**
 	 * Number of rows in the result set
 	 *
-	 * @access	public
-	 * @return	integer
+	 * @return	int
 	 */
-	function num_rows()
+	public function num_rows()
 	{
-		if (is_numeric(stripos($this->result_id->queryString, 'SELECT')))
+		if (is_int($this->num_rows))
 		{
-			$dbh = $this->conn_id;
-			$query = $dbh->query($this->result_id->queryString);
-			$result = $query->fetchAll();
-			unset($dbh, $query);
-			return count($result);
+			return $this->num_rows;
 		}
-		else
+		elseif (($this->num_rows = $this->result_id->rowCount()) > 0)
 		{
-			return $this->result_id->rowCount();	
+			return $this->num_rows;
 		}
+
+		$this->num_rows = count($this->result_id->fetchAll());
+		$this->result_id->execute();
+		return $this->num_rows;
 	}
 
 	// --------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -26,26 +26,27 @@`
`26`	`26`	`*/`
`27`	`27`	`class CI_DB_pdo_result extends CI_DB_result {`
`28`	`28`
	`29`	`+ public $num_rows;`
	`30`	`+`
`29`	`31`	`/**`
`30`	`32`	`* Number of rows in the result set`
`31`	`33`	`*`
`32`		`- * @access public`
`33`		`- * @return integer`
	`34`	`+ * @return int`
`34`	`35`	`*/`
`35`		`- function num_rows()`
	`36`	`+ public function num_rows()`
`36`	`37`	`{`
`37`		`- if (is_numeric(stripos($this->result_id->queryString, 'SELECT')))`
	`38`	`+ if (is_int($this->num_rows))`
`38`	`39`	`{`
`39`		`- $dbh = $this->conn_id;`
`40`		`- $query = $dbh->query($this->result_id->queryString);`
`41`		`- $result = $query->fetchAll();`
`42`		`- unset($dbh, $query);`
`43`		`- return count($result);`
	`40`	`+ return $this->num_rows;`
`44`	`41`	`}`
`45`		`- else`
	`42`	`+ elseif (($this->num_rows = $this->result_id->rowCount()) > 0)`
`46`	`43`	`{`
`47`		`- return $this->result_id->rowCount();`
	`44`	`+ return $this->num_rows;`
`48`	`45`	`}`
	`46`	`+`
	`47`	`+ $this->num_rows = count($this->result_id->fetchAll());`
	`48`	`+ $this->result_id->execute();`
	`49`	`+ return $this->num_rows;`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`// --------------------------------------------------------------------`