From 18396bd284b6608e80e2de56ad042fcc6815b625 Mon Sep 17 00:00:00 2001 From: Travis Hill Date: Tue, 5 Jul 2016 09:40:51 -0400 Subject: [PATCH 1/2] Added missing methods to JoinClause object --- knex/knex.d.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/knex/knex.d.ts b/knex/knex.d.ts index 74ea935911..771cc39cbf 100644 --- a/knex/knex.d.ts +++ b/knex/knex.d.ts @@ -179,6 +179,20 @@ declare module "knex" { on(column1: string, column2: string): JoinClause; on(column1: string, raw: Raw): JoinClause; on(column1: string, operator: string, column2: string): JoinClause; + andOn(raw: Raw): JoinClause; + andOn(callback: Function): JoinClause; + andOn(columns: {[key: string]: string|Raw}): JoinClause; + andOn(column1: string, column2: string): JoinClause; + andOn(column1: string, raw: Raw): JoinClause; + andOn(column1: string, operator: string, column2: string): JoinClause; + orOn(raw: Raw): JoinClause; + orOn(callback: Function): JoinClause; + orOn(columns: {[key: string]: string|Raw}): JoinClause; + orOn(column1: string, column2: string): JoinClause; + orOn(column1: string, raw: Raw): JoinClause; + orOn(column1: string, operator: string, column2: string): JoinClause; + using(column: string|string[]|Raw|{[key: string]: string|Raw}): JoinClause; + type(type: string): JoinClause; } interface JoinRaw { From 19cc1c2dda796a2488db1d97bd86cf6d48b10421 Mon Sep 17 00:00:00 2001 From: Travis Hill Date: Tue, 5 Jul 2016 09:42:23 -0400 Subject: [PATCH 2/2] Fixed formatting --- knex/knex.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knex/knex.d.ts b/knex/knex.d.ts index 771cc39cbf..24020b0083 100644 --- a/knex/knex.d.ts +++ b/knex/knex.d.ts @@ -192,7 +192,7 @@ declare module "knex" { orOn(column1: string, raw: Raw): JoinClause; orOn(column1: string, operator: string, column2: string): JoinClause; using(column: string|string[]|Raw|{[key: string]: string|Raw}): JoinClause; - type(type: string): JoinClause; + type(type: string): JoinClause; } interface JoinRaw {