Skip to content

Commit c9695b5

Browse files
committed
fix: omit order by clause from count queryt
1 parent 04bda30 commit c9695b5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/common/srm-helper.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ function getPracticeProblemsQuery(criteria) {
192192
INNER JOIN informixoltp:round_component rc ON rc.component_id = c.component_id
193193
INNER JOIN informixoltp:round r ON r.round_id = rc.round_id AND r.status = 'A' AND r.round_type_id = 3
194194
INNER JOIN informixoltp:room ro ON ro.round_id = rc.round_id AND ro.room_type_id = 3
195-
LEFT JOIN informixoltp:component_state pcs ON pcs.round_id = rc.round_id AND pcs.component_id = c.component_id AND pcs.coder_id = ${
196-
criteria.userId
197-
}
198-
WHERE ${_.join(filters, " AND ")}
199-
ORDER BY ${sortBy} ${criteria.sortOrder}`;
195+
LEFT JOIN informixoltp:component_state pcs ON pcs.round_id = rc.round_id AND pcs.component_id = c.component_id AND pcs.coder_id = ${criteria.userId}`;
196+
197+
const queryWhere = filters.length ? `WHERE ${_.join(filters, " AND ")}` : "";
198+
199+
const queryOrder = `ORDER BY ${sortBy} ${criteria.sortOrder}`;
200200

201-
const query = `${querySelect} ${queryFrom}`;
201+
const query = `${querySelect} ${queryFrom} ${queryWhere} ${queryOrder}`;
202202
const countQuery = `${queryCount} ${queryFrom}`;
203203
return { query, countQuery };
204204
}

0 commit comments

Comments
 (0)