Implement a new DBLayer::has_rows() method

This can be used in most places where we currently call num_rows(), which is not (reasonably easily) implementable for (future) SQLite or PDO adapters. Refs #1117.
fluxbb · Jul 23, 2018 · 06a4ad6 · 06a4ad6
1 parent 4b91e90
commit 06a4ad6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/include/dblayer/mysqli.php b/include/dblayer/mysqli.php
@@ -129,6 +129,12 @@ function num_rows($query_id = 0)
 	}
 
 
+	function has_rows($query_id)
+	{
+		return mysqli_num_rows($query_id) > 0;
+	}
+
+
 	function affected_rows()
 	{
 		return ($this->link_id) ? @mysqli_affected_rows($this->link_id) : false;

diff --git a/include/dblayer/mysqli_innodb.php b/include/dblayer/mysqli_innodb.php
@@ -142,6 +142,12 @@ function num_rows($query_id = 0)
 	}
 
 
+	function has_rows($query_id)
+	{
+		return mysqli_num_rows($query_id) > 0;
+	}
+
+
 	function affected_rows()
 	{
 		return ($this->link_id) ? @mysqli_affected_rows($this->link_id) : false;

diff --git a/include/dblayer/pgsql.php b/include/dblayer/pgsql.php
@@ -159,6 +159,12 @@ function num_rows($query_id = 0)
 	}
 
 
+	function has_rows($query_id)
+	{
+		return pg_num_rows($query_id) > 0;
+	}
+
+
 	function affected_rows()
 	{
 		return ($this->query_result) ? @pg_affected_rows($this->query_result) : false;

diff --git a/include/dblayer/sqlite.php b/include/dblayer/sqlite.php
@@ -178,6 +178,12 @@ function num_rows($query_id = 0)
 	}
 
 
+	function has_rows($query_id)
+	{
+		return sqlite_num_rows($query_id) > 0;
+	}
+
+
 	function affected_rows()
 	{
 		return ($this->link_id) ? @sqlite_changes($this->link_id) : false;