feat: Enable path expression on Map type columns

db-service/lib/cqn2sql.js

@@ -540,6 +540,7 @@
       let sepsub = ''
       for (const key in row) {
         let val = row[key]
+        const type = elements[key]?.type
         if (val === undefined) continue
         const keyJSON = `${sepsub}${JSON.stringify(key)}:`
         if (!sepsub) sepsub = ','
@@ -741,7 +742,7 @@
     const managed = this._managed.slice(0, columns.length)
 
     const extractkeys = managed
-      .filter(c => keys.includes(c.name))
+      // .filter(c => keys.includes(c.name))
       .map(c => `${c.onInsert || c.sql} as ${this.quote(c.name)}`)
 
     const entity = this.name(q.target?.name || UPSERT.into.ref[0], q)
@@ -825,6 +826,7 @@
     const wrap = x.cast ? sql => `cast(${sql} as ${this.type4(x.cast)})` : sql => sql
     if (typeof x === 'string') throw cds.error`Unsupported expr: ${x}`
     if (x.param) return wrap(this.param(x))
+    if ('json' in x) return wrap(this.json(x))
     if ('ref' in x) return wrap(this.ref(x))
     if ('val' in x) return wrap(this.val(x))
     if ('func' in x) return wrap(this.func(x))
@@ -1000,6 +1002,20 @@
     return `(${list.map(e => this.expr(e))})`
   }
 
+  json(arg) {
+    const { props, elements, json } = arg
+    const { _convertInput } = this.class
+    let val = typeof json === 'string' ? json : (arg.json = JSON.stringify(json))
+    if (val[val.length - 1] === ',') val = arg.json = val.slice(0, -1) + ']'
+    if (val[val.length - 1] === '[') val = arg.json = val + ']'
+    this.values.push(val)
+    const extraction = props.map(p => {
+      const element = elements?.[p]
+      return this.managed_extract(p, element, a => element[_convertInput]?.(a, element) || a).extract
+    })
+    return `(SELECT ${extraction} FROM json_each(?))`
+  }
+
   /**
    * Renders a javascript string into a SQL string literal
    * @param {string} s
@@ -1055,6 +1071,7 @@
   managed(columns, elements) {
     const cdsOnInsert = '@cds.on.insert'
     const cdsOnUpdate = '@cds.on.update'
+    const cdsImmutable = '@Core.Immutable'
 
     const { _convertInput } = this.class
     // Ensure that missing managed columns are added
@@ -1075,6 +1092,10 @@
 
     const keys = ObjectKeys(elements).filter(e => elements[e].key && !elements[e].isAssociation)
     const keyZero = keys[0] && this.quote(keys[0])
+    const hasChanges = this.managed_changed(
+      [...columns, ...requiredColumns]
+        .filter(({ name }) => !elements?.[name]?.key && !elements?.[name]?.[cdsOnUpdate] && !elements?.[name]?.[cdsImmutable])
+    )
 
     return [...columns, ...requiredColumns].map(({ name, sql }) => {
       const element = elements?.[name] || {}
@@ -1097,21 +1118,22 @@
       if (onUpdate) onUpdate = this.expr(onUpdate)
 
       const qname = this.quote(name)
+      const immutable = element[cdsImmutable]
 
       const insert = onInsert ? this.managed_default(name, converter(onInsert), sql) : sql
-      const update = onUpdate ? this.managed_default(name, converter(onUpdate), sql) : sql
+      const update = immutable ? undefined : onUpdate ? this.managed_default(name, converter(onUpdate), sql) : sql
       const upsert = keyZero && (
         // upsert requires the keys to be provided for the existance join (default values optional)
         element.key
-          // If both insert and update have the same managed definition exclude the old value check
-          || (onInsert && onUpdate && insert === update)
           ? `${insert} as ${qname}`
           : `CASE WHEN OLD.${keyZero} IS NULL THEN ${
           // If key of old is null execute insert
           insert
           } ELSE ${
           // Else execute managed update or keep old if no new data if provided
-          onUpdate ? update : this.managed_default(name, `OLD.${qname}`, update)
+          !update
+            ? `OLD.${qname}`
+            : this.managed_default(name, `OLD.${qname}`, update)
           } END as ${qname}`
       )
 
@@ -1145,6 +1167,13 @@
   managed_default(name, managed, src) {
     return `(CASE WHEN json_type(value,${this.managed_extract(name).extract.slice(8)}) IS NULL THEN ${managed} ELSE ${src} END)`
   }
+
+  managed_changed(cols/*, comps*/) {
+    return `CASE WHEN ${[
+      ...cols.map(({ name }) => `json_type(value,${this.managed_extract(name).extract.slice(8)}) IS NOT NULL AND OLD.${this.quote(name)} ${this.is_distinct_from_} NEW.${this.quote(name)}`),
+      // ...comps.map(({ name }) => `json_type(value,${this.managed_extract(name).extract.slice(8)}) IS NOT NULL`)
+    ].join(' OR ')} THEN TRUE ELSE FALSE END`
+  }
 }
 
 Readable.prototype[require('node:util').inspect.custom] = Readable.prototype.toJSON = function () { return this._raw || `[object ${this.constructor.name}]` }

db-service/lib/deep-genres.sql

