knex 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Master (Unreleased)
 
+# 1.0.2 - 02 February, 2022
+
+### New features:
+
+- Support of MATERIALIZED and NOT MATERIALIZED with WITH/CTE #4940
+- Add raw support in onConflict clause #4960
+- Alter nullable constraint when alterNullable is set to true #4730
+- Add alterType parameter for alter function #4967
+- Support string json in json values #4988
+- MySQL: add with clause #4508
+
+### Bug fixes:
+
+- Fix error message for missing migration files #4937
+- Move deferrable to after on update/on delete #4976
+- Do not use sys.tables to find if a table exists #2328
+- PostgreSQL: Fix Order nulls #4989
+- MySQL: Fix collation when renaming column #2666
+- SQLite: Same boolean handling in better-sqlite3 as in sqlite3 #4982
+
+### Typings:
+
+- WhereILike - fix typo #4941
+
 # 1.0.1 - 16 January, 2022
 
 ### Bug fixes:

package/UPGRADING.md

@@ -3,7 +3,7 @@
 ### Upgrading to version 1.0.0+
 
 * Node.js older than 12 is no longer supported, make sure to update your environment;
-* If you are using `sqlite3` driver, please replace it with `@vscode/sqlite3`;
+* If you are using `sqlite3` driver dependency, please replace it with `@vscode/sqlite3` in your `package.json`;
 * `RETURNING` operations now always return an object with column names;
 * Migrator now returns list of migrations as objects.
 

package/lib/dialects/better-sqlite3/index.js

@@ -56,7 +56,7 @@ class Client_BetterSQLite3 extends Client_SQLite3 {
       }
 
       if (typeof binding === 'boolean') {
-        return String(binding);
+        return Number(binding);
       }
 
       return binding;

package/lib/dialects/cockroachdb/crdb-querycompiler.js

@@ -28,6 +28,11 @@ class QueryCompiler_CRDB extends QueryCompiler_PG {
     return body === '' ? '' : sql + body;
   }
 
+  _groupOrder(item, type) {
+    // CockroachDB don't support PostgreSQL order nulls first/last syntax, we take the generic one.
+    return this._basicGroupOrder(item, type);
+  }
+
   whereJsonPath(statement) {
     let castValue = '';
     if (parseInt(statement.value)) {

package/lib/dialects/mssql/schema/mssql-compiler.js

@@ -45,14 +45,13 @@ class SchemaCompiler_MSSQL extends SchemaCompiler {
   // Check whether a table exists on the query.
   hasTable(tableName) {
     const formattedTable = this.client.parameter(
-      this.formatter.wrap(prefixedTableName(this.schema, tableName)),
+      prefixedTableName(this.schema, tableName),
       this.builder,
       this.bindingsHolder
     );
-
     const sql =
-      `select object_id from sys.tables ` +
-      `where object_id = object_id(${formattedTable})`;
+      `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES ` +
+      `WHERE TABLE_NAME = ${formattedTable}`;
     this.pushQuery({ sql, output: (resp) => resp.length > 0 });
   }
 

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

@@ -80,12 +80,14 @@ class QueryCompiler_MySQL extends QueryCompiler {
 
   // Update method, including joins, wheres, order & limits.
   update() {
+    const withSQL = this.with();
     const join = this.join();
     const updates = this._prepUpdate(this.single.update);
     const where = this.where();
     const order = this.order();
     const limit = this.limit();
     return (
+      withSQL +
       `update ${this.tableName}` +
       (join ? ` ${join}` : '') +
       ' set ' +

package/lib/dialects/mysql/schema/mysql-tablecompiler.js

@@ -73,7 +73,7 @@ class TableCompiler_MySQL extends TableCompiler {
 
     this.pushQuery({
       sql:
-        `show fields from ${table} where field = ` +
+        `show full fields from ${table} where field = ` +
         this.client.parameter(from, this.tableBuilder, this.bindingsHolder),
       output(resp) {
         const column = resp[0];
@@ -101,7 +101,10 @@ class TableCompiler_MySQL extends TableCompiler {
               if (column.Default !== void 0 && column.Default !== null) {
                 sql += ` DEFAULT '${column.Default}'`;
               }
-              // Add back the auto increment if the column had it, fix issue #2767
+              if (column.Collation !== void 0 && column.Collation !== null) {
+                sql += ` COLLATE '${column.Collation}'`;
+              }
+              // Add back the auto increment if the column  it, fix issue #2767
               if (column.Extra == 'auto_increment') {
                 sql += ` AUTO_INCREMENT`;
               }

package/lib/dialects/oracledb/query/oracledb-querycompiler.js

@@ -8,9 +8,7 @@ const BlobHelper = require('../utils').BlobHelper;
 const { isString } = require('../../../util/is');
 const {
   columnize: columnize_,
-  direction: direction_,
 } = require('../../../formatter/wrappingFormatter');
-const Raw = require('../../../raw');
 
 class Oracledb_Compiler extends Oracle_Compiler {
   // Compiles an "insert" query, allowing for multiple
@@ -318,20 +316,7 @@ class Oracledb_Compiler extends Oracle_Compiler {
   }
 
   _groupOrder(item, type) {
-    const column = super._formatGroupsItemValue(item.value);
-    const direction =
-      type === 'order' && item.type !== 'orderByRaw'
-        ? ` ${direction_(
-            item.direction,
-            this.builder,
-            this.client,
-            this.bindingsHolder
-          )}`
-        : '';
-    if (item.nulls && !(item.value instanceof Raw)) {
-      return `${column}${direction ? direction : ''} nulls ${item.nulls}`;
-    }
-    return column + direction;
+    return super._groupOrderNulls(item, type);
   }
 
   update() {

package/lib/dialects/postgres/query/pg-querybuilder.js

@@ -5,4 +5,34 @@ module.exports = class QueryBuilder_PostgreSQL extends QueryBuilder {
     this._single.using = tables;
     return this;
   }
+
+  withMaterialized(alias, statementOrColumnList, nothingOrStatement) {
+    this._validateWithArgs(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      'with'
+    );
+    return this.withWrapped(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      true
+    );
+  }
+
+  withNotMaterialized(alias, statementOrColumnList, nothingOrStatement) {
+    this._validateWithArgs(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      'with'
+    );
+    return this.withWrapped(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      false
+    );
+  }
 };

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

@@ -145,13 +145,11 @@ class QueryCompiler_PG extends QueryCompiler {
     if (columns === true) {
       return ' on conflict do nothing';
     }
-    return ` on conflict (${this.formatter.columnize(columns)}) do nothing`;
+    return ` on conflict ${this._onConflictClause(columns)} do nothing`;
   }
 
   _merge(updates, columns, insert) {
-    let sql = ` on conflict (${this.formatter.columnize(
-      columns
-    )}) do update set `;
+    let sql = ` on conflict ${this._onConflictClause(columns)} do update set `;
     if (updates && Array.isArray(updates)) {
       sql += updates
         .map((column) =>
@@ -219,6 +217,10 @@ class QueryCompiler_PG extends QueryCompiler {
     return lockMode + (tables.length ? ' of ' + this._tableNames(tables) : '');
   }
 
+  _groupOrder(item, type) {
+    return super._groupOrderNulls(item, type);
+  }
+
   forUpdate() {
     return this._lockingClause('for update');
   }

package/lib/dialects/postgres/schema/pg-tablecompiler.js

@@ -91,21 +91,28 @@ class TableCompiler_PG extends TableCompiler {
 
     // To alter enum columns they must be cast to text first
     const isEnum = col.type === 'enu';
-
     this.pushQuery({
       sql: `alter table ${quotedTableName} alter column ${colName} drop default`,
       bindings: [],
     });
-    this.pushQuery({
-      sql: `alter table ${quotedTableName} alter column ${colName} drop not null`,
-      bindings: [],
-    });
-    this.pushQuery({
-      sql: `alter table ${quotedTableName} alter column ${colName} type ${type} using (${colName}${
-        isEnum ? '::text::' : '::'
-      }${type})`,
-      bindings: [],
-    });
+
+    const alterNullable = col.columnBuilder.alterNullable;
+    if (alterNullable) {
+      this.pushQuery({
+        sql: `alter table ${quotedTableName} alter column ${colName} drop not null`,
+        bindings: [],
+      });
+    }
+
+    const alterType = col.columnBuilder.alterType;
+    if (alterType) {
+      this.pushQuery({
+        sql: `alter table ${quotedTableName} alter column ${colName} type ${type} using (${colName}${
+          isEnum ? '::text::' : '::'
+        }${type})`,
+        bindings: [],
+      });
+    }
 
     const defaultTo = col.modified['defaultTo'];
     if (defaultTo) {
@@ -116,12 +123,14 @@ class TableCompiler_PG extends TableCompiler {
       });
     }
 
-    const nullable = col.modified['nullable'];
-    if (nullable && nullable[0] === false) {
-      this.pushQuery({
-        sql: `alter table ${quotedTableName} alter column ${colName} set not null`,
-        bindings: [],
-      });
+    if (alterNullable) {
+      const nullable = col.modified['nullable'];
+      if (nullable && nullable[0] === false) {
+        this.pushQuery({
+          sql: `alter table ${quotedTableName} alter column ${colName} set not null`,
+          bindings: [],
+        });
+      }
     }
   }
 

package/lib/dialects/sqlite3/index.js

@@ -15,6 +15,7 @@ const TableCompiler = require('./schema/sqlite-tablecompiler');
 const ViewCompiler = require('./schema/sqlite-viewcompiler');
 const SQLite3_DDL = require('./schema/ddl');
 const Formatter = require('../../formatter');
+const QueryBuilder = require('./query/sqlite-querybuilder');
 
 class Client_SQLite3 extends Client {
   constructor(config) {
@@ -44,6 +45,10 @@ class Client_SQLite3 extends Client {
     return new SqliteQueryCompiler(this, builder, formatter);
   }
 
+  queryBuilder() {
+    return new QueryBuilder(this);
+  }
+
   viewCompiler(builder, formatter) {
     return new ViewCompiler(this, builder, formatter);
   }

package/lib/dialects/sqlite3/query/sqlite-querybuilder.js

@@ -0,0 +1,33 @@
+const QueryBuilder = require('../../../query/querybuilder.js');
+
+module.exports = class QueryBuilder_SQLite3 extends QueryBuilder {
+  withMaterialized(alias, statementOrColumnList, nothingOrStatement) {
+    this._validateWithArgs(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      'with'
+    );
+    return this.withWrapped(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      true
+    );
+  }
+
+  withNotMaterialized(alias, statementOrColumnList, nothingOrStatement) {
+    this._validateWithArgs(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      'with'
+    );
+    return this.withWrapped(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      false
+    );
+  }
+};

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

@@ -153,13 +153,11 @@ class QueryCompiler_SQLite3 extends QueryCompiler {
     if (columns === true) {
       return ' on conflict do nothing';
     }
-    return ` on conflict (${this.formatter.columnize(columns)}) do nothing`;
+    return ` on conflict ${this._onConflictClause(columns)} do nothing`;
   }
 
   _merge(updates, columns, insert) {
-    let sql = ` on conflict (${this.formatter.columnize(
-      columns
-    )}) do update set `;
+    let sql = ` on conflict ${this._onConflictClause(columns)} do update set `;
     if (updates && Array.isArray(updates)) {
       sql += updates
         .map((column) =>

package/lib/knex-builder/FunctionHelper.js

@@ -14,25 +14,40 @@ class FunctionHelper {
     return this.client.raw('CURRENT_TIMESTAMP');
   }
 
-  uuidToBin(uuid) {
+  uuidToBin(uuid, ordered = true) {
     const buf = Buffer.from(uuid.replace(/-/g, ''), 'hex');
-    return Buffer.concat([
-      buf.slice(6, 8),
-      buf.slice(4, 6),
-      buf.slice(0, 4),
-      buf.slice(8, 16),
-    ]);
+    return ordered
+      ? Buffer.concat([
+          buf.slice(6, 8),
+          buf.slice(4, 6),
+          buf.slice(0, 4),
+          buf.slice(8, 16),
+        ])
+      : Buffer.concat([
+          buf.slice(0, 4),
+          buf.slice(4, 6),
+          buf.slice(6, 8),
+          buf.slice(8, 16),
+        ]);
   }
 
-  binToUuid(bin) {
-    const buf = new Buffer(bin, 'hex');
-    return [
-      buf.toString('hex', 4, 8),
-      buf.toString('hex', 2, 4),
-      buf.toString('hex', 0, 2),
-      buf.toString('hex', 8, 10),
-      buf.toString('hex', 10, 16),
-    ].join('-');
+  binToUuid(bin, ordered = true) {
+    const buf = Buffer.from(bin, 'hex');
+    return ordered
+      ? [
+          buf.toString('hex', 4, 8),
+          buf.toString('hex', 2, 4),
+          buf.toString('hex', 0, 2),
+          buf.toString('hex', 8, 10),
+          buf.toString('hex', 10, 16),
+        ].join('-')
+      : [
+          buf.toString('hex', 0, 4),
+          buf.toString('hex', 4, 6),
+          buf.toString('hex', 6, 8),
+          buf.toString('hex', 8, 10),
+          buf.toString('hex', 10, 16),
+        ].join('-');
   }
 }
 

package/lib/migrations/migrate/Migrator.js

@@ -562,8 +562,9 @@ function validateMigrationList(migrationSource, migrations) {
   const [all, completed] = migrations;
   const diff = getMissingMigrations(migrationSource, completed, all);
   if (!isEmpty(diff)) {
+    const names = diff.map((d) => d.name);
     throw new Error(
-      `The migration directory is corrupt, the following files are missing: ${diff.join(
+      `The migration directory is corrupt, the following files are missing: ${names.join(
         ', '
       )}`
     );

package/lib/query/querybuilder.js

@@ -118,25 +118,82 @@ class Builder extends EventEmitter {
 
   // With
   // ------
+  isValidStatementArg(statement) {
+    return (
+      typeof statement === 'function' ||
+      statement instanceof Builder ||
+      (statement && statement.isRawInstance)
+    );
+  }
+
+  _validateWithArgs(alias, statementOrColumnList, nothingOrStatement, method) {
+    const [query, columnList] =
+      typeof nothingOrStatement === 'undefined'
+        ? [statementOrColumnList, undefined]
+        : [nothingOrStatement, statementOrColumnList];
+    if (typeof alias !== 'string') {
+      throw new Error(`${method}() first argument must be a string`);
+    }
+
+    if (this.isValidStatementArg(query) && typeof columnList === 'undefined') {
+      // Validated as two-arg variant (alias, statement).
+      return;
+    }
+
+    // Attempt to interpret as three-arg variant (alias, columnList, statement).
+    const isNonEmptyNameList =
+      Array.isArray(columnList) &&
+      columnList.length > 0 &&
+      columnList.every((it) => typeof it === 'string');
+    if (!isNonEmptyNameList) {
+      throw new Error(
+        `${method}() second argument must be a statement or non-empty column name list.`
+      );
+    }
+
+    if (this.isValidStatementArg(query)) {
+      return;
+    }
+    throw new Error(
+      `${method}() third argument must be a function / QueryBuilder or a raw when its second argument is a column name list`
+    );
+  }
 
   with(alias, statementOrColumnList, nothingOrStatement) {
-    validateWithArgs(alias, statementOrColumnList, nothingOrStatement, 'with');
+    this._validateWithArgs(
+      alias,
+      statementOrColumnList,
+      nothingOrStatement,
+      'with'
+    );
     return this.withWrapped(alias, statementOrColumnList, nothingOrStatement);
   }
 
+  withMaterialized(alias, statementOrColumnList, nothingOrStatement) {
+    throw new Error('With materialized is not supported by this dialect');
+  }
+
+  withNotMaterialized(alias, statementOrColumnList, nothingOrStatement) {
+    throw new Error('With materialized is not supported by this dialect');
+  }
+
   // Helper for compiling any advanced `with` queries.
-  withWrapped(alias, statementOrColumnList, nothingOrStatement) {
+  withWrapped(alias, statementOrColumnList, nothingOrStatement, materialized) {
     const [query, columnList] =
       typeof nothingOrStatement === 'undefined'
         ? [statementOrColumnList, undefined]
         : [nothingOrStatement, statementOrColumnList];
-    this._statements.push({
+    const statement = {
       grouping: 'with',
       type: 'withWrapped',
       alias: alias,
       columnList,
       value: query,
-    });
+    };
+    if (materialized !== undefined) {
+      statement.materialized = materialized;
+    }
+    this._statements.push(statement);
     return this;
   }
 
@@ -144,7 +201,7 @@ class Builder extends EventEmitter {
   // ------
 
   withRecursive(alias, statementOrColumnList, nothingOrStatement) {
-    validateWithArgs(
+    this._validateWithArgs(
       alias,
       statementOrColumnList,
       nothingOrStatement,
@@ -1656,49 +1713,6 @@ class Builder extends EventEmitter {
   }
 }
 
-const isValidStatementArg = (statement) =>
-  typeof statement === 'function' ||
-  statement instanceof Builder ||
-  (statement && statement.isRawInstance);
-
-const validateWithArgs = function (
-  alias,
-  statementOrColumnList,
-  nothingOrStatement,
-  method
-) {
-  const [query, columnList] =
-    typeof nothingOrStatement === 'undefined'
-      ? [statementOrColumnList, undefined]
-      : [nothingOrStatement, statementOrColumnList];
-  if (typeof alias !== 'string') {
-    throw new Error(`${method}() first argument must be a string`);
-  }
-
-  if (isValidStatementArg(query) && typeof columnList === 'undefined') {
-    // Validated as two-arg variant (alias, statement).
-    return;
-  }
-
-  // Attempt to interpret as three-arg variant (alias, columnList, statement).
-  const isNonEmptyNameList =
-    Array.isArray(columnList) &&
-    columnList.length > 0 &&
-    columnList.every((it) => typeof it === 'string');
-  if (!isNonEmptyNameList) {
-    throw new Error(
-      `${method}() second argument must be a statement or non-empty column name list.`
-    );
-  }
-
-  if (isValidStatementArg(query)) {
-    return;
-  }
-  throw new Error(
-    `${method}() third argument must be a function / QueryBuilder or a raw when its second argument is a column name list`
-  );
-};
-
 Builder.prototype.select = Builder.prototype.columns;
 Builder.prototype.column = Builder.prototype.columns;
 Builder.prototype.andWhereNot = Builder.prototype.whereNot;

package/lib/query/querycompiler.js

@@ -149,6 +149,12 @@ class QueryCompiler {
     return body === '' ? '' : sql + body;
   }
 
+  _onConflictClause(columns) {
+    return columns instanceof Raw
+      ? this.formatter.wrap(columns)
+      : `(${this.formatter.columnize(columns)})`;
+  }
+
   _buildInsertValues(insertData) {
     let sql = '';
     let i = -1;
@@ -1070,10 +1076,14 @@ class QueryCompiler {
   }
 
   _jsonWrapValue(jsonValue) {
-    if (this.builder._isJsonObject(jsonValue)) {
-      return JSON.stringify(jsonValue);
+    if (!this.builder._isJsonObject(jsonValue)) {
+      try {
+        return JSON.stringify(JSON.parse(jsonValue.replace(/\n|\t/g, '')));
+      } catch (e) {
+        return jsonValue;
+      }
     }
-    return jsonValue;
+    return JSON.stringify(jsonValue);
   }
 
   _jsonValueClause(statement) {
@@ -1170,6 +1180,12 @@ class QueryCompiler {
         ) +
         ')'
       : '';
+    const materialized =
+      statement.materialized === undefined
+        ? ''
+        : statement.materialized
+        ? 'materialized '
+        : 'not materialized ';
     return (
       (val &&
         columnize_(
@@ -1179,7 +1195,9 @@ class QueryCompiler {
           this.bindingsHolder
         ) +
           columnList +
-          ' as (' +
+          ' as ' +
+          materialized +
+          '(' +
           val +
           ')') ||
       ''
@@ -1325,7 +1343,7 @@ class QueryCompiler {
     return groupOrder;
   }
 
-  _groupOrder(item, type) {
+  _basicGroupOrder(item, type) {
     const column = this._formatGroupsItemValue(item.value, item.nulls);
     const direction =
       type === 'order' && item.type !== 'orderByRaw'
@@ -1339,6 +1357,27 @@ class QueryCompiler {
     return column + direction;
   }
 
+  _groupOrder(item, type) {
+    return this._basicGroupOrder(item, type);
+  }
+
+  _groupOrderNulls(item, type) {
+    const column = this._formatGroupsItemValue(item.value);
+    const direction =
+      type === 'order' && item.type !== 'orderByRaw'
+        ? ` ${direction_(
+            item.direction,
+            this.builder,
+            this.client,
+            this.bindingsHolder
+          )}`
+        : '';
+    if (item.nulls && !(item.value instanceof Raw)) {
+      return `${column}${direction ? direction : ''} nulls ${item.nulls}`;
+    }
+    return column + direction;
+  }
+
   // Compiles the `order by` statements.
   _groupsOrders(type) {
     const items = this.grouped[type];

package/lib/schema/columnbuilder.js

@@ -110,8 +110,13 @@ AlterMethods.alterType = function (type) {
 };
 
 // Set column method to alter (default is add).
-AlterMethods.alter = function () {
+AlterMethods.alter = function ({
+  alterNullable = true,
+  alterType = true,
+} = {}) {
   this._method = 'alter';
+  this.alterNullable = alterNullable;
+  this.alterType = alterType;
 
   return this;
 };

package/lib/schema/tablecompiler.js

@@ -127,9 +127,9 @@ class TableCompiler {
             ' (' +
             references +
             ')' +
-            deferrable +
             onUpdate +
-            onDelete
+            onDelete +
+            deferrable
         );
       } else {
         this.pushQuery(
@@ -144,9 +144,9 @@ class TableCompiler {
             ' (' +
             references +
             ')' +
-            deferrable +
             onUpdate +
-            onDelete
+            onDelete +
+            deferrable
         );
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A batteries-included SQL query & schema builder for PostgresSQL, MySQL, CockroachDB, MSSQL and SQLite3",
   "main": "knex",
   "types": "types/index.d.ts",
@@ -84,9 +84,6 @@
     "pg-native": {
       "optional": true
     },
-    "sqlite3": {
-      "optional": true
-    },
     "@vscode/sqlite3": {
       "optional": true
     },
@@ -101,24 +98,24 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "^16.11.19",
+    "@types/node": "^16.11.22",
     "@vscode/sqlite3": "^5.0.7",
-    "better-sqlite3": "^7.4.6",
-    "chai": "^4.3.4",
+    "better-sqlite3": "^7.5.0",
+    "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "chai-subset-in-order": "^3.1.0",
     "cli-testlab": "^2.2.0",
     "coveralls": "^3.1.1",
     "cross-env": "^7.0.3",
     "dtslint": "4.2.1",
-    "eslint": "^8.1.0",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-import": "^2.25.4",
     "husky": "^4.3.8",
     "jake": "^8.1.1",
     "JSONStream": "^1.3.5",
     "lint-staged": "^11.1.2",
-    "mocha": "^9.1.4",
+    "mocha": "^9.2.0",
     "mock-fs": "^5.1.2",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
@@ -128,16 +125,16 @@
     "pg-query-stream": "^4.2.1",
     "prettier": "2.4.1",
     "rimraf": "^3.0.2",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "tap-spec": "^5.0.0",
-    "tape": "^5.4.0",
-    "tedious": "^12.2.0",
+    "tape": "^5.5.0",
+    "tedious": "^12.3.0",
     "toxiproxy-node-client": "^2.0.6",
     "ts-node": "^10.4.0",
     "tsd": "^0.19.1",
-    "typescript": "4.5.4"
+    "typescript": "4.5.5"
   },
   "buildDependencies": [
     "rimraf"

package/types/index.d.ts

@@ -520,6 +520,8 @@ export declare namespace Knex {
 
     // Withs
     with: With<TRecord, TResult>;
+    withMaterialized: With<TRecord, TResult>;
+    withNotMaterialized: With<TRecord, TResult>;
     withRecursive: With<TRecord, TResult>;
     withRaw: WithRaw<TRecord, TResult>;
     withSchema: WithSchema<TRecord, TResult>;
@@ -546,7 +548,7 @@ export declare namespace Knex {
     whereNotIn: WhereIn<TRecord, TResult>;
     orWhereNotIn: WhereIn<TRecord, TResult>;
     whereLike: Where<TRecord, TResult>;
-    whereIlike: Where<TRecord, TResult>;
+    whereILike: Where<TRecord, TResult>;
     whereNull: WhereNull<TRecord, TResult>;
     orWhereNull: WhereNull<TRecord, TResult>;
     whereNotNull: WhereNull<TRecord, TResult>;
@@ -977,6 +979,10 @@ export declare namespace Knex {
       columns: string[]
     ): OnConflictQueryBuilder<TRecord, TResult>;
 
+    onConflict(
+      raw: Raw
+    ): OnConflictQueryBuilder<TRecord, TResult>;
+
     onConflict(): OnConflictQueryBuilder<TRecord, TResult>;
 
     del(
@@ -2204,7 +2210,7 @@ export declare namespace Knex {
     notNullable(): ColumnBuilder;
     nullable(): ColumnBuilder;
     comment(value: string): ColumnBuilder;
-    alter(): ColumnBuilder;
+    alter(options: Readonly<{alterNullable?: boolean, alterType?: boolean}>): ColumnBuilder;
     queryContext(context: any): ColumnBuilder;
     after(columnName: string): ColumnBuilder;
     first(): ColumnBuilder;
@@ -2717,6 +2723,8 @@ export declare namespace Knex {
 
   interface FunctionHelper {
     now(precision?: number): Raw;
+    uuidToBin(uuid: string, ordered?: boolean): Buffer;
+    binToUuid(bin: Buffer, ordered?: boolean): string;
   }
 
   interface EnumOptions {