* fix the error when upgradeing.

This commit is contained in:
wangchunsheng
2010-12-02 06:14:49 +00:00
parent bcc682d15c
commit 9ccedb085c
2 changed files with 5 additions and 5 deletions
-3
View File
@@ -38,8 +38,5 @@ ALTER TABLE `zt_task` ADD `closedReason` VARCHAR( 30 ) NOT NULL AFTER `closedDat
update zt_groupPriv set method='finish' where module='task' and method='complete';
UPDATE zt_task SET assignedTo = openedBy,assignedDate = finishedDate WHERE STATUS = 'done';
UPDATE zt_task SET assignedTo = openedBy,assignedDate = canceledDate WHERE STATUS = 'cancel';
-- test task table.
ALTER TABLE `zt_testTask` ADD `owner` VARCHAR( 30 ) NOT NULL AFTER `build` ;
+5 -2
View File
@@ -388,9 +388,9 @@ class upgradeModel extends model
*/
private function upgradeFrom1_3To1_4()
{
$this->execSQL($this->getUpgradeFile('1.3'));
$this->updateNL1_3();
$this->updateTasks();
$this->execSQL($this->getUpgradeFile('1.3'));
if(!$this->isError()) $this->setting->updateVersion('1.4');
}
@@ -519,7 +519,7 @@ class upgradeModel extends model
{
$project->desc = nl2br($project->desc);
$project->goal = nl2br($project->goal);
$this->dao->update(TABLE_RPOJECT)->data($project)->where('id')->eq($project->id)->exec();
$this->dao->update(TABLE_PROJECT)->data($project)->where('id')->eq($project->id)->exec();
}
foreach($builds as $build)
@@ -606,6 +606,9 @@ class upgradeModel extends model
$this->dao->update(TABLE_TASK)->data($task, false)->where('id')->eq($task->id)->exec(false);
}
$this->dao->update(TABLE_TASK)->set('assignedTo=openedBy, assignedDate = finishedDate')->where('status')->eq('done')->exec(false);
$this->dao->update(TABLE_TASK)->set('assignedTo=openedBy, assignedDate = canceledDate')->where('status')->eq('cancel')->exec(false);
/* Update action name. */
}