Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Type Definition for orderBy with Raw Expression Issue 5711 #5803

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Type Definition for orderBy with Raw Expression Issue 5711 #5803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e7f7b4
Add missing type definition for orderBy with a raw column/expression …
redaxle Feb 20, 2024
69d512c
Merge remote-tracking branch 'knex/master' into types-orderby-raw
redaxle Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions types/index.d.ts
View file
Open in desktop
Expand Up @@ -1954,20 +1954,20 @@ declare namespace Knex {

interface OrderBy<TRecord extends {} = any, TResult = unknown[]> {
(
columnName: keyof TRecord | QueryBuilder,
columnName: keyof TRecord | QueryBuilder | Raw,
order?: 'asc' | 'desc',
nulls?: 'first' | 'last'
): QueryBuilder<TRecord, TResult>;
(
columnName: string | QueryBuilder,
columnName: string | QueryBuilder | Raw,
order?: string,
nulls?: string
): QueryBuilder<TRecord, TResult>;
(
columnDefs: Array<
| keyof TRecord
| Readonly<{
column: keyof TRecord | QueryBuilder;
column: keyof TRecord | QueryBuilder | Raw;
order?: 'asc' | 'desc';
nulls?: 'first' | 'last';
}>
Expand All @@ -1977,7 +1977,7 @@ declare namespace Knex {
columnDefs: Array<
| string
| Readonly<{
column: string | QueryBuilder;
column: string | QueryBuilder | Raw;
order?: string;
nulls?: string;
}>
Expand Down