Skip to content

Commit

Permalink
Merge pull request #36 from sailshq/revert-knexQuery-change
Browse files Browse the repository at this point in the history
fix bug introduced in previous commits since last release + update travis.yml
  • Loading branch information
eashaw authored Aug 3, 2021
2 parents a1eb1fe + be84d62 commit 843c234
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
language: node_js

node_js:
- "4"
- "6"
- "7"
- "12"
- "14"
- "node"

branches:
Expand Down
6 changes: 5 additions & 1 deletion lib/sequelizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,11 @@ module.exports = function sequelizer(options) {
};

// Run the token parser
var knexQuery = tokenParser(knex.queryBuilder(), tree);
var knexQuery = (function parseTree() {
var query = knex.queryBuilder();
tokenParser(query, tree);
return query;
})();

// Build up the actual SQL string
var _SQL = knexQuery.toSQL();
Expand Down

0 comments on commit 843c234

Please sign in to comment.