@@ -0,0 +1,126 @@
+-- DEBUG => this.dbc._native.prepare(cds.utils.fs.readFileSync(__dirname + '/deep-genres.sql','utf-8')).exec([JSON.stringify(query.UPDATE.data)])
+DO (IN JSON NCLOB => ?) BEGIN
+
+  -- Extract genres with a depth of 3 (like: '$.children[*].children[*]')
+  Genres = SELECT
+    NEW.name,
+    NEW."$.NAME",
+    NEW.descr,
+    NEW."$.DESCR",
+    NEW.ID,
+    NEW."$.ID",
+    NEW.parent_ID,
+    NEW."$.PARENT_ID",
+    NEW."$.CHILDREN"
+  FROM 
+    JSON_TABLE(
+      :JSON,
+      '$' COLUMNS(
+        name NVARCHAR(1020) PATH '$.name',
+        "$.NAME" NVARCHAR(2147483647) FORMAT JSON PATH '$.name',
+        descr NVARCHAR(4000) PATH '$.descr',
+        "$.DESCR" NVARCHAR(2147483647) FORMAT JSON PATH '$.descr',
+        ID INT PATH '$.ID',
+        "$.ID" NVARCHAR(2147483647) FORMAT JSON PATH '$.ID',
+        parent_ID INT PATH '$.parent_ID',
+        "$.PARENT_ID" NVARCHAR(2147483647) FORMAT JSON PATH '$.parent_ID',
+        "$.CHILDREN" NVARCHAR(2147483647) FORMAT JSON PATH '$.children'
+      )
+      ERROR ON ERROR
+    ) AS NEW
+      UNION ALL
+  SELECT
+    NEW.name,
+    NEW."$.NAME",
+    NEW.descr,
+    NEW."$.DESCR",
+    NEW.ID,
+    NEW."$.ID",
+    NEW.parent_ID,
+    NEW."$.PARENT_ID",
+    NEW."$.CHILDREN"
+  FROM 
+    JSON_TABLE(
+      :JSON,
+      '$.children[*]' COLUMNS(
+        name NVARCHAR(1020) PATH '$.name',
+        "$.NAME" NVARCHAR(2147483647) FORMAT JSON PATH '$.name',
+        descr NVARCHAR(4000) PATH '$.descr',
+        "$.DESCR" NVARCHAR(2147483647) FORMAT JSON PATH '$.descr',
+        ID INT PATH '$.ID',
+        "$.ID" NVARCHAR(2147483647) FORMAT JSON PATH '$.ID',
+        parent_ID INT PATH '$.parent_ID',
+        "$.PARENT_ID" NVARCHAR(2147483647) FORMAT JSON PATH '$.parent_ID',
+        "$.CHILDREN" NVARCHAR(2147483647) FORMAT JSON PATH '$.children'
+      )
+      ERROR ON ERROR
+    ) AS NEW
+  UNION ALL
+  SELECT
+    NEW.name,
+    NEW."$.NAME",
+    NEW.descr,
+    NEW."$.DESCR",
+    NEW.ID,
+    NEW."$.ID",
+    NEW.parent_ID,
+    NEW."$.PARENT_ID",
+    NEW."$.CHILDREN"
+  FROM 
+    JSON_TABLE(
+      :JSON,
+      '$.children[*].children[*]' COLUMNS(
+        name NVARCHAR(1020) PATH '$.name',
+        "$.NAME" NVARCHAR(2147483647) FORMAT JSON PATH '$.name',
+        descr NVARCHAR(4000) PATH '$.descr',
+        "$.DESCR" NVARCHAR(2147483647) FORMAT JSON PATH '$.descr',
+        ID INT PATH '$.ID',
+        "$.ID" NVARCHAR(2147483647) FORMAT JSON PATH '$.ID',
+        parent_ID INT PATH '$.parent_ID',
+        "$.PARENT_ID" NVARCHAR(2147483647) FORMAT JSON PATH '$.parent_ID',
+        "$.CHILDREN" NVARCHAR(2147483647) FORMAT JSON PATH '$.children'
+      )
+      ERROR ON ERROR
+    ) AS NEW;
+
+  -- DELETE all children of parents that are no longer in the dataset
+  DELETE FROM TestService_Genres WHERE
+    (parent_ID) IN (SELECT ID FROM :Genres WHERE "$.CHILDREN" IS NOT NULL)
+    AND
+    (ID) NOT IN (SELECT ID FROM :Genres);
+
+  -- UPSERT new deep genres entries
+  UPSERT sap_capire_bookshop_Genres (name, descr, ID, parent_ID)
+  SELECT
+    CASE
+        WHEN OLD.ID IS NULL THEN NEW.name
+        ELSE (
+            CASE
+                WHEN "$.NAME" IS NULL THEN OLD.name
+                ELSE NEW.name
+            END
+        )
+    END as name,
+    CASE
+        WHEN OLD.ID IS NULL THEN NEW.descr
+        ELSE (
+            CASE
+                WHEN "$.DESCR" IS NULL THEN OLD.descr
+                ELSE NEW.descr
+            END
+        )
+    END as descr,
+    NEW.ID as ID,
+    CASE
+        WHEN OLD.ID IS NULL THEN NEW.parent_ID
+        ELSE (
+            CASE
+                WHEN "$.PARENT_ID" IS NULL THEN OLD.parent_ID
+                ELSE NEW.parent_ID
+            END
+        )
+    END as parent_ID
+  FROM
+      :Genres AS NEW
+      LEFT JOIN sap_capire_bookshop_Genres AS OLD ON NEW.ID = OLD.ID;
+END;