🔨 improve database feature

Signed-off-by: otengkwame <[email protected]>

Author: otengkwame

framework/database/DB.php

@@ -1,12 +1,13 @@
 <?php
+
 /**
  * CodeIgniter
  *
  * An open source application development framework for PHP
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,12 +31,13 @@
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
  * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
  * @filesource
  */
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * Initialize the database
@@ -45,75 +47,59 @@
  * @link	https://codeigniter.com/userguide3/database/
  *
  * @param 	string|string[]	$params
- * @param 	bool		$query_builder_override
- *				Determines if query builder should be used or not
  */
-function &DB($params = '', $query_builder_override = NULL)
+function &DB($params = '')
 {
 	// Load the DB config file if a DSN string wasn't passed
-	if (is_string($params) && strpos($params, '://') === FALSE)
-	{
+	if (is_string($params) && strpos($params, '://') === false) {
 		// Is the config file in the environment folder?
-		if ( ! file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/database.php')
-			&& ! file_exists($file_path = APPPATH.'config/database.php'))
-		{
+		if (
+			!file_exists($file_path = APPPATH . 'config/' . ENVIRONMENT . '/database.php')
+			&& !file_exists($file_path = APPPATH . 'config/database.php')
+		) {
 			show_error('The configuration file database.php does not exist.');
 		}
 
 		include($file_path);
 
 		// Make packages contain database config files,
 		// given that the controller instance already exists
-		if (class_exists('CI_Controller', FALSE))
-		{
-			foreach (get_instance()->load->get_package_paths() as $path)
-			{
-				if ($path !== APPPATH)
-				{
-					if (file_exists($file_path = $path.'config/'.ENVIRONMENT.'/database.php'))
-					{
+		if (class_exists('CI_Controller', false)) {
+			foreach (get_instance()->load->get_package_paths() as $path) {
+				if ($path !== APPPATH) {
+					if (file_exists($file_path = $path . 'config/' . ENVIRONMENT . '/database.php')) {
 						include($file_path);
-					}
-					elseif (file_exists($file_path = $path.'config/database.php'))
-					{
+					} elseif (file_exists($file_path = $path . 'config/database.php')) {
 						include($file_path);
 					}
 				}
 			}
 		}
 
-		if ( ! isset($db) OR count($db) === 0)
-		{
+		if (empty($db)) {
 			show_error('No database connection settings were found in the database config file.');
 		}
 
-		if ($params !== '')
-		{
+		if ($params !== '') {
 			$active_group = $params;
 		}
 
-		if ( ! isset($active_group))
-		{
+		if (!isset($active_group)) {
 			show_error('You have not specified a database connection group via $active_group in your config/database.php file.');
-		}
-		elseif ( ! isset($db[$active_group]))
-		{
-			show_error('You have specified an invalid database connection group ('.$active_group.') in your config/database.php file.');
+		} elseif (!isset($db[$active_group])) {
+			show_error('You have specified an invalid database connection group (' . $active_group . ') in your config/database.php file.');
 		}
 
 		$params = $db[$active_group];
-	}
-	elseif (is_string($params))
-	{
+	} elseif (is_string($params)) {
 		/**
 		 * Parse the URL from the DSN string
 		 * Database settings can be passed as discreet
 		 * parameters or as a data source name in the first
 		 * parameter. DSNs must have this prototype:
 		 * $dsn = 'driver://username:password@hostname/database';
 		 */
-		if (($dsn = @parse_url($params)) === FALSE)
-		{
+		if (($dsn = @parse_url($params)) === false) {
 			show_error('Invalid DB Connection String');
 		}
 
@@ -127,15 +113,12 @@ function &DB($params = '', $query_builder_override = NULL)
 		];
 
 		// Were additional config items set?
-		if (isset($dsn['query']))
-		{
+		if (isset($dsn['query'])) {
 			parse_str($dsn['query'], $extra);
 
-			foreach ($extra as $key => $val)
-			{
-				if (is_string($val) && in_array(strtoupper($val), ['TRUE', 'FALSE', 'NULL']))
-				{
-					$val = var_export($val, TRUE);
+			foreach ($extra as $key => $val) {
+				if (is_string($val) && in_array(strtoupper($val), ['TRUE', 'FALSE', 'NULL'])) {
+					$val = var_export($val, true);
 				}
 
 				$params[$key] = $val;
@@ -144,71 +127,46 @@ function &DB($params = '', $query_builder_override = NULL)
 	}
 
 	// No DB specified yet? Beat them senseless...
-	if (empty($params['dbdriver']))
-	{
+	if (empty($params['dbdriver'])) {
 		show_error('You have not selected a database type to connect to.');
 	}
 
-	// Load the DB classes. Note: Since the query builder class is optional
-	// we need to dynamically create a class that extends proper parent class
-	// based on whether we're using the query builder class or not.
-	if ($query_builder_override !== NULL)
-	{
-		$query_builder = $query_builder_override;
-	}
-	// Backwards compatibility work-around for keeping the
-	// $active_record config variable working. Should be
-	// removed in v3.1
-	elseif ( ! isset($query_builder) && isset($active_record))
-	{
-		$query_builder = $active_record;
-	}
-
-	require_once(BASEPATH.'database/DB_driver.php');
-
-	if ( ! isset($query_builder) OR $query_builder === TRUE)
-	{
-		require_once(BASEPATH.'database/DB_query_builder.php');
-		if ( ! class_exists('CI_DB', FALSE))
-		{
-			/**
-			 * CI_DB
-			 *
-			 * Acts as an alias for both CI_DB_driver and CI_DB_query_builder.
-			 *
-			 * @see	CI_DB_query_builder
-			 * @see	CI_DB_driver
-			 */
-			class CI_DB extends CI_DB_query_builder { }
-		}
-	}
-	elseif ( ! class_exists('CI_DB', FALSE))
-	{
+	require_once(BASEPATH . 'database/DB_driver.php');
+	require_once(BASEPATH . 'database/DB_query_builder.php');
+	if (!class_exists('CI_DB', false)) {
 		/**
-		 * @ignore
+		 * CI_DB
+		 *
+		 * Acts as an alias for both CI_DB_driver and CI_DB_query_builder.
+		 *
+		 * @see	CI_DB_query_builder
+		 * @see	CI_DB_driver
 		 */
-		class CI_DB extends CI_DB_driver { }
+		class CI_DB extends CI_DB_query_builder
+		{
+		}
 	}
 
 	// Load the DB driver
-	$driver_file = BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver.php';
-
-	file_exists($driver_file) OR show_error('Invalid DB driver');
+	$driver_file = BASEPATH . 'database/drivers/' . $params['dbdriver'] . '/' . $params['dbdriver'] . '_driver.php';
+	file_exists($driver_file) or show_error('Invalid DB driver');
 	require_once($driver_file);
 
+	// Load the result classes as well
+	require_once(BASEPATH . 'database/DB_result.php');
+	require_once(BASEPATH . 'database/drivers/' . $params['dbdriver'] . '/' . $params['dbdriver'] . '_result.php');
+
 	// Instantiate the DB adapter
-	$driver = 'CI_DB_'.$params['dbdriver'].'_driver';
+	$driver = 'CI_DB_' . $params['dbdriver'] . '_driver';
 	$DB = new $driver($params);
 
 	// Check for a subdriver
-	if ( ! empty($DB->subdriver))
-	{
-		$driver_file = BASEPATH.'database/drivers/'.$DB->dbdriver.'/subdrivers/'.$DB->dbdriver.'_'.$DB->subdriver.'_driver.php';
+	if (!empty($DB->subdriver)) {
+		$driver_file = BASEPATH . 'database/drivers/' . $DB->dbdriver . '/subdrivers/' . $DB->dbdriver . '_' . $DB->subdriver . '_driver.php';
 
-		if (file_exists($driver_file))
-		{
+		if (file_exists($driver_file)) {
 			require_once($driver_file);
-			$driver = 'CI_DB_'.$DB->dbdriver.'_'.$DB->subdriver.'_driver';
+			$driver = 'CI_DB_' . $DB->dbdriver . '_' . $DB->subdriver . '_driver';
 			$DB = new $driver($params);
 		}
 	}