fix getSchemaName() for Sqlserver.

Closes #2609.
cakephp · Feb 23, 2012 · b545d8b · b545d8b
1 parent 55b8f66
commit b545d8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Cake/Console/Templates/skel/Config/database.php.default b/lib/Cake/Console/Templates/skel/Config/database.php.default
@@ -48,7 +48,8 @@
  * on a per-table basis with the Model::$tablePrefix property.
  *
  * schema =>
- * For Postgres specifies which schema you would like to use the tables in. Postgres defaults to 'public'.
+ * For Postgres/Sqlserver specifies which schema you would like to use the tables in. Postgres defaults to 'public'.  For Sqlserver, it defaults to empty and use
+ * the connected user's default schema (typically 'dbo').
  *
  * encoding =>
  * For MySQL, Postgres specifies the character encoding to use when connecting to the

diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -76,6 +76,7 @@ class Sqlserver extends DboSource {
 		'login' => '',
 		'password' => '',
 		'database' => 'cake'
+		'schema' => '',
 	);
 
 /**
@@ -792,7 +793,7 @@ public function dropSchema(CakeSchema $schema, $table = null) {
  * @return string The schema name
  */
 	public function getSchemaName() {
-		return $this->config['database'];
+		return $this->config['schema'];
 	}
 
 }