From 4c7d30e702cc1d76b44666fd957b71435b5760a4 Mon Sep 17 00:00:00 2001 From: mertmit Date: Tue, 17 Jan 2023 00:59:01 +0300 Subject: [PATCH] fix: isPg, isMysql calls Signed-off-by: mertmit --- packages/nc-gui/components/cell/MultiSelect.vue | 4 ++-- packages/nc-gui/components/cell/SingleSelect.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index 049549033e..af4d465b20 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -224,7 +224,7 @@ async function addIfMissingAndSave() { // todo: refactor and avoid repetition if (updatedColMeta.cdf) { // Postgres returns default value wrapped with single quotes & casted with type so we have to get value between single quotes to keep it unified for all databases - if (isPg.value) { + if (isPg(column.value.base_id)) { updatedColMeta.cdf = updatedColMeta.cdf.substring( updatedColMeta.cdf.indexOf(`'`) + 1, updatedColMeta.cdf.lastIndexOf(`'`), @@ -232,7 +232,7 @@ async function addIfMissingAndSave() { } // Mysql escapes single quotes with backslash so we keep quotes but others have to unescaped - if (!isMysql.value) { + if (!isMysql(column.value.base_id)) { updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'") } } diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index 521b1e3657..149e9764c9 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -147,7 +147,7 @@ async function addIfMissingAndSave() { // todo: refactor and avoid repetition if (updatedColMeta.cdf) { // Postgres returns default value wrapped with single quotes & casted with type so we have to get value between single quotes to keep it unified for all databases - if (isPg.value) { + if (isPg(column.value.base_id)) { updatedColMeta.cdf = updatedColMeta.cdf.substring( updatedColMeta.cdf.indexOf(`'`) + 1, updatedColMeta.cdf.lastIndexOf(`'`), @@ -155,7 +155,7 @@ async function addIfMissingAndSave() { } // Mysql escapes single quotes with backslash so we keep quotes but others have to unescaped - if (!isMysql.value) { + if (!isMysql(column.value.base_id)) { updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'") } }