* [bug#58000,done,0.2h,0h] Fix fetchAll error.

2024-12-20 13:40:37 +08:00
parent ec8224161c
commit e3b22de9bc
6 changed files with 40 additions and 40 deletions
@@ -136,7 +136,7 @@ class bugModel extends model
            ->beginIF($status != 'all')->andWhere('status')->in($status)->fi()
            ->andWhere('deleted')->eq(0)
            ->orderBy($orderBy)->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);

        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');

@@ -230,7 +230,7 @@ class bugModel extends model
            ->andWhere('deleted')->eq(0)
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -257,7 +257,7 @@ class bugModel extends model
            ->andWhere('t1.deleted')->eq('0')
            ->orderBy('id desc')
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -295,7 +295,7 @@ class bugModel extends model

        /* 从上级到下级，如果有模块有负责人，返回模块负责人。*/
        krsort($moduleIdList);
-        $modules = $this->dao->select('*')->from(TABLE_MODULE)->where('id')->in($moduleIdList)->andWhere('deleted')->eq('0')->fetchAll('id');
+        $modules = $this->dao->select('id,owner')->from(TABLE_MODULE)->where('id')->in($moduleIdList)->andWhere('deleted')->eq('0')->fetchAll('id');
        foreach($modules as $module)
        {
            if($module->owner && isset($users[$module->owner])) return array($module->owner, $users[$module->owner]);
@@ -678,7 +678,7 @@ class bugModel extends model
            ->beginIF($bug->execution)->andWhere('execution')->eq($bug->execution)->fi()
            ->orderBy('id desc')
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -902,7 +902,7 @@ class bugModel extends model
            ->orderBy($orderBy)
            ->beginIF($limit > 0)->limit($limit)->fi()
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);

        $this->mao->select('name AS productName, shadow')->from(TABLE_PRODUCT)->into($bugs, 'product');
        return $bugs;
@@ -993,7 +993,7 @@ class bugModel extends model
                ->beginIF($excludeBugs)->andWhere('t1.id')->notIN($excludeBugs)->fi()
                ->orderBy($orderBy)
                ->page($pager)
-                ->fetchAll();
+                ->fetchAll('id', false);
        }

        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
@@ -1059,7 +1059,7 @@ class bugModel extends model
                ->beginIF($excludeBugs)->andWhere('t1.id')->notIN($excludeBugs)->fi()
                ->orderBy($orderBy)
                ->page($pager)
-                ->fetchAll('id');
+                ->fetchAll('id', false);
        }

        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
@@ -1092,7 +1092,7 @@ class bugModel extends model
        /* Get min begin date and max end date. */
        $minBegin   = '1970-01-01';
        $maxEnd     = '1970-01-01';
-        $executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll();
+        $executions = $this->dao->select('id,begin,end')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll();
        foreach($executions as $execution)
        {
            if(empty($minBegin) || $minBegin > $execution->begin) $minBegin = $execution->begin;
@@ -1122,7 +1122,7 @@ class bugModel extends model
            ->beginIF($linkedBugs)->andWhere('id')->notIN($linkedBugs)->fi()
            ->beginIF($branch !== '')->andWhere('branch')->in("0,$branch")->fi()
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -1220,7 +1220,7 @@ class bugModel extends model
            ->andWhere('deleted')->eq(0)
            ->orderBy('openedDate ASC')
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -1252,7 +1252,7 @@ class bugModel extends model
        /* If linkedBuildIdList is not empty, append the execution of the linked builds to executionIdList. */
        if($linkedBuildIdList)
        {
-            $linkedBuilds = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in(array_unique($linkedBuildIdList))->fetchAll('id');
+            $linkedBuilds = $this->dao->select('id,execution')->from(TABLE_BUILD)->where('id')->in(array_unique($linkedBuildIdList))->fetchAll('id');
            foreach($linkedBuilds as $build)
            {
                if(empty($build->execution)) continue;
@@ -1305,7 +1305,7 @@ class bugModel extends model
            ->beginIF($version)->andWhere('`caseVersion`')->eq($version)->fi()
            ->andWhere('deleted')->eq(0)
            ->orderBy($orderBy)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -1831,7 +1831,7 @@ class bugModel extends model
            ->beginIF($type == 'resolved')->andWhere('resolvedDate')->ge($begin)->andWhere('resolvedDate')->le("{$end} 23:59:59")->fi()
            ->beginIF($type == 'opened')->andWhere('openedDate')->ge($begin)->andWhere('openedDate')->le("{$end} 23:59:59")->fi()
            ->andWhere('deleted')->eq(0)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -2165,7 +2165,7 @@ class bugModel extends model

            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -90,7 +90,7 @@ class bugTao extends bugModel

            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);

        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');

@@ -126,7 +126,7 @@ class bugTao extends bugModel
            ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in('0,' . $this->app->user->view->projects)->fi()
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -59,7 +59,7 @@ class testsuiteModel extends model
            ->beginIF(strpos($param, 'review') !== false)->andWhere("FIND_IN_SET('{$this->app->user->account}', `reviewers`)")->fi()
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -97,7 +97,7 @@ class testsuiteModel extends model
            ->andWhere('deleted')->eq('0')
            ->andWhere('type')->eq('unit')
            ->orderBy($orderBy)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -195,7 +195,7 @@ class testsuiteModel extends model
            ->andWhere('t1.deleted')->eq('0')
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);

        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);

