From 758c9ced5f5cd5d3c8a724bded78f90b8322e23f Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sun, 22 Apr 2007 00:37:44 +0000
Subject: Minor change to Mysql metadata

---
 build.xml                                      | 2 +-
 framework/Data/Common/Mysql/TMysqlMetaData.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6f2a8635..385bf272 100644
--- a/build.xml
+++ b/build.xml
@@ -214,7 +214,7 @@
   <target name="compact-active-record" description="Package Active Record" depends="compact-table-gateway">
     <compact-package output="${build.compact.dir}/active-record.php" strip="${compact-strip-comments}">
       <filelist dir="framework/Data/ActiveRecord"
-        files="TActiveRecord.php,TActiveRecordManager.php,Exceptions/TActiveRecordException.php,TActiveRecordCriteria.php,TActiveRecordGateway.php,TActiveRecordStateRegistry.php" />
+        files="TActiveRecord.php,TActiveRecordManager.php,Exceptions/TActiveRecordException.php,TActiveRecordCriteria.php,TActiveRecordGateway.php,TActiveRecordStateRegistry.php,TActiveRecordRelation.php" />
     </compact-package>
     <append file="framework/Data/ActiveRecord/Exceptions/messages.txt"
       destfile="${build.compact.dir}/messages.txt" />
diff --git a/framework/Data/Common/Mysql/TMysqlMetaData.php b/framework/Data/Common/Mysql/TMysqlMetaData.php
index ebe851b6..e4d043ed 100644
--- a/framework/Data/Common/Mysql/TMysqlMetaData.php
+++ b/framework/Data/Common/Mysql/TMysqlMetaData.php
@@ -270,6 +270,7 @@ EOD;
 			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
 		else
 			$sql = "SHOW CREATE TABLE `{$tableName}`";
+		$this->getDbConnection()->cancel(); //remove any existing prepared statement
 		$command = $this->getDbConnection()->createCommand($sql);
 		$result = $command->queryRow();
 		return $result['Create Table'];
-- 
cgit v1.2.3