Skip to content

JSONB filter values that are not dates are coerced into NaN #1060

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

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

JSONB filter values that are not dates are coerced into NaN #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c17be9
fix: fixed jsonb values coerced into NaN
Helveg Mar 20, 2025
c3f6ab5
allowed 'json' as well as 'jsonb'
Helveg Mar 20, 2025
87a05e5
fix formatting
Helveg Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { PaginateQuery } from './decorator'
import {
checkIsArray,
checkIsEmbedded,
checkIsJsonb,
checkIsJson,
checkIsNestedRelation,
checkIsRelation,
extractVirtualProperty,
Expand Down Expand Up @@ -251,7 +251,7 @@ function fixColumnFilterValue<T>(column: string, qb: SelectQueryBuilder<T>, isJs
return new Date(value)
}

if ((columnType === Number || isJsonb) && !Number.isNaN(value)) {
if ((columnType === Number || isJsonb) && !Number.isNaN(Number(value))) {
return Number(value)
}

Expand Down Expand Up @@ -308,7 +308,7 @@ export function parseFilter<T>(
const fixValue = fixColumnFilterValue(column, qb)

const columnProperties = getPropertiesByColumnName(column)
const isJsonb = checkIsJsonb(qb, columnProperties.column)
const isJsonb = checkIsJson(qb, columnProperties.column)

switch (token.operator) {
case FilterOperator.BTW:
Expand Down
8 changes: 5 additions & 3 deletions src/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export function checkIsArray(qb: SelectQueryBuilder<unknown>, propertyName: stri
return !!qb?.expressionMap?.mainAlias?.metadata.findColumnWithPropertyName(propertyName)?.isArray
}

export function checkIsJsonb(qb: SelectQueryBuilder<unknown>, propertyName: string): boolean {
export function checkIsJson(qb: SelectQueryBuilder<unknown>, propertyName: string): boolean {
if (!qb || !propertyName) {
return false
}
Expand All @@ -205,10 +205,12 @@ export function checkIsJsonb(qb: SelectQueryBuilder<unknown>, propertyName: stri
const parts = propertyName.split('.')
const dbColumnName = parts[parts.length - 2]

return qb?.expressionMap?.mainAlias?.metadata.findColumnWithPropertyName(dbColumnName)?.type === 'jsonb'
const columnType = qb?.expressionMap?.mainAlias?.metadata.findColumnWithPropertyName(dbColumnName)?.type
return columnType === 'jsonb' || columnType === 'json'
}

return qb?.expressionMap?.mainAlias?.metadata.findColumnWithPropertyName(propertyName)?.type === 'jsonb'
const columnType = qb?.expressionMap?.mainAlias?.metadata.findColumnWithPropertyName(propertyName)?.type
return columnType === 'jsonb' || columnType === 'json'
}

// This function is used to fix the column alias when using relation, embedded or virtual properties
Expand Down