MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Not Contains for SQL Server

This commit is contained in:
Mel O'Hagan 2022-07-27 11:56:57 +01:00
parent 54643cff58
commit d9823faac6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/server/src/integrations/base/sql.ts
View File

@ -176,7 +176,9 @@ class InternalBuilder {
const columnName = fieldNames[1] const columnName = fieldNames[1]
// @ts-ignore // @ts-ignore
query = query[rawFnc]( query = query[rawFnc](
`${not}"${tableName}"."${columnName}"::jsonb @> ${stringifyArray(value)}` `${not}"${tableName}"."${columnName}"::jsonb @> ${stringifyArray(
value
)}`
) )
}) })
} else if (this.client === SqlClients.MY_SQL) { } else if (this.client === SqlClients.MY_SQL) {
@ -200,7 +202,7 @@ class InternalBuilder {
`LOWER(${likeKey(this.client, key)}) LIKE ?` `LOWER(${likeKey(this.client, key)}) LIKE ?`
} }
// @ts-ignore // @ts-ignore
query = query[rawFnc](andStatement, value) query = query[rawFnc](`${not}(${andStatement})`, value)
}) })
} }
} }

4
packages/server/src/integrations/tests/sql.spec.js
View File

@ -285,7 +285,7 @@ describe("SQL query builder", () => {
}) })
}) })
it("should use like expression for MS-SQL when filter is notContains", () => { it("should use NOT like expression for MS-SQL when filter is notContains", () => {
const query = new Sql(SqlClients.MS_SQL, 10)._query(generateReadJson({ const query = new Sql(SqlClients.MS_SQL, 10)._query(generateReadJson({
filters: { filters: {
notContains: { notContains: {
@ -296,7 +296,7 @@ describe("SQL query builder", () => {
})) }))
expect(query).toEqual({ expect(query).toEqual({
bindings: [10, "%20%", `%"John"%`], bindings: [10, "%20%", `%"John"%`],
sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where LOWER(${TABLE_NAME}.age) LIKE @p1 and LOWER(${TABLE_NAME}.name) LIKE @p2) as [${TABLE_NAME}]` sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where NOT (LOWER(${TABLE_NAME}.age) LIKE @p1) and NOT (LOWER(${TABLE_NAME}.name) LIKE @p2)) as [${TABLE_NAME}]`
}) })
}) })