Skip to content

Commit

Permalink
Allow null as a valid value for .enu/.enum (#5116)
Browse files Browse the repository at this point in the history
When using the `useNative` and `existingType` options, the value isn't utilized.
The documentation uses `null` as an example, this commit allows said example
to pass in typescript


close #5114
  • Loading branch information
Naddiseo committed Apr 19, 2022
1 parent 939d8a2 commit 0e81a65
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions test-tsd/tables.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ const main = async () => {
table.integer('num').references('id').withKeyName('non_for7').deferrable('deferred').inTable('non_exist').onDelete('CASCADE');
table.integer('num').references('id').inTable('non_exist').onDelete('CASCADE').withKeyName('non_for6').deferrable('deferred');
table.integer('num').references('id').withKeyName('non_for7').onDelete('CASCADE').deferrable('deferred').inTable('non_exist');

table.enu("myenum", null, {
enumName:"MyEnum",
useNative: true,
existingType: true,
});

expectType<Knex.ReferencingColumnBuilder>(
table.integer('num').references('id').withKeyName('non_for7').onDelete('CASCADE')
Expand Down
4 changes: 2 additions & 2 deletions types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2097,12 +2097,12 @@ export declare namespace Knex {
binary(columnName: string, length?: number): ColumnBuilder;
enum(
columnName: string,
values: readonly Value[],
values: (readonly Value[]) | null,
options?: EnumOptions
): ColumnBuilder;
enu(
columnName: string,
values: readonly Value[],
values: (readonly Value[]) | null,
options?: EnumOptions
): ColumnBuilder;
json(columnName: string): ColumnBuilder;
Expand Down

0 comments on commit 0e81a65

Please sign in to comment.