summaryrefslogtreecommitdiff
path: root/framework/Data/Common/Pgsql
diff options
context:
space:
mode:
authorwei <>2007-04-14 05:02:29 +0000
committerwei <>2007-04-14 05:02:29 +0000
commit0f0d3c62e608287cdf77f1a3239371b521ecb40b (patch)
treebd91a9499a946e1667a0e17a9c5a97a9d695c7ce /framework/Data/Common/Pgsql
parentb05442bbe751b87998d8500ad8e6b28d652a35db (diff)
Refactor ActiveRecordGateway to use TDataGatewayCommand
Diffstat (limited to 'framework/Data/Common/Pgsql')
-rw-r--r--framework/Data/Common/Pgsql/TPgsqlMetaData.php3
-rw-r--r--framework/Data/Common/Pgsql/TPgsqlTableInfo.php5
2 files changed, 6 insertions, 2 deletions
diff --git a/framework/Data/Common/Pgsql/TPgsqlMetaData.php b/framework/Data/Common/Pgsql/TPgsqlMetaData.php
index e964cfe7..ac7e6b7a 100644
--- a/framework/Data/Common/Pgsql/TPgsqlMetaData.php
+++ b/framework/Data/Common/Pgsql/TPgsqlMetaData.php
@@ -50,7 +50,7 @@ class TPgsqlMetaData extends TDbMetaData
*/
protected function getSchemaTableName($table)
{
- if(count($parts= explode('.', $table)) > 1)
+ if(count($parts= explode('.', str_replace('"','',$table))) > 1)
return array($parts[0], $parts[1]);
else
return array($this->getDefaultSchema(),$parts[0]);
@@ -171,6 +171,7 @@ EOD;
$columnId = $col['attname']; //use column name as column Id
$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
+ $info['ColumnId'] = $columnId;
$info['ColumnIndex'] = $col['index'];
if(!$col['attnotnull'])
$info['AllowNull'] = true;
diff --git a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
index 88a56635..a2670fe0 100644
--- a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
+++ b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
@@ -39,7 +39,10 @@ class TPgsqlTableInfo extends TDbTableInfo
*/
public function getTableFullName()
{
- return $this->getSchemaName().'.'.$this->getTableName();
+ if(($schema=$this->getSchemaName())!==null)
+ return $schema.'.'.$this->getTableName();
+ else
+ $this->getTableName();
}
}