From ac074d16cbc3d5bcc5c20ed1739f7045dec29c2e Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Thu, 18 Sep 2014 13:45:27 +0200 Subject: [PATCH] Fixed issue: High memory usage on db upgrade from older versions --- .../helpers/expressions/em_manager_helper.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php index 51638eee179..4911ba008d3 100644 --- a/application/helpers/expressions/em_manager_helper.php +++ b/application/helpers/expressions/em_manager_helper.php @@ -8018,15 +8018,15 @@ private static function getConditionsForEM($surveyid=NULL, $qid=NULL) } $query = "SELECT DISTINCT c.*, q.sid, q.type - FROM conditions AS c - LEFT JOIN questions q ON c.cqid=q.qid - LEFT JOIN questions qa ON c.qid=qa.qid + FROM {{conditions}} AS c + LEFT JOIN {{questions}} q ON c.cqid=q.qid + LEFT JOIN {{questions}} qa ON c.qid=qa.qid WHERE {$where} 1=1 UNION SELECT DISTINCT c.*, q.sid, '' AS TYPE - FROM conditions AS c - LEFT JOIN questions q ON c.cqid=q.qid - LEFT JOIN questions qa ON c.qid=qa.qid + FROM {{conditions}} AS c + LEFT JOIN {{questions}} q ON c.cqid=q.qid + LEFT JOIN {{questions}} qa ON c.qid=qa.qid WHERE {$where} c.cqid = 0"; $databasetype = Yii::app()->db->getDriverName();