fullTableName needs to check for empty schemaName

cakephp · Dec 29, 2011 · 1d333fd · 1d333fd
1 parent b1aae5b
commit 1d333fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Cake/Model/Datasource/DataSource.php b/lib/Cake/Model/Datasource/DataSource.php
@@ -413,7 +413,7 @@ public function resolveKey(Model $model, $key) {
  * @access public
  */
 	public function getSchemaName() {
-		return false;
+		return null;
 	}
 
 /**

diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
@@ -930,14 +930,14 @@ public function fullTableName($model, $quote = true, $schema = true) {
 		}
 
 		if ($quote) {
-			if ($schema && isset($schemaName)) {
+			if ($schema && !empty($schemaName)) {
 				if (false == strstr($table, '.')) {
 					return $this->name($schemaName) . '.' . $this->name($table);
 				}
 			}
 			return $this->name($table);
 		}
-		if ($schema && isset($schemaName)) {
+		if ($schema && !empty($schemaName)) {
 			if (false == strstr($table, '.')) {
 				return $schemaName . '.' . $table;
 			}