rolling back previous solution; throwing exception if database connection was not successful.

halmai · halmai · commit 0f56007d95a8 · 2015-12-08T11:32:35.000+11:00
diff --git a/system/core/Loader.php b/system/core/Loader.php
@@ -361,10 +361,6 @@ public function database($params = '', $return = FALSE, $query_builder = NULL)
 
 		// Load the DB class
 		$CI->db =& DB($params, $query_builder);
-		if (!$CI->db->conn_id) 
-		{
-			return FALSE;
-		}
 		return $this;
 	}
 
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -436,7 +436,7 @@ public function initialize()
 					$this->display_error('db_unable_to_connect');
 				}
 
-				return FALSE;
+				throw new RuntimeException('Database connection failure.');
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -361,10 +361,6 @@ public function database($params = '', $return = FALSE, $query_builder = NULL)`
`361`	`361`
`362`	`362`	`// Load the DB class`
`363`	`363`	`$CI->db =& DB($params, $query_builder);`
`364`		`- if (!$CI->db->conn_id)`
`365`		`- {`
`366`		`- return FALSE;`
`367`		`- }`
`368`	`364`	`return $this;`
`369`	`365`	`}`
`370`	`366`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ public function initialize()`
`436`	`436`	`$this->display_error('db_unable_to_connect');`
`437`	`437`	`}`
`438`	`438`
`439`		`- return FALSE;`
	`439`	`+ throw new RuntimeException('Database connection failure.');`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`