diff options
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | framework/Data/Common/Mysql/TMysqlMetaData.php | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -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'];
|