Skip to content

where or #9

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
maxhudson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

where or #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 19 additions & 6 deletions src/lib/db/executor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ module.exports = ({db, dbConfig, schemas, relationships, middleware, permissions

var {files} = options;

if (_.includes(['get', 'create'], actionKey)) {
params.where = _.defaults(params.where, {deleted: 0});
}

var pluralResourceKey = pluralize(resourceKey);
var quantityMode = resourceKey === pluralResourceKey && actionKey !== 'create' ? 'many' : 'one';
var originalParams = _.cloneDeep(params);
Expand Down Expand Up @@ -277,10 +273,27 @@ module.exports = ({db, dbConfig, schemas, relationships, middleware, permissions
}

await this.runMiddleware({queryData: this.queryData, onKey: 'queryWhere'});
await this.filterByAssociations();
await this.filterByAssociations(); //WARNING doesn't yet support OR

if (this.queryData.whereSqlStrings.length) {
this.queryData.string += ` WHERE ${this.queryData.whereSqlStrings.join(' AND ')}`;
this.queryData.string += ` WHERE `;

var allStrings = this.queryData.whereSqlStrings;
var normalWhereCount = _.size(this.params.where);

//normal where conditions
if (normalWhereCount > 0) {
var normalWhereMode = Array.isArray(this.params.where) ? ' OR ' : ' AND ';

this.queryData.string += ` (${_.join(_.slice(allStrings, 0, normalWhereCount), normalWhereMode)}) `;
}

//other where conditions
if (this.queryData.whereSqlStrings.length - normalWhereCount > 0) {
if (normalWhereCount > 0) this.queryData.string += ' AND ';

this.queryData.string += ` ${_.join(_.slice(allStrings, normalWhereCount), ` AND `)} `;
}
}
}
}
Expand Down