Fix for #5669 comment, when using SQL tables with spaces in names, we use a raw knex function for like to achieve lower case searching, this needs to handle spaces in columns and delimiting.
This commit is contained in:
parent
d0f5b67cf1
commit
13ec670295
|
@ -21,6 +21,31 @@ type KnexQuery = Knex.QueryBuilder | Knex
|
||||||
const MIN_ISO_DATE = "0000-00-00T00:00:00.000Z"
|
const MIN_ISO_DATE = "0000-00-00T00:00:00.000Z"
|
||||||
const MAX_ISO_DATE = "9999-00-00T00:00:00.000Z"
|
const MAX_ISO_DATE = "9999-00-00T00:00:00.000Z"
|
||||||
|
|
||||||
|
function likeKey(client: string, key: string): string {
|
||||||
|
if (!key.includes(" ")) {
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
let start: string, end: string
|
||||||
|
switch (client) {
|
||||||
|
case SqlClients.MY_SQL:
|
||||||
|
start = end = "`"
|
||||||
|
break
|
||||||
|
case SqlClients.ORACLE:
|
||||||
|
case SqlClients.POSTGRES:
|
||||||
|
start = end = '"'
|
||||||
|
break
|
||||||
|
case SqlClients.MS_SQL:
|
||||||
|
start = "["
|
||||||
|
end = "]"
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
throw "Unknown client"
|
||||||
|
}
|
||||||
|
const parts = key.split(".")
|
||||||
|
key = parts.map(part => `${start}${part}${end}`).join(".")
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
|
||||||
function parse(input: any) {
|
function parse(input: any) {
|
||||||
if (Array.isArray(input)) {
|
if (Array.isArray(input)) {
|
||||||
return JSON.stringify(input)
|
return JSON.stringify(input)
|
||||||
|
@ -125,7 +150,9 @@ class InternalBuilder {
|
||||||
} else {
|
} else {
|
||||||
const rawFnc = `${fnc}Raw`
|
const rawFnc = `${fnc}Raw`
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
query = query[rawFnc](`LOWER(${key}) LIKE ?`, [`%${value}%`])
|
query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
|
||||||
|
`%${value}%`,
|
||||||
|
])
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue