summaryrefslogtreecommitdiff
path: root/framework/Data
diff options
context:
space:
mode:
authorGODZilla0480@gmail.com <>2011-10-16 17:25:14 +0000
committerGODZilla0480@gmail.com <>2011-10-16 17:25:14 +0000
commit9b0b7d32a4d7ab6d1bbd0f8ca14be9fbf325f081 (patch)
tree8edcc01821790f09bfe1cf0268883225a181f3e5 /framework/Data
parent70c50522f40aab715d6efb7a875b2b85bb31c101 (diff)
Fixed Issue#365 introduced in r3030
Diffstat (limited to 'framework/Data')
-rw-r--r--framework/Data/Common/TDbMetaData.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php
index bc29927f..b8872759 100644
--- a/framework/Data/Common/TDbMetaData.php
+++ b/framework/Data/Common/TDbMetaData.php
@@ -132,10 +132,14 @@ abstract class TDbMetaData extends TComponent
* @param string $rgt right delimiter
* @return string the properly quoted table name
*/
- public function quoteTableName($name, $lft='', $rgt='')
+ public function quoteTableName($name)
{
$name = str_replace(self::$delimiterIdentifier, '', $name);
+ $args = func_get_args();
+ $rgt = $lft = isset($args[1]) ? $args[1] : '';
+ $rgt = isset($args[2]) ? $args[2] : $rgt;
+
if(strpos($name, '.')===false)
return $lft . $name . $rgt;
$names=explode('.', $name);
@@ -151,8 +155,12 @@ abstract class TDbMetaData extends TComponent
* @param string $rgt right delimiter
* @return string the properly quoted column name
*/
- public function quoteColumnName($name, $lft='', $rgt='')
+ public function quoteColumnName($name)
{
+ $args = func_get_args();
+ $rgt = $lft = isset($args[1]) ? $args[1] : '';
+ $rgt = isset($args[2]) ? $args[2] : $rgt;
+
return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
}
@@ -163,8 +171,12 @@ abstract class TDbMetaData extends TComponent
* @param string $rgt right delimiter
* @return string the properly quoted column alias
*/
- public function quoteColumnAlias($name, $lft='', $rgt='')
+ public function quoteColumnAlias($name)
{
+ $args = func_get_args();
+ $rgt = $lft = isset($args[1]) ? $args[1] : '';
+ $rgt = isset($args[2]) ? $args[2] : $rgt;
+
return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
}
}