From e458c529e1eb82f6104af09e653816b6b873b586 Mon Sep 17 00:00:00 2001
From: Manuel <FibHeap@users.noreply.github.com>
Date: Wed, 25 Jul 2018 18:28:26 +0200
Subject: [PATCH 1/2] Fix typings for typescript 2.8.1

CName should only be string
---
 lib/types.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.d.ts b/lib/types.d.ts
index 84fb7ab3..1a35a10c 100644
--- a/lib/types.d.ts
+++ b/lib/types.d.ts
@@ -37,7 +37,7 @@ declare module "sql" {
 	interface TableDefinition<Name extends string, Row> {
 		name: Name;
 		schema: string;
-		columns: {[CName in keyof Row]: ColumnDefinition<CName, Row[CName]>};
+		columns: {[CName in keyof Row]: CName extends string ? ColumnDefinition<CName, Row[CName]>: never};
 		dialect?: SQLDialects;
 		isTemporary?: boolean;
 		foreignKeys?: {

From ea3a663cdc939ca427d4d4860a1a8014c1b97e7f Mon Sep 17 00:00:00 2001
From: Manuel <FibHeap@users.noreply.github.com>
Date: Fri, 27 Jul 2018 10:02:52 +0200
Subject: [PATCH 2/2] Use Extract<keyof Row,string> for Typescript 2.9

fix typings for the breaking changes in Typescript 2.9
---
 lib/types.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.d.ts b/lib/types.d.ts
index 1a35a10c..e4f4d522 100644
--- a/lib/types.d.ts
+++ b/lib/types.d.ts
@@ -37,7 +37,7 @@ declare module "sql" {
 	interface TableDefinition<Name extends string, Row> {
 		name: Name;
 		schema: string;
-		columns: {[CName in keyof Row]: CName extends string ? ColumnDefinition<CName, Row[CName]>: never};
+		columns: {[CName in Extract<keyof Row, string>]: ColumnDefinition<CName, Row[CName]>};
 		dialect?: SQLDialects;
 		isTemporary?: boolean;
 		foreignKeys?: {