Skip to content

refactor: handle empty WHERE and improve query spacing #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: handle empty WHERE and improve query spacing #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ace521
fix: remove empty WHERE clause when no conditions exist
cB-Guru-Sharan-Kumar-Ram Sep 17, 2025
2639ef7
refactor: improve space handling for AND/OR in whereQuery
cB-Guru-Sharan-Kumar-Ram Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class PagiHelp {
returnString +=
this.tupleCreator(schemaObject, replacements, asItIs) + " AND ";
} else {
let subString = "( ";
let subString = "(";
for (let subObject of schemaObject) {
subString += this.genSchema(subObject, replacements, asItIs) + " OR ";
}
Expand Down Expand Up @@ -184,35 +184,32 @@ class PagiHelp {
"`" +
joinQuery;

let totalCountQuery =
let totalCountQuery =
"SELECT COUNT(*) AS countValue " +
" FROM `" +
tableName +
"`" +
joinQuery;

let replacements = [];
let whereQuery = " WHERE ";
let whereQuery = "";

if (additionalWhereConditions.length > 0) {
whereQuery += this.genSchema(additionalWhereConditions, replacements, true) + " AND ";
whereQuery += (whereQuery === "" ? " WHERE " : " AND ") + this.genSchema(additionalWhereConditions, replacements, true);
}
if (filterConditions.length > 0) {
whereQuery += this.genSchema(filterConditions, replacements, false) + " AND ";
whereQuery += (whereQuery === "" ? " WHERE " : " AND ") + this.genSchema(filterConditions, replacements, false);
}

if(searchColumnList && searchColumnList.length>0 && paginationObject.search !== "") {
whereQuery = whereQuery + "( ";
if(searchColumnList && searchColumnList.length > 0 && paginationObject.search !== "") {
whereQuery += (whereQuery === "" ? " WHERE " : " AND ") + "(";
for (let column of searchColumnList) {
whereQuery = whereQuery + column + " LIKE ? OR ";
replacements.push(`%${paginationObject.search}%`);
whereQuery += column + " LIKE ? OR ";
replacements.push(`%${paginationObject.search}%`);
}
whereQuery = rtrim(whereQuery, "OR ");
whereQuery = whereQuery + " )";
} else {
whereQuery = rtrim(whereQuery, "AND ");
whereQuery = whereQuery.replace(/\s*(AND|OR)\s*$/i, "");
whereQuery += ")";
}


query = query + whereQuery;
countQuery = countQuery + whereQuery;
Expand Down