From cc2b18d711a0665aef3fd91841db24d00a99d467 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Fri, 27 Nov 2020 20:53:51 -0500 Subject: [PATCH] Cas't string default value NULL to null Fixes #2924 --- api/src/utils/get-default-value.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/utils/get-default-value.ts b/api/src/utils/get-default-value.ts index 459183d822..bd3ab24280 100644 --- a/api/src/utils/get-default-value.ts +++ b/api/src/utils/get-default-value.ts @@ -9,12 +9,14 @@ export default function getDefaultValue( let defaultValue = column.default_value || null; if (defaultValue === null) return null; + if (defaultValue === 'null') return null; + if (defaultValue === 'NULL') return null; // Check if the default is wrapped in an extra pair of quotes, this happens in SQLite if ( typeof defaultValue === 'string' && - defaultValue.startsWith(`'`) && - defaultValue.endsWith(`'`) + ((defaultValue.startsWith(`'`) && defaultValue.endsWith(`'`)) || + (defaultValue.startsWith(`"`) && defaultValue.endsWith(`"`))) ) { defaultValue = defaultValue.slice(1, -1); }