Complete the proposed changes from PR bcit-ci#4300

narfbg · narfbg · commit 97ecf2fcce8e · 2015-12-12T17:26:28.000+02:00
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -381,6 +381,7 @@ public function __construct($params)
 	 * Initialize Database Settings
 	 *
 	 * @return	bool
+	 * @throws	RuntimeException	In case of failure
 	 */
 	public function initialize()
 	{
@@ -429,14 +430,7 @@ public function initialize()
 			// We still don't have a connection?
 			if ( ! $this->conn_id)
 			{
-				log_message('error', 'Unable to connect to the database');
-
-				if ($this->db_debug)
-				{
-					$this->display_error('db_unable_to_connect');
-				}
-
-				throw new RuntimeException('Database connection failure.');
+				throw new RuntimeException('Unable to connect to the database.');
 			}
 		}
 
@@ -751,14 +745,7 @@ public function query($sql, $binds = FALSE, $return_object = NULL)
 	 */
 	public function simple_query($sql)
 	{
-		if ( ! $this->conn_id)
-		{
-			if ( ! $this->initialize())
-			{
-				return FALSE;
-			}
-		}
-
+		empty($this->conn_id) && $this->initialize();
 		return $this->_execute($sql);
 	}
 
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -13,7 +13,7 @@ Release Date: Not Released
 
 -  Database
 
-   -  CI_DB_driver::initialize() throws a "Database connection failure." RuntimeException if couldn't connect to the database.
+   -  Failure to initialize a database connection will now throw a ``RuntimeException``.
 
 
 Version 3.0.4
diff --git a/user_guide_src/source/database/db_driver_reference.rst b/user_guide_src/source/database/db_driver_reference.rst
@@ -19,6 +19,7 @@ This article is intended to be a reference for them.
 
 		:returns:	TRUE on success, FALSE on failure
 		:rtype:	bool
+		:throws:	RuntimeException	In case of failure
 
 		Initialize database settings, establish a connection to
 		the database.

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,7 @@ public function __construct($params)`
`381`	`381`	`* Initialize Database Settings`
`382`	`382`	`*`
`383`	`383`	`* @return bool`
	`384`	`+ * @throws RuntimeException In case of failure`
`384`	`385`	`*/`
`385`	`386`	`public function initialize()`
`386`	`387`	`{`
`@@ -429,14 +430,7 @@ public function initialize()`
`429`	`430`	`// We still don't have a connection?`
`430`	`431`	`if ( ! $this->conn_id)`
`431`	`432`	`{`
`432`		`- log_message('error', 'Unable to connect to the database');`
`433`		`-`
`434`		`- if ($this->db_debug)`
`435`		`- {`
`436`		`- $this->display_error('db_unable_to_connect');`
`437`		`- }`
`438`		`-`
`439`		`- throw new RuntimeException('Database connection failure.');`
	`433`	`+ throw new RuntimeException('Unable to connect to the database.');`
`440`	`434`	`}`
`441`	`435`	`}`
`442`	`436`
`@@ -751,14 +745,7 @@ public function query($sql, $binds = FALSE, $return_object = NULL)`
`751`	`745`	`*/`
`752`	`746`	`public function simple_query($sql)`
`753`	`747`	`{`
`754`		`- if ( ! $this->conn_id)`
`755`		`- {`
`756`		`- if ( ! $this->initialize())`
`757`		`- {`
`758`		`- return FALSE;`
`759`		`- }`
`760`		`- }`
`761`		`-`
	`748`	`+ empty($this->conn_id) && $this->initialize();`
`762`	`749`	`return $this->_execute($sql);`
`763`	`750`	`}`
`764`	`751`