From 935601e1097104644b621f6944ace8995e57e427 Mon Sep 17 00:00:00 2001
From: Hasan Al-Banna Mohamed <kernel-io@users.noreply.github.com>
Date: Wed, 22 Nov 2017 20:50:30 +1300
Subject: [PATCH] Added onConflict to ModifyingQuery interface

---
 lib/types.d.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/types.d.ts b/lib/types.d.ts
index 84fb7ab3..fbb2311c 100644
--- a/lib/types.d.ts
+++ b/lib/types.d.ts
@@ -100,9 +100,25 @@ declare module "sql" {
 		notExists(subQuery:SubQuery<any>):BinaryNode
 	}
 
+	interface OnConflictOptionsBase {
+		update?: string[]
+	}
+
+	interface OnConflictOptionsWithConstraint extends OnConflictOptionsBase {
+		constraint: string
+		columns?: undefined
+	}
+
+	interface OnConflictOptionsWithColumns extends OnConflictOptionsBase {
+		columns: string[]
+		constraint?: undefined
+	}
+
+	type OnConflictOptions = OnConflictOptionsWithConstraint | OnConflictOptionsWithColumns | (OnConflictOptionsWithConstraint & OnConflictOptionsWithColumns)
 
 	interface ModifyingQuery extends Executable {
 		returning<U>(...nodes:any[]):Query<U>
+		onConflict(options: OnConflictOptions): ModifyingQuery
 		where(...nodes:any[]):ModifyingQuery
 	}