Merge pull request #3207 from michalsn/db_errors

Fix for getting database error

system/Database/BaseConnection.php

@@ -373,12 +373,12 @@ public function initialize()
 
 		$this->connectTime = microtime(true);
 
-		try 
+		try
 		{
 			// Connect to the database and set the connection ID
 			$this->connID = $this->connect($this->pConnect);
-		} 
-		catch (\Throwable $e) 
+		}
+		catch (\Throwable $e)
 		{
 			log_message('error', 'Error connecting to the database: ' . $e->getMessage());
 		}
@@ -401,14 +401,14 @@ public function initialize()
 						}
 					}
 
-					try 
+					try
 					{
 						// Try to connect
 						$this->connID = $this->connect($this->pConnect);
-					} 
-					catch (\Throwable $e) 
+					}
+					catch (\Throwable $e)
 					{
-						log_message('error', 'Error connecting to the database: '.$e->getMessage());
+						log_message('error', 'Error connecting to the database: ' . $e->getMessage());
 					}
 
 					// If a connection is made break the foreach loop
@@ -557,17 +557,6 @@ public function getPrefix(): string
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Returns the last error encountered by this connection.
-	 *
-	 * @return mixed
-	 */
-	public function getError()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * The name of the platform in use (MySQLi, mssql, etc)
 	 *

system/Database/ConnectionInterface.php

@@ -124,7 +124,7 @@ public function getDatabase(): string;
 	 *
 	 * @return mixed
 	 */
-	public function getError();
+	public function error(): array;
 
 	//--------------------------------------------------------------------
 

system/Model.php

@@ -1334,7 +1334,7 @@ public function errors(bool $forceDB = false)
 		}
 
 		// Still here? Grab the database-specific error, if any.
-		$error = $this->db->getError();
+		$error = $this->db->error();
 
 		return $error['message'] ?? null;
 	}