diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile index 7dd3c1ed22..dfcfe566bd 100644 --- a/hosting/single/Dockerfile +++ b/hosting/single/Dockerfile @@ -64,11 +64,6 @@ RUN mkdir -p /var/log/nginx && \ touch /var/run/nginx.pid && \ usermod -a -G tty www-data -WORKDIR / -RUN mkdir -p scripts/integrations/oracle -COPY packages/server/scripts/integrations/oracle scripts/integrations/oracle -RUN /bin/bash -e ./scripts/integrations/oracle/instantclient/linux/install.sh - # setup minio WORKDIR /minio COPY scripts/install-minio.sh ./install.sh diff --git a/lerna.json b/lerna.json index 843addc63c..fb239ee35d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "2.29.22", + "version": "2.29.24", "npmClient": "yarn", "packages": [ "packages/*", diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts index a4b924bf54..a67da7bc10 100644 --- a/packages/backend-core/src/sql/sql.ts +++ b/packages/backend-core/src/sql/sql.ts @@ -435,6 +435,11 @@ class InternalBuilder { )} = ? THEN 1 ELSE 0 END = 1`, [value] ) + } else if (this.client === SqlClient.ORACLE) { + query = query[fnc]( + `COALESCE(${quotedIdentifier(this.client, key)}, -1) = ?`, + [value] + ) } else { query = query[fnc]( `COALESCE(${quotedIdentifier(this.client, key)} = ?, FALSE)`, @@ -454,6 +459,11 @@ class InternalBuilder { )} = ? THEN 1 ELSE 0 END = 0`, [value] ) + } else if (this.client === SqlClient.ORACLE) { + query = query[fnc]( + `COALESCE(${quotedIdentifier(this.client, key)}, -1) != ?`, + [value] + ) } else { query = query[fnc]( `COALESCE(${quotedIdentifier(this.client, key)} != ?, TRUE)`, diff --git a/packages/backend-core/tests/core/utilities/structures/koa.ts b/packages/backend-core/tests/core/utilities/structures/koa.ts index 102fe029de..f9883dc1b9 100644 --- a/packages/backend-core/tests/core/utilities/structures/koa.ts +++ b/packages/backend-core/tests/core/utilities/structures/koa.ts @@ -2,7 +2,7 @@ import { createMockContext, createMockCookies } from "@shopify/jest-koa-mocks" import { BBContext } from "@budibase/types" export const newContext = (): BBContext => { - const ctx = createMockContext() + const ctx = createMockContext() as any return { ...ctx, path: "/", diff --git a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte index 2bfa7d39fd..0ba7de42c2 100644 --- a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte +++ b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte @@ -12,7 +12,6 @@ export let listItemKey export let draggable = true export let focus - export let bindings = [] let zoneType = generate() @@ -127,7 +126,6 @@ anchor={anchors[draggableItem.id]} item={draggableItem.item} {...listTypeProps} - {bindings} on:change={onItemChanged} /> diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte index 87a4174e60..17cb171da5 100644 --- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte +++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte @@ -64,7 +64,9 @@ items={columns.sortable} listItemKey={"_id"} listType={FieldSetting} - {bindings} + listTypeProps={{ + bindings, + }} />