Update home.ctp, rename SQLDialect and remove database.default.php

App/View/Pages/home.ctp

@@ -18,7 +18,7 @@
 use Cake\Core\Configure;
 use Cake\Utility\Debugger;
 use Cake\Cache\Cache;
-use Cake\Model\ConnectionManager;
+use Cake\Model\Datasource\Database\Connection;
 use Cake\Utility\Validation;
 use Cake\Error;
 
@@ -97,31 +97,33 @@ endif;
 <p>
 	<?php
 		$filePresent = null;
-		if (file_exists(APP . 'Config/database.php')):
+		if (file_exists(APP . 'Config/datasources.php')):
 			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your database configuration file is present.');
+				echo __d('cake_dev', 'Your datasources configuration file is present.');
 				$filePresent = true;
 			echo '</span>';
 		else:
 			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your database configuration file is NOT present.');
+				echo __d('cake_dev', 'Your datasources configuration file is NOT present.');
 				echo '<br/>';
-				echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
+				echo __d('cake_dev', 'Rename APP/Config/datasources.default.php to APP/Config/datasources.php');
 			echo '</span>';
 		endif;
 	?>
 </p>
 <?php
 if (isset($filePresent)):
 	try {
-		$connected = ConnectionManager::getDataSource('default');
+		require APP . 'Config/datasources.php';
+		$connection = new Connection(Configure::read('Datasource.default'));
+		$connected = $connection->connect();
 	} catch (Exception $connectionError) {
 		$connected = false;
 	}
 ?>
 <p>
 	<?php
-		if ($connected && $connected->isConnected()):
+		if ($connected):
 			echo '<span class="notice success">';
 	 			echo __d('cake_dev', 'Cake is able to connect to the database.');
 			echo '</span>';

lib/Cake/Error/MissingDatasourceConfigException.php

@@ -25,6 +25,6 @@
  */
 class MissingDatasourceConfigException extends Exception {
 
-	protected $_messageTemplate = 'The datasource configuration "%s" was not found in database.php';
+	protected $_messageTemplate = 'The datasource configuration "%s" was not found in datasources.php';
 
 }

lib/Cake/Model/Datasource/Database/Driver.php

@@ -30,7 +30,7 @@ public abstract function disconnect();
 
 /**
  * Returns correct connection resource or object that is internally used
- * If first argument is passed, 
+ * If first argument is passed,
  *
  * @return void
  **/

lib/Cake/Model/Datasource/Database/SQLDialect.php → lib/Cake/Model/Datasource/Database/SqlDialect.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 
+ *
  * PHP Version 5.4
  *
  * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
@@ -17,7 +17,7 @@
  */
 namespace Cake\Model\Datasource\Database;
 
-trait SQLDialect {
+trait SqlDialect {
 
 /**
  *  String used to start a database identifier quoting to make it safe