fix. Postgre and SQLite3

codeigniter4 · Mar 27, 2020 · d4ce8ff · d4ce8ff
1 parent 49bf7f9
commit d4ce8ff
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -332,12 +332,13 @@ public function execute(string $sql)
 		}
 		catch (\mysqli_sql_exception $e)
 		{
+			log_message('error', $e);
 			if ($this->DBDebug)
 			{
 				throw $e;
 			}
-			return false;
 		}
+		return false;
 	}
 
 	//--------------------------------------------------------------------

diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -187,11 +187,23 @@ public function getVersion(): string
 	 *
 	 * @param string $sql
 	 *
-	 * @return resource
+	 * @return mixed
 	 */
 	public function execute(string $sql)
 	{
-		return pg_query($this->connID, $sql);
+		try
+		{
+			return pg_query($this->connID, $sql);
+		}
+		catch (\ErrorException $e)
+		{
+			log_message('error', $e);
+			if ($this->DBDebug)
+			{
+				throw $e;
+			}
+		}
+		return false;
 	}
 
 	//--------------------------------------------------------------------

diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
@@ -165,9 +165,21 @@ public function getVersion(): string
 	 */
 	public function execute(string $sql)
 	{
-		return $this->isWriteType($sql)
-			? $this->connID->exec($sql)
-			: $this->connID->query($sql);
+		try
+		{
+			return $this->isWriteType($sql)
+				? $this->connID->exec($sql)
+				: $this->connID->query($sql);
+		}
+		catch (\ErrorException $e)
+		{
+			log_message('error', $e);
+			if ($this->DBDebug)
+			{
+				throw $e;
+			}
+		}
+		return false;
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
@@ -13,7 +13,7 @@ class DEBugTest extends CIDatabaseTestCase
 	public function testDBDebugTrue()
 	{
 		$this->setPrivateProperty($this->db, 'DBDebug', true);
-		$this->expectException('mysqli_sql_exception');
+		$this->expectException('Exception');
 		$result = $this->db->simpleQuery('SELECT * FROM db_error');
 	}
 
@@ -23,4 +23,10 @@ public function testDBDebugFalse()
 		$result = $this->db->simpleQuery('SELECT * FROM db_error');
 		$this->assertEquals(false, $result);
 	}
+
+	public function tearDown(): void
+	{
+		$this->setPrivateProperty($this->db, 'DBDebug', true);
+		parent::tearDown();
+	}
 }