@@ -265,7 +265,7 @@ class testsuiteModel extends model
            ->andWhere('deleted')->eq('0')
            ->orderBy('id desc')
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -165,7 +165,7 @@ class testtaskModel extends model
            ->andWhere('t1.deleted')->eq('0')
            ->orderBy('productOrder_asc, ' . $orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);

        return $this->processExecutionName($tasks);
    }
@@ -195,7 +195,7 @@ class testtaskModel extends model
            ->andWhere('t1.auto')->ne('unit')
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -234,7 +234,7 @@ class testtaskModel extends model
    public function getByList(array $idList): array
    {
        if(!$idList) return array();
-        return $this->dao->select('*')->from(TABLE_TESTTASK)->where('id')->in($idList)->fetchAll('id');
+        return $this->dao->select('*')->from(TABLE_TESTTASK)->where('id')->in($idList)->fetchAll('id', false);
    }

    /**
@@ -327,7 +327,7 @@ class testtaskModel extends model
            ->beginIF($type == 'done')->andWhere('t1.status')->eq('done')->fi()
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -399,7 +399,7 @@ class testtaskModel extends model
            ->beginIF($task->branch !== '')->andWhere('branch')->in("0,{$task->branch}")->fi()
            ->orderBy('id desc')
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -432,7 +432,7 @@ class testtaskModel extends model
            ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
            ->orderBy('t1.id desc')
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -463,7 +463,7 @@ class testtaskModel extends model
            ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->project)->fi()
            ->orderBy('id desc')
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -495,7 +495,7 @@ class testtaskModel extends model
            ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
            ->orderBy('id desc')
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -525,7 +525,7 @@ class testtaskModel extends model
            ->beginIF($linkedCases)->andWhere('t1.id')->notin($linkedCases)->fi()
            ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
            ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -970,7 +970,7 @@ class testtaskModel extends model
            ->beginIF($modules)->andWhere('t2.module')->in($modules)->fi()
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -997,7 +997,7 @@ class testtaskModel extends model
            ->andWhere('t2.id')->in(array_keys($cases))
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -1019,7 +1019,7 @@ class testtaskModel extends model
            ->where('t1.task')->eq($taskID)
            ->andWhere('t2.deleted')->eq('0')
            ->orderBy($orderBy)
-            ->fetchAll();
+            ->fetchAll('id', false);
    }

    /**
@@ -1047,7 +1047,7 @@ class testtaskModel extends model
            ->beginIF($modules)->andWhere('t2.module')->in($modules)->fi()
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }

    /**
@@ -1065,7 +1065,7 @@ class testtaskModel extends model
            ->where('deleted')->eq('0')
            ->andWhere('product')->eq($productID)
            ->orderBy('grade_desc, sort_asc')
-            ->fetchAll('id');
+            ->fetchAll('id', false);

        $displayScenes = array();
        foreach($runs as $run)
@@ -1159,7 +1159,7 @@ class testtaskModel extends model
                ->beginIF($task->branch)->andWhere('t2.branch')->in("0,{$task->branch}")->fi()
                ->orderBy($orderBy)
                ->page($pager)
-                ->fetchAll('id');
+                ->fetchAll('id', false);
        }

        return array();
@@ -1472,7 +1472,7 @@ class testtaskModel extends model
            ->beginIF($type != 'all')->andWhere('caseResult')->eq($type)->fi()
            ->beginIF($deployID)->andWhere('deploy')->eq($deployID)->fi()
            ->orderBy('id desc')
-            ->fetchAll('id');
+            ->fetchAll('id', false);
        if(!$results) return array();

        list($resultFiles, $stepFiles) = $this->getResultsFiles(array_keys($results));
@@ -1589,7 +1589,7 @@ class testtaskModel extends model
            ->andWhere('objectID')->in($resultIdList)
            ->andWhere('extra')->ne('editor')
            ->orderBy('id')
-            ->fetchAll();
+            ->fetchAll('id', false);

        $this->loadModel('file');
        foreach($files as $file)
@@ -61,6 +61,6 @@ class testtaskTao extends testtaskModel
            ->fi()
            ->orderBy($orderBy)
            ->page($pager)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
    }
 }
@@ -550,7 +550,7 @@ class testtaskZen extends testtask
            ->where('id')->in($caseIdList)
            ->beginIF($confirm == 'yes')->andWhere('auto')->ne('auto')->fi()
            ->orderBy($orderBy)
-            ->fetchAll('id');
+            ->fetchAll('id', false);
        if($from != 'testtask') return $cases;

        /* 如果批量执行的用例来自测试单，检查这些用例的版本，如果不是最新版就移除它们。*/