Merge branch 'develop' of https://github.com/codeigniter4/CodeIgniter4 into db-underscore

Author: MGatner

system/Database/BaseConnection.php

@@ -514,6 +514,34 @@ public function getDatabase(): string
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Set DB Prefix
+	 *
+	 * Set's the DB Prefix to something new without needing to reconnect
+	 *
+	 * @param string $prefix The prefix
+	 *
+	 * @return string
+	 */
+	public function setPrefix(string $prefix = ''): string
+	{
+		return $this->DBPrefix = $prefix;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the database prefix.
+	 *
+	 * @return string
+	 */
+	public function getPrefix(): string
+	{
+		return $this->DBPrefix;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Returns the last error encountered by this connection.
 	 *
@@ -1329,22 +1357,6 @@ public function prefixTable(string $table = ''): string
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Set DB Prefix
-	 *
-	 * Set's the DB Prefix to something new without needing to reconnect
-	 *
-	 * @param string $prefix The prefix
-	 *
-	 * @return string
-	 */
-	public function setPrefix(string $prefix = ''): string
-	{
-		return $this->DBPrefix = $prefix;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the total number of rows affected by this query.
 	 *

user_guide_src/source/database/queries.rst

@@ -72,6 +72,10 @@ without needing to create a new connection you can use this method::
 	$db->setPrefix('newprefix');
 	$db->prefixTable('tablename'); // outputs newprefix_tablename
 
+You can get the current prefix any time with this method::
+	
+	$DBPrefix = $db->getPrefix();
+
 **********************
 Protecting identifiers
 **********************