webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

change row to r everywhere; see : https://sourceforge.net/p/postfixadmin/discussion/676076/thread/616c1d25/?limit=25#7da0 - hopefully removing "row" which might be a reserved keyword for some databases etc

Browse Source
This commit is contained in:
David Goodwin
2019-12-08 16:23:49 +00:00
parent 6a4b7ec163
commit d6bbecaf45
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
functions.inc.php
View File

@@ -541,8 +541,8 @@ function create_page_browser($idxfield, $querypart, $sql_params = []) {
if (db_pgsql()) { if (db_pgsql()) {
$query = " $query = "
SELECT * FROM ( SELECT * FROM (
SELECT $idxfield AS label, nextval('rowcount') AS row $querypart SELECT $idxfield AS label, nextval('rowcount') AS r $querypart
) idx WHERE MOD(idx.row, $page_size) IN (0,$page_size_zerobase) OR idx.row = $count_results ) idx WHERE MOD(idx.r, $page_size) IN (0,$page_size_zerobase) OR idx.r = $count_results
"; ";
} }
@@ -554,9 +554,9 @@ function create_page_browser($idxfield, $querypart, $sql_params = []) {
} }
$query = " $query = "
WITH idx AS (SELECT * $querypart) WITH idx AS (SELECT * $querypart)
SELECT $end AS label, (SELECT (COUNT(*) - 1) FROM idx t1 WHERE t1.$end <= t2.$end ) AS row SELECT $end AS label, (SELECT (COUNT(*) - 1) FROM idx t1 WHERE t1.$end <= t2.$end ) AS r
FROM idx t2 FROM idx t2
WHERE (row % $page_size) IN (0,$page_size_zerobase) OR row = $count_results"; WHERE (r % $page_size) IN (0,$page_size_zerobase) OR r = $count_results";
} }
# PostgreSQL: # PostgreSQL: