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

Author: jim-parry

app/Config/Email.php

@@ -150,34 +150,6 @@ public static function curlrequest(array $options = [], $response = null, \Confi
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * The Email class allows you to send email via mail, sendmail, SMTP.
-	 *
-	 * @param null    $config
-	 * @param boolean $getShared
-	 *
-	 * @return \CodeIgniter\Email\Email|mixed
-	 */
-	public static function email($config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('email', $config);
-		}
-
-		if (empty($config))
-		{
-			$config = new \Config\Email();
-		}
-
-		$email = new \CodeIgniter\Email\Email($config);
-		$email->setLogger(static::logger(true));
-
-		return $email;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * The Exceptions class holds the methods that handle:
 	 *

system/Config/Services.php

@@ -1399,11 +1399,32 @@ public function getCompiledSelect($reset = true)
 			$this->resetSelect();
 		}
 
-		return $select;
+		return $this->compileFinalQuery($select);
 	}
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Returns a finalized, compiled query string with the bindings
+	 * inserted and prefixes swapped out.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed|string
+	 */
+	protected function compileFinalQuery(string $sql): string
+	{
+		$query = new Query($this->db);
+		$query->setQuery($sql, $this->binds);
+
+		if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix))
+		{
+			$query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
+		}
+
+		return $query->getQuery();
+	}
+
 	/**
 	 * Get
 	 *
@@ -1741,7 +1762,7 @@ public function getCompiledInsert($reset = true)
 			$this->resetWrite();
 		}
 
-		return $sql;
+		return $this->compileFinalQuery($sql);
 	}
 
 	//--------------------------------------------------------------------
@@ -1931,7 +1952,7 @@ public function getCompiledUpdate($reset = true)
 			$this->resetWrite();
 		}
 
-		return $sql;
+		return $this->compileFinalQuery($sql);
 	}
 
 	//--------------------------------------------------------------------
@@ -2312,7 +2333,7 @@ public function getCompiledDelete($reset = true)
 		$sql                   = $this->delete($table, '', null, $reset);
 		$this->returnDeleteSQL = false;
 
-		return $sql;
+		return $this->compileFinalQuery($sql);
 	}
 
 	//--------------------------------------------------------------------

system/Database/BaseBuilder.php

@@ -322,7 +322,7 @@ public function latestAll(string $group = null)
 		}
 
 		// Get all namespaces form  PSR4 paths.
-		$config     = new Autoload();
+		$config     = config('Autoload');
 		$namespaces = $config->psr4;
 
 		foreach ($namespaces as $namespace => $path)