fix(collection): respect default value in null fields

nuxt · Nov 28, 2024 · 9fdc4d6 · 9fdc4d6
1 parent 006c615
commit 9fdc4d6
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/utils/collection.ts b/src/utils/collection.ts
@@ -112,20 +112,28 @@ export function generateCollectionInsert(collection: ResolvedCollection, data: R
     if (!(defaultValue instanceof Date) && typeof defaultValue === 'object') {
       defaultValue = JSON.stringify(defaultValue)
     }
-    const valueToInsert = typeof data[key] !== 'undefined' ? data[key] : defaultValue
+    const valueToInsert = (typeof data[key] === 'undefined' || String(data[key]) === 'null')
+      ? defaultValue
+      : data[key]
 
     fields.push(key)
+
+    if (valueToInsert === 'NULL') {
+      values.push(valueToInsert)
+      return
+    }
+
     if ((collection.jsonFields || []).includes(key)) {
       values.push(`'${JSON.stringify(valueToInsert).replace(/'/g, '\'\'')}'`)
     }
     else if (['ZodString', 'ZodEnum'].includes(underlyingType.constructor.name)) {
       values.push(`'${String(valueToInsert).replace(/\n/g, '\\n').replace(/'/g, '\'\'')}'`)
     }
     else if (['ZodDate'].includes(underlyingType.constructor.name)) {
-      values.push(valueToInsert !== 'NULL' ? `'${new Date(valueToInsert as string).toISOString()}'` : defaultValue)
+      values.push(`'${new Date(valueToInsert as string).toISOString()}'`)
     }
     else if (underlyingType.constructor.name === 'ZodBoolean') {
-      values.push(valueToInsert !== 'NULL' ? !!valueToInsert : valueToInsert)
+      values.push(!!valueToInsert)
     }
     else {
       values.push(valueToInsert)