adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fullTableName needs to check for empty schemaName

Browse source
This commit is contained in:
Rachman Chavik 2011-12-29 19:18:37 +07:00
parent b1aae5b5ab
commit 1d333fd8b7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/DataSource.php
View file

@ -413,7 +413,7 @@ class DataSource extends Object {
* @access public * @access public
*/ */
public function getSchemaName() { public function getSchemaName() {
return false; return null;
} }
/** /**

4
lib/Cake/Model/Datasource/DboSource.php
View file

@ -930,14 +930,14 @@ class DboSource extends DataSource {
} }
if ($quote) { if ($quote) {
if ($schema && isset($schemaName)) { if ($schema && !empty($schemaName)) {
if (false == strstr($table, '.')) { if (false == strstr($table, '.')) {
return $this->name($schemaName) . '.' . $this->name($table); return $this->name($schemaName) . '.' . $this->name($table);
} }
} }
return $this->name($table); return $this->name($table);
} }
if ($schema && isset($schemaName)) { if ($schema && !empty($schemaName)) {
if (false == strstr($table, '.')) { if (false == strstr($table, '.')) {
return $schemaName . '.' . $table; return $schemaName . '.' . $table;
} }