knex 0.20.14 → 0.20.15

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Master (Unreleased)
 
+# 0.20.15 - 16 April, 2020
+
+### Bug fixes:
+
+- Support for `.finally(..)` on knex's Promise-alikes #3800
+
+### Typings:
+
+- Add types for `.distinctOn` #3784
+
 # 0.20.14 - 13 April, 2020
 
 ### New features:

package/lib/util/finally-mixin.js

@@ -10,4 +10,4 @@ const finallyMixin = (prototype) =>
 // FYI: Support for `Promise.prototype.finally` was not introduced until Node 9.
 //      Therefore, Knex will need to conditionally inject support for `.finally(..)`
 //      until support for Node 8 is officially dropped.
-module.exports = Promise.prototype.finally ? noop : finallyMixin;
+module.exports = Promise.prototype.finally ? finallyMixin : noop;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex",
-  "version": "0.20.14",
+  "version": "0.20.15",
   "description": "A batteries-included SQL query & schema builder for Postgres, MySQL and SQLite3 and the Browser",
   "main": "knex.js",
   "types": "types/index.d.ts",

package/types/index.d.ts

@@ -433,6 +433,7 @@ declare namespace Knex {
     into: Table<TRecord, TResult>;
     table: Table<TRecord, TResult>;
     distinct: Distinct<TRecord, TResult>;
+    distinctOn: DistinctOn<TRecord, TResult>;
 
     // Joins
     join: Join<TRecord, TResult>;
@@ -909,6 +910,19 @@ declare namespace Knex {
   interface Distinct<TRecord extends {}, TResult = {}[]>
     extends ColumnNameQueryBuilder<TRecord, TResult> {}
 
+  interface DistinctOn<TRecord extends {}, TResult = {}[]> {
+    <ColNameUT extends keyof TRecord>(
+      ...columnNames: readonly ColNameUT[]
+    ): QueryBuilder<TRecord, TResult>;
+
+    <ColNameUT extends keyof TRecord>(
+      columnNames: readonly ColNameUT[]
+    ): QueryBuilder<TRecord, TResult>;
+
+    (...columnNames: readonly string[]): QueryBuilder<TRecord, TResult>;
+    (columnNames: readonly string[]): QueryBuilder<TRecord, TResult>;
+  }
+
   interface JoinCallback {
     (this: JoinClause, join: JoinClause): void;
   }