Merge pull request #4062 from markstory/issue-4031

Ensure that the driver schema dialects use is connected.
cakephp · Jul 22, 2014 · 2959a17 · 2959a17
2 parents f9f4bc2 + da8d54c
commit 2959a17
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Database/Schema/BaseSchema.php b/src/Database/Schema/BaseSchema.php
@@ -35,9 +35,13 @@ abstract class BaseSchema {
 /**
  * Constructor
  *
+ * This constructor will connect the driver so that methods like columnSql() and others
+ * will fail when the driver has not been connected.
+ *
  * @param \Cake\Database\Driver $driver The driver to use.
  */
 	public function __construct(Driver $driver) {
+		$driver->connect();
 		$this->_driver = $driver;
 	}
 

diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -845,6 +845,18 @@ public function testTruncateSql() {
 		$this->assertEquals('TRUNCATE TABLE `articles`', $result[0]);
 	}
 
+/**
+ * Test that constructing a schema dialect connects the driver.
+ *
+ * @return void
+ */
+	public function testConstructConnectsDriver() {
+		$driver = $this->getMock('Cake\Database\Driver');
+		$driver->expects($this->once())
+			->method('connect');
+		$schema = new MysqlSchema($driver);
+	}
+
 /**
  * Get a schema instance with a mocked driver/pdo instances
  *