diff --git a/db/update0.6.sql b/db/update0.6.sql
index 4db719fa93..72a03642b0 100644
--- a/db/update0.6.sql
+++ b/db/update0.6.sql
@@ -1,27 +1,17 @@
 -- 2010-03-20 adjust bug table.
 ALTER TABLE `zt_bug` ADD `pri` TINYINT UNSIGNED NOT NULL AFTER `severity` ;
-ALTER TABLE `zt_bug` ADD `keywords` VARCHAR( 255 ) NOT NULL ;
-ALTER TABLE `zt_case` ADD `keywords` VARCHAR( 255 ) NOT NULL ;
-ALTER TABLE `zt_case` ADD `executeType` VARCHAR( 30 ) NOT NULL AFTER `keywords` ,
-ADD `scriptedBy` VARCHAR( 30 ) NOT NULL AFTER `executeType` ,
+ALTER TABLE `zt_bug` ADD `keywords` VARCHAR( 255 ) NOT NULL AFTER `title` ;
+ALTER TABLE `zt_case` ADD `keywords` VARCHAR( 255 ) NOT NULL AFTER `title` ;
+ALTER TABLE `zt_case` ADD `stage` VARCHAR( 255 ) NOT NULL AFTER `type` ;
+ALTER TABLE `zt_case` ADD `howRun` VARCHAR( 30 ) NOT NULL AFTER `stage` ,
+ADD `scriptedBy` VARCHAR( 30 ) NOT NULL AFTER `howRun` ,
 ADD `scriptedDate` DATE NOT NULL AFTER `scriptedBy` ,
 ADD `scriptStatus` VARCHAR( 30 ) NOT NULL AFTER `scriptedDate` ,
-ADD `scriptLocation` VARCHAR( 255 ) NOT NULL AFTER `scriptStatus` ,
-ADD `linkCase` VARCHAR( 255 ) NOT NULL AFTER `scriptLocation` ;
-
-ALTER TABLE `zt_case` ADD `stage` VARCHAR( 255 ) NOT NULL ;
-
--- 2010-03-23 userQuery表。
-CREATE TABLE `zentao`.`zt_userQuery` (
-  `id` MEDIUMINT UNSIGNED NOT NULL AUTO_INCREMENT ,
-  `account` VARCHAR( 30 ) NOT NULL ,
-  `sql` TEXT NOT NULL ,
-  `session` TEXT NOT NULL ,
-  PRIMARY KEY ( `id` ) 
-) ENGINE = MYISAM;
+ADD `scriptLocation` VARCHAR( 255 ) NOT NULL AFTER `scriptStatus`, 
+ADD `linkCase` VARCHAR( 255 ) NOT NULL AFTER `version` ;
 
 -- 2010-03-27 fix bug 43
 update zt_projectStory,zt_story set zt_projectStory.product=zt_story.product where zt_projectStory.story=zt_story.id;
 
 -- 2010-03-27 add keywords to story.
-ALTER TABLE `zt_story` ADD `keywords` VARCHAR( 255 ) NOT NULL ;
+ALTER TABLE `zt_story` ADD `keywords` VARCHAR( 255 ) NOT NULL AFTER `title` ;
diff --git a/module/convert/converter/bugfree2.php b/module/convert/converter/bugfree2.php
index a6871ae747..775da5d6d2 100644
--- a/module/convert/converter/bugfree2.php
+++ b/module/convert/converter/bugfree2.php
@@ -262,7 +262,7 @@ class bugfree2ConvertModel extends bugfreeConvertModel
             casePriority AS pri,
             caseType AS type,
             caseStatus AS status,
-            caseMethod AS executeType,
+            caseMethod AS howRun,
             casePlan AS stage,
             openedBy, openedDate,
             lastEditedBy, lastEditedDate,
@@ -287,14 +287,14 @@ class bugfree2ConvertModel extends bugfreeConvertModel
             unset($case->step);
             unset($case->bugID);
 
-            $case->type        = strtolower($case->type);
-            $case->status      = strtolower($case->status);
-            $case->executeType = strtolower($case->executeType);
-            $case->stage       = strtolower($case->stage);
+            $case->type   = strtolower($case->type);
+            $case->status = strtolower($case->status);
+            $case->howRun = strtolower($case->howRun);
+            $case->stage  = strtolower($case->stage);
 
-            if($case->type == 'configuration') $case->type = 'config';
-            if($case->type == 'setup')         $case->type = 'install';
-            if($case->type == 'functional')    $case->type = 'feature';
+            if($case->type == 'configuration') $case->type   = 'config';
+            if($case->type == 'setup')         $case->type   = 'install';
+            if($case->type == 'functional')    $case->type   = 'feature';
             if($case->status == 'active')      $case->status = 'normal';
             
             /* ½«²úÆ·ºÍÄ£¿éÌæ»»³ÉìøµÀϵͳÖеÄid¡£*/