Merge pull request #2755 from Instrye/patch-2

fix. MYSQLI::DBDebug can't woker
codeigniter4 · Apr 20, 2020 · b3aeba5 · b3aeba5
2 parents 34d6338 + d4ce8ff
commit b3aeba5
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 7 deletions.
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -326,8 +326,19 @@ public function execute(string $sql)
 				$res->free();
 			}
 		}
-
-		return $this->connID->query($this->prepQuery($sql));
+		try
+		{
+			return $this->connID->query($this->prepQuery($sql));
+		}
+		catch (\mysqli_sql_exception $e)
+		{
+			log_message('error', $e);
+			if ($this->DBDebug)
+			{
+				throw $e;
+			}
+		}
+		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
@@ -0,0 +1,32 @@
+<?php namespace CodeIgniter\Database\Live;
+
+use CodeIgniter\Test\CIDatabaseTestCase;
+
+/**
+ * @group DatabaseLive
+ */
+class DEBugTest extends CIDatabaseTestCase
+{
+
+	protected $refresh = true;
+
+	public function testDBDebugTrue()
+	{
+		$this->setPrivateProperty($this->db, 'DBDebug', true);
+		$this->expectException('Exception');
+		$result = $this->db->simpleQuery('SELECT * FROM db_error');
+	}
+
+	public function testDBDebugFalse()
+	{
+		$this->setPrivateProperty($this->db, 'DBDebug', false);
+		$result = $this->db->simpleQuery('SELECT * FROM db_error');
+		$this->assertEquals(false, $result);
+	}
+
+	public function tearDown(): void
+	{
+		$this->setPrivateProperty($this->db, 'DBDebug', true);
+		parent::tearDown();
+	}
+}