@platformatic/sql-mapper 1.45.1 → 1.47.0

package/lib/queries/shared.js

@@ -64,43 +64,48 @@ async function insertMany (db, sql, table, schema, inputs, inputToFieldMap, prim
 }
 
 function insertPrep (inputs, inputToFieldMap, fields, sql) {
-  const inputSet = new Set()
-  const values = []
-  for (const input of inputs) {
-    const inputValues = []
-    for (const key of Object.keys(input)) {
-      let newKey = key
-      if (inputToFieldMap[key] === undefined) {
-        if (fields[key] === undefined) {
-          throw new errors.UnknownFieldError(key)
-        }
-      } else {
-        newKey = inputToFieldMap[key]
-      }
+  const tableFields = Object.keys(fields)
+  const inputRaws = []
 
-      inputSet.add(newKey)
+  for (const input of inputs) {
+    for (const entityKey of Object.keys(input)) {
+      const field = inputToFieldMap[entityKey]
 
-      let value = input[key] ?? input[newKey]
+      if (field === undefined && fields[entityKey] === undefined) {
+        throw new errors.UnknownFieldError(entityKey)
+      }
+    }
 
-      if (value && !fields[newKey].isArray && typeof value === 'object' && !(value instanceof Date)) {
+    const inputValues = []
+    for (const field of tableFields) {
+      const fieldMetadata = fields[field]
+      const inputKey = fieldMetadata.camelcase
+
+      let inputValue = input[inputKey] ?? input[field]
+      if (
+        inputValue &&
+        typeof inputValue === 'object' &&
+        !fieldMetadata.isArray &&
+        !(inputValue instanceof Date)
+      ) {
         // This is a JSON field
-        value = JSON.stringify(value)
+        inputValue = JSON.stringify(inputValue)
       }
 
-      inputValues.push(sql.value(value))
+      if (inputValue !== undefined) {
+        inputValues.push(sql.value(inputValue))
+      } else {
+        inputValues.push(sql`DEFAULT`)
+      }
     }
-
-    values.push(sql` (${sql.join(
-      inputValues,
-      sql`, `
-    )})`)
+    inputRaws.push(sql` (${sql.join(inputValues, sql`, `)})`)
   }
-  const inputKeys = Array.from(inputSet)
   const keys = sql.join(
-    inputKeys.map((key) => sql.ident(key)),
+    tableFields.map((key) => sql.ident(key)),
     sql`, `
   )
-  return { keys, values }
+
+  return { keys, values: inputRaws }
 }
 
 async function updateMany (db, sql, table, schema, criteria, input, fieldsToRetrieve) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "1.45.1",
+  "version": "1.47.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -16,7 +16,7 @@
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
     "@matteo.collina/tspl": "^0.1.1",
-    "borp": "^0.14.0",
+    "borp": "^0.15.0",
     "fastify": "^4.26.2",
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",
@@ -33,7 +33,7 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.1",
     "inflected": "^2.1.0",
-    "@platformatic/utils": "1.45.1"
+    "@platformatic/utils": "1.47.0"
   },
   "tsd": {
     "directory": "test/types"