From 0f0d3c62e608287cdf77f1a3239371b521ecb40b Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 14 Apr 2007 05:02:29 +0000
Subject: Refactor ActiveRecordGateway to use TDataGatewayCommand

---
 framework/Data/Common/Mysql/TMysqlMetaData.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'framework/Data/Common/Mysql/TMysqlMetaData.php')

diff --git a/framework/Data/Common/Mysql/TMysqlMetaData.php b/framework/Data/Common/Mysql/TMysqlMetaData.php
index 2a6d80bd..9e947298 100644
--- a/framework/Data/Common/Mysql/TMysqlMetaData.php
+++ b/framework/Data/Common/Mysql/TMysqlMetaData.php
@@ -1,5 +1,4 @@
-<?php
-
+<?php
 /**
  * Load the base TDbMetaData class.
  */
@@ -15,8 +14,10 @@ class TMysqlMetaData extends TDbMetaData
 	 */
 	protected function createTableInfo($table)
 	{
+		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		$find = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$this->getDbConnection()->setActive(true);
-		$sql = "SHOW FULL FIELDS FROM {$table}";
+		$sql = "SHOW FULL FIELDS FROM {$find}";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$tableInfo = $this->createNewTableInfo($table);
 		$index=0;
@@ -37,6 +38,7 @@ class TMysqlMetaData extends TDbMetaData
 		$columnId = $col['Field'];
 
 		$info['ColumnName'] = "`$columnId`"; //quote the column names!
+		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
 		if($col['Null']!=='NO')
 			$info['AllowNull'] = true;
@@ -122,7 +124,8 @@ class TMysqlMetaData extends TDbMetaData
 
 	/**
 	 * http://dev.mysql.com/doc/refman/5.0/en/identifiers.html
-	 * @param unknown_type $name
+	 * @param string identifier name
+	 * @param boolean true if valid identifier.
 	 */
 	protected function isValidIdentifier($name)
 	{
@@ -139,7 +142,8 @@ class TMysqlMetaData extends TDbMetaData
 		list($schemaName,$tableName) = $this->getSchemaTableName($table);
 		$info['SchemaName'] = $schemaName;
 		$info['TableName'] = $tableName;
-		$info['IsView'] = $this->getIsView($schemaName,$tableName);
+		if($this->getIsView($schemaName,$tableName))
+			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		return new TMysqlTableInfo($info,$primary,$foreign);
 	}
-- 
cgit v1.2.3