Browse Source

fix(gui): check default value defined or not

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/4459/head
Pranav C 2 years ago
parent
commit
12a95968ba
  1. 2
      packages/nc-gui/components/cell/MultiSelect.vue
  2. 2
      packages/nc-gui/components/cell/SingleSelect.vue

2
packages/nc-gui/components/cell/MultiSelect.vue

@ -209,6 +209,7 @@ async function addIfMissingAndSave() {
const updatedColMeta = { ...column.value } const updatedColMeta = { ...column.value }
// todo: refactor and avoid repetition // 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 // 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.value) {
updatedColMeta.cdf = updatedColMeta.cdf.substring( updatedColMeta.cdf = updatedColMeta.cdf.substring(
@ -221,6 +222,7 @@ async function addIfMissingAndSave() {
if (!isMysql.value) { if (!isMysql.value) {
updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'") updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'")
} }
}
await $api.dbTableColumn.update( await $api.dbTableColumn.update(
(column.value as { fk_column_id?: string })?.fk_column_id || (column.value?.id as string), (column.value as { fk_column_id?: string })?.fk_column_id || (column.value?.id as string),

2
packages/nc-gui/components/cell/SingleSelect.vue

@ -132,6 +132,7 @@ async function addIfMissingAndSave() {
const updatedColMeta = { ...column.value } const updatedColMeta = { ...column.value }
// todo: refactor and avoid repetition // 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 // 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.value) {
updatedColMeta.cdf = updatedColMeta.cdf.substring( updatedColMeta.cdf = updatedColMeta.cdf.substring(
@ -144,6 +145,7 @@ async function addIfMissingAndSave() {
if (!isMysql.value) { if (!isMysql.value) {
updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'") updatedColMeta.cdf = updatedColMeta.cdf.replace(/''/g, "'")
} }
}
await $api.dbTableColumn.update( await $api.dbTableColumn.update(
(column.value as { fk_column_id?: string })?.fk_column_id || (column.value?.id as string), (column.value as { fk_column_id?: string })?.fk_column_id || (column.value?.id as string),

Loading…
Cancel
Save