Merge 64af7f5 into c99b623

.travis.yml

@@ -2,6 +2,8 @@ language: node_js
 node_js:
   - node
   - 14
+before_install:
+  - npm install -g typescript
 script:
   - npm run build
   - npm run test

package.json

@@ -27,20 +27,20 @@
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/sinon": "^10.0.6",
-    "ava": "^3.15.0",
+    "ava": "^4.3.1",
     "coveralls": "^3.1.1",
     "eslint": "^8.5.0",
     "eslint-config-canonical": "^32.48.8",
-    "gitdown": "^3.1.4",
+    "gitdown": "^3.1.5",
     "husky": "^4.2.3",
     "nyc": "^15.1.0",
-    "semantic-release": "^18.0.1",
+    "semantic-release": "^19.0.3",
     "sinon": "^12.0.1",
-    "slonik": "^26.2.2",
+    "slonik": "^28.1.1",
     "ts-node": "^10.4.0"
   },
   "peerDependencies": {
-    "slonik": "*"
+    "slonik": "^28.*"
   },
   "engines": {
     "node": ">=8.0"

src/routines/update.ts

@@ -7,7 +7,7 @@ import {
   sql,
 } from 'slonik';
 import type {
-  DatabaseConnectionType,
+  DatabaseConnection,
 } from 'slonik';
 import type {
   NamedAssignmentPayload,
@@ -22,7 +22,7 @@ type UpdateResultType = {
 };
 
 export const update = async (
-  connection: DatabaseConnectionType,
+  connection: DatabaseConnection,
   tableName: string,
   namedAssignmentPayload: NamedAssignmentPayload,
   booleanExpressionValues: Record<string, boolean | number | string | null> = {},

src/routines/updateDistinct.ts

@@ -2,7 +2,7 @@ import {
   sql,
 } from 'slonik';
 import type {
-  DatabaseConnectionType,
+  DatabaseConnection,
 } from 'slonik';
 import type {
   NamedAssignmentPayload,
@@ -17,7 +17,7 @@ type UpdateDistinctResultType = {
 };
 
 export const updateDistinct = async (
-  connection: DatabaseConnectionType,
+  connection: DatabaseConnection,
   tableName: string,
   namedAssignmentPayload: NamedAssignmentPayload,
   booleanExpressionValues: Record<string, boolean | number | string | null> = {},

src/routines/upsert.ts

@@ -8,15 +8,15 @@ import {
   sql,
 } from 'slonik';
 import type {
-  DatabaseConnectionType,
-  ValueExpressionType,
+  DatabaseConnection,
+  ValueExpression,
 } from 'slonik';
 import {
   Logger,
 } from '../Logger';
 
 type NamedValueBindingsType = {
-  readonly [key: string]: ValueExpressionType,
+  readonly [key: string]: ValueExpression,
 };
 
 type UpsertConfigurationType = {
@@ -36,7 +36,7 @@ const defaultConfiguration = {
 };
 
 export const upsert = async (
-  connection: DatabaseConnectionType,
+  connection: DatabaseConnection,
   tableName: string,
   namedValueBindings: NamedValueBindingsType,
   inputUniqueConstraintColumnNames: readonly string[] | null = null,

src/types.ts

@@ -1,7 +1,7 @@
 import type {
-  ValueExpressionType,
+  ValueExpression,
 } from 'slonik';
 
 export type NamedAssignmentPayload = {
-  [key: string]: ValueExpressionType,
+  [key: string]: ValueExpression,
 };

src/utilities/assignmentList.ts

@@ -2,7 +2,7 @@ import {
   sql,
 } from 'slonik';
 import type {
-  ListSqlTokenType,
+  ListSqlToken,
 } from 'slonik';
 import type {
   NamedAssignmentPayload,
@@ -13,7 +13,7 @@ import {
 
 export const assignmentList = (
   namedAssignment: NamedAssignmentPayload,
-): ListSqlTokenType => {
+): ListSqlToken => {
   const values = Object.values(
     Object.entries(namedAssignment).map(([
       column,