diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts index 51f7ce024d..5cafc3cb15 100644 --- a/types/knex/index.d.ts +++ b/types/knex/index.d.ts @@ -428,7 +428,7 @@ declare namespace Knex { date(columnName: string): ColumnBuilder; dateTime(columnName: string): ColumnBuilder; time(columnName: string): ColumnBuilder; - timestamp(columnName: string): ColumnBuilder; + timestamp(columnName: string, standard?: boolean): ColumnBuilder; timestamps(useTimestampType?: boolean, makeDefaultNow?: boolean): ColumnBuilder; binary(columnName: string, length?: number): ColumnBuilder; enum(columnName: string, values: Value[]): ColumnBuilder; @@ -441,8 +441,8 @@ declare namespace Knex { primary(columnNames: string[]): TableBuilder; index(columnNames: (string | Raw)[], indexName?: string, indexType?: string): TableBuilder; unique(columnNames: (string | Raw)[], indexName?: string): TableBuilder; - foreign(column: string): ForeignConstraintBuilder; - foreign(columns: string[]): MultikeyForeignConstraintBuilder; + foreign(column: string, foreignKeyName?: string): ForeignConstraintBuilder; + foreign(columns: string[], foreignKeyName?: string): MultikeyForeignConstraintBuilder; dropForeign(columnNames: string[], foreignKeyName?: string): TableBuilder; dropUnique(columnNames: (string | Raw)[], indexName?: string): TableBuilder; dropPrimary(constraintName?: string): TableBuilder; @@ -467,8 +467,8 @@ declare namespace Knex { interface ColumnBuilder { index(indexName?: string): ColumnBuilder; - primary(): ColumnBuilder; - unique(): ColumnBuilder; + primary(constraintName?: string): ColumnBuilder; + unique(indexName?: string): ColumnBuilder; references(columnName: string): ReferencingColumnBuilder; onDelete(command: string): ColumnBuilder; onUpdate(command: string): ColumnBuilder; diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts index 4e44f8e6b8..5296f27619 100644 --- a/types/knex/knex-tests.ts +++ b/types/knex/knex-tests.ts @@ -1040,6 +1040,10 @@ knex.schema .dropTableIfExists('A') .createTable('A', table => { table.integer('C').unsigned().references('B.id').notNullable(); + table.integer('D').primary('PK').notNullable(); + table.string('E').unique('UX').nullable(); + table.foreign('E', 'FK').references('F.id'); + table.timestamp('T', false).notNullable(); });