Clean up querybuilder (#4220)

lib/client.js

@@ -12,8 +12,8 @@ const {
   executeQuery,
   enrichQueryObject,
 } = require('./execution/internal/query-executioner');
-const QueryBuilder = require('./query/builder');
-const QueryCompiler = require('./query/compiler');
+const QueryBuilder = require('./query/querybuilder');
+const QueryCompiler = require('./query/querycompiler');
 const SchemaBuilder = require('./schema/builder');
 const SchemaCompiler = require('./schema/compiler');
 const TableBuilder = require('./schema/tablebuilder');

lib/dialects/mssql/query/mssql-querycompiler.js

@@ -1,6 +1,6 @@
 // MSSQL Query Compiler
 // ------
-const QueryCompiler = require('../../../query/compiler');
+const QueryCompiler = require('../../../query/querycompiler');
 
 const compact = require('lodash/compact');
 const identity = require('lodash/identity');

lib/dialects/mysql/query/mysql-querycompiler.js

@@ -1,7 +1,7 @@
 // MySQL Query Compiler
 // ------
 const identity = require('lodash/identity');
-const QueryCompiler = require('../../../query/compiler');
+const QueryCompiler = require('../../../query/querycompiler');
 const { wrapAsIdentifier } = require('../../../formatter/formatterUtils');
 
 class QueryCompiler_MySQL extends QueryCompiler {

lib/dialects/oracle/query/oracle-querycompiler.js

@@ -7,7 +7,7 @@ const identity = require('lodash/identity');
 const isEmpty = require('lodash/isEmpty');
 const isPlainObject = require('lodash/isPlainObject');
 const reduce = require('lodash/reduce');
-const QueryCompiler = require('../../../query/compiler');
+const QueryCompiler = require('../../../query/querycompiler');
 const { ReturningHelper } = require('../utils');
 const { isString } = require('../../../util/is');
 

lib/dialects/postgres/query/pg-querycompiler.js

@@ -3,7 +3,7 @@
 const identity = require('lodash/identity');
 const reduce = require('lodash/reduce');
 
-const QueryCompiler = require('../../../query/compiler');
+const QueryCompiler = require('../../../query/querycompiler');
 const { wrapString } = require('../../../formatter/wrappingFormatter');
 
 class QueryCompiler_PG extends QueryCompiler {

lib/dialects/redshift/query/redshift-querycompiler.js

@@ -1,6 +1,6 @@
 // Redshift Query Builder & Compiler
 // ------
-const QueryCompiler = require('../../../query/compiler');
+const QueryCompiler = require('../../../query/querycompiler');
 const QueryCompiler_PG = require('../../postgres/query/pg-querycompiler');
 
 const identity = require('lodash/identity');

lib/dialects/sqlite3/index.js

@@ -7,7 +7,7 @@ const { promisify, inherits } = require('util');
 const Client = require('../../client');
 
 const Transaction = require('./execution/sqlite-transaction');
-const SqliteQueryCompiler = require('./query/sqlite-query-compiler');
+const SqliteQueryCompiler = require('./query/sqlite-querycompiler');
 const SchemaCompiler = require('./schema/sqlite-compiler');
 const ColumnCompiler = require('./schema/sqlite-columncompiler');
 const TableCompiler = require('./schema/sqlite-tablecompiler');

lib/dialects/sqlite3/query/sqlite-querycompiler.js

@@ -6,7 +6,7 @@ const identity = require('lodash/identity');
 const isEmpty = require('lodash/isEmpty');
 const reduce = require('lodash/reduce');
 
-const QueryCompiler = require('../../../query/compiler');
+const QueryCompiler = require('../../../query/querycompiler');
 const noop = require('../../../util/noop');
 const { isString } = require('../../../util/is');
 const { wrapString } = require('../../../formatter/wrappingFormatter');

lib/formatter/wrappingFormatter.js

@@ -1,6 +1,6 @@
 const transform = require('lodash/transform');
 const Raw = require('../raw');
-const QueryBuilder = require('../query/builder');
+const QueryBuilder = require('../query/querybuilder');
 const { compileCallback, wrapAsIdentifier } = require('./formatterUtils');
 
 // Valid values for the `order by` clause generation.

lib/knex-builder/Knex.js

@@ -1,6 +1,6 @@
 const Client = require('../client');
-const QueryBuilder = require('../query/builder');
-const QueryInterface = require('../query/methods');
+const QueryBuilder = require('../query/querybuilder');
+const QueryInterface = require('../query/method-constants');
 
 const makeKnex = require('./make-knex');
 const { KnexTimeoutError } = require('../util/timeout');

lib/knex-builder/make-knex.js

@@ -3,7 +3,7 @@ const { EventEmitter } = require('events');
 const { Migrator } = require('../migrations/migrate/Migrator');
 const Seeder = require('../migrations/seed/Seeder');
 const FunctionHelper = require('./FunctionHelper');
-const QueryInterface = require('../query/methods');
+const QueryInterface = require('../query/method-constants');
 const merge = require('lodash/merge');
 const batchInsert = require('../execution/batch-insert');
 const { isObject } = require('../util/is');
@@ -257,22 +257,18 @@ function redefineProperties(knex, client) {
   //       constructed before any `knex` instances are created.
   //       As a result, the method extensions were missing from all
   //       `knex` instances.)
-  QueryInterface.forEach(function (method) {
+  for (let i = 0; i < QueryInterface.length; i++) {
+    const method = QueryInterface[i];
     knex[method] = function () {
       const builder = this.queryBuilder();
       return builder[method].apply(builder, arguments);
     };
-  });
+  }
 
   Object.defineProperties(knex, KNEX_PROPERTY_DEFINITIONS);
 
   initContext(knex);
   knex.client = client;
-
-  // TODO: It looks like this field is never actually used.
-  //       It should probably be removed in a future PR.
-  knex.client.makeKnex = makeKnex;
-
   knex.userParams = {};
 
   // Hook up the "knex" object as an EventEmitter.

lib/query/querycompiler.js

@@ -2,7 +2,7 @@
 // -------
 const helpers = require('../util/helpers');
 const Raw = require('../raw');
-const QueryBuilder = require('./builder');
+const QueryBuilder = require('./querybuilder');
 const JoinClause = require('./joinclause');
 const debug = require('debug');
 

package.json

@@ -96,7 +96,7 @@
     "eslint": "^7.17.0",
     "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-import": "^2.22.1",
-    "husky": "^4.3.6",
+    "husky": "^4.3.7",
     "jake": "^8.1.1",
     "JSONStream": "^1.3.5",
     "lint-staged": "^10.5.3",
@@ -114,7 +114,7 @@
     "sinon": "^9.2.3",
     "sinon-chai": "^3.5.0",
     "source-map-support": "^0.5.19",
-    "sqlite3": "^5.0.0",
+    "sqlite3": "^5.0.1",
     "tap-spec": "^5.0.0",
     "tape": "^5.1.1",
     "toxiproxy-node-client": "^2.0.6",

test/tape/query-builder.js

@@ -2,7 +2,7 @@
 
 const tape = require('tape');
 const omit = require('lodash/omit');
-const QueryBuilder = require('../../lib/query/builder');
+const QueryBuilder = require('../../lib/query/querybuilder');
 const Client = require('../../lib/client');
 
 tape('accumulates multiple update calls #647', function (t) {

test/unit/knex.js

@@ -1,6 +1,6 @@
 const { inherits } = require('util');
 const Knex = require('../../lib/index');
-const QueryBuilder = require('../../lib/query/builder');
+const QueryBuilder = require('../../lib/query/querybuilder');
 const { expect } = require('chai');
 const sqliteConfig = require('../knexfile').sqlite3;
 const sqlite3 = require('sqlite3');