From 8d0b87e3e7dcf325fd55fe5f8c6fb3b8b45ffaa1 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 11 Apr 2015 10:30:39 +0200 Subject: [PATCH] Fixed problem with counting number of rows for some SQL queries displayed in db pager. --- gl/includes/db/gl_db_trans.inc | 2 +- includes/db_pager.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index 5b8c9c47..dcb04ece 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -605,7 +605,7 @@ function void_journal_trans($type, $type_no, $use_transaction=true) function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false) { - $sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq, + $sql = "SELECT IFNULL(a.gl_seq,0) as gl_seq, gl.tran_date, gl.type, gl.type_no, diff --git a/includes/db_pager.inc b/includes/db_pager.inc index 598d6964..1940236d 100644 --- a/includes/db_pager.inc +++ b/includes/db_pager.inc @@ -290,7 +290,7 @@ class db_pager { if ($count) { $group = $group == '' ? "*" : "DISTINCT $group"; - return "SELECT COUNT($group) FROM $from $where"; + return "SELECT COUNT(0) FROM (SELECT $group FROM $from $where) row_count"; } $sql = "$select FROM $from $where"; -- 2.30.2