Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions internal/store/postgres/org_billing_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const (
OPERATOR_NOT_IN = "notin"
OPERATOR_LIKE = "like"
OPERATOR_NOT_LIKE = "notlike"
OPERATOR_ILIKE = "ilike"
OPERATOR_NOT_ILIKE = "notilike"
)

const (
Expand Down Expand Up @@ -415,6 +417,10 @@ func processStringDataType(filter rql.Filter, query *goqu.SelectDataset) *goqu.S
case OPERATOR_NOT_LIKE:
// some semi string sql types like UUID require casting to text to support like operator
query = query.Where(goqu.L(fmt.Sprintf(`"%s"::TEXT NOT LIKE '%s'`, filter.Name, filter.Value.(string))))
case OPERATOR_ILIKE:
query = query.Where(goqu.L(fmt.Sprintf(`"%s"::TEXT ILIKE '%s'`, filter.Name, filter.Value.(string))))
case OPERATOR_NOT_ILIKE:
query = query.Where(goqu.L(fmt.Sprintf(`"%s"::TEXT NOT ILIKE '%s'`, filter.Name, filter.Value.(string))))
default:
query = query.Where(goqu.Ex{filter.Name: goqu.Op{filter.Operator: filter.Value.(string)}})
}
Expand Down
9 changes: 1 addition & 8 deletions web/apps/admin/src/utils/transform-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,11 @@ function transformFilter(
value = convertFilterValue(filter.value);
}

// TODO: add support for ilike in RQL and backend
// Transform ilike operator to like only for string values
const operator =
filter.operator === "ilike" && value.case === "stringValue"
? "like"
: filter.operator;

const fieldName = fieldNameMapping?.[filter.name] ?? filter.name;

return create(RQLFilterSchema, {
name: fieldName,
operator,
operator: filter.operator,
value,
});
}
Expand Down
9 changes: 1 addition & 8 deletions web/sdk/admin/utils/transform-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,11 @@ function transformFilter(
value = convertFilterValue(filter.value);
}

// TODO: add support for ilike in RQL and backend
// Transform ilike operator to like only for string values
const operator =
filter.operator === "ilike" && value.case === "stringValue"
? "like"
: filter.operator;

const fieldName = fieldNameMapping?.[filter.name] ?? filter.name;

return create(RQLFilterSchema, {
name: fieldName,
operator,
operator: filter.operator,
value,
});
}
Expand Down
Loading