Merge pull request #713 from samsonasik/baseconnection-connid

Fixes BaseConnection::connID false value which previously interpreted as null ( is_null )
codeigniter4 · Sep 9, 2017 · 6b6bede · 6b6bede
2 parents 61cf692 + fabc8c4
commit 6b6bede
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -346,7 +346,7 @@ protected function _escapeString(string $str): string
 			return $str;
 		}
 
-		if (is_null($this->connID))
+		if (! $this->connID)
 		{
 			$this->initialize();
 		}

diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -212,6 +212,11 @@ public function affectedRows(): int
 	 */
 	public function escape($str)
 	{
+		if (! $this->connID)
+		{
+			$this->initialize();
+		}
+
 		if (is_string($str) OR ( is_object($str) && method_exists($str, '__toString')))
 		{
 			return pg_escape_literal($this->connID, $str);
@@ -234,7 +239,7 @@ public function escape($str)
 	 */
 	protected function _escapeString(string $str): string
 	{
-		if (is_null($this->connID))
+		if (! $this->connID)
 		{
 			$this->initialize();
 		}