@sap/cds 6.3.2 → 6.4.0

package/libx/_runtime/db/sql-builder/UpsertBuilder.js

@@ -0,0 +1,47 @@
+const InsertBuilder = require('./InsertBuilder')
+const getAnnotatedColumns = require('./annotations')
+
+class UpsertBuilder extends InsertBuilder {
+  constructor(obj, options, csn) {
+    super(obj, options, csn)
+  }
+
+  // REVISIT: We need to copy over the implementation for annotation handling
+  build() {
+    this._outputObj = {
+      sql: ['UPSERT'],
+      values: []
+    }
+    this._obj = { INSERT: this._obj.UPSERT, _target: this._obj._target }
+
+    const entityName = this._into()
+
+    this._columnIndexesToDelete = []
+    const annotatedColumns = getAnnotatedColumns(entityName, this._csn)
+    // hack: treat update annotations as insert because of sql builder impl
+    if (annotatedColumns) {
+      annotatedColumns.insertAnnotatedColumns = annotatedColumns.updateAnnotatedColumns
+    }
+
+    if (this._obj.INSERT.columns) {
+      this._removeAlreadyExistingInsertAnnotatedColumnsFromMap(annotatedColumns)
+      this._columns(annotatedColumns)
+    }
+
+    if (this._obj.INSERT.values || this._obj.INSERT.rows) {
+      if (annotatedColumns && !this._obj.INSERT.columns) {
+        // if columns not provided get indexes from csn
+        this._getAnnotatedColumnIndexes(annotatedColumns)
+      }
+
+      this._values(annotatedColumns)
+    } else if (this._obj.INSERT.entries && this._obj.INSERT.entries.length !== 0) {
+      this._entries(annotatedColumns)
+    }
+
+    this._outputObj.sql = this._outputObj.sql.join(' ') + ' WITH PRIMARY KEY'
+    return this._outputObj
+  }
+}
+
+module.exports = UpsertBuilder

package/libx/_runtime/db/sql-builder/index.js

@@ -3,6 +3,7 @@ const DropBuilder = require('./DropBuilder')
 const SelectBuilder = require('./SelectBuilder')
 const InsertBuilder = require('./InsertBuilder')
 const UpdateBuilder = require('./UpdateBuilder')
+const UpsertBuilder = require('./UpsertBuilder')
 const DeleteBuilder = require('./DeleteBuilder')
 const ExpressionBuilder = require('./ExpressionBuilder')
 const ReferenceBuilder = require('./ReferenceBuilder')
@@ -18,6 +19,7 @@ module.exports = {
   SelectBuilder,
   InsertBuilder,
   UpdateBuilder,
+  UpsertBuilder,
   DeleteBuilder,
   ExpressionBuilder,
   ReferenceBuilder,

package/libx/_runtime/db/sql-builder/sqlFactory.js

@@ -2,6 +2,7 @@ const DeleteBuilder = require('./DeleteBuilder')
 const InsertBuilder = require('./InsertBuilder')
 const SelectBuilder = require('./SelectBuilder')
 const UpdateBuilder = require('./UpdateBuilder')
+const UpsertBuilder = require('./UpsertBuilder')
 const CreateBuilder = require('./CreateBuilder')
 const DropBuilder = require('./DropBuilder')
 
@@ -16,6 +17,10 @@ const _getCustomBuilderIfExists = (options, type) => {
         return options.customBuilder.UpdateBuilder
       }
 
+      case 'UPSERT': {
+        return options.customBuilder.UpsertBuilder
+      }
+
       case 'DELETE': {
         return options.customBuilder.DeleteBuilder
       }
@@ -77,6 +82,10 @@ const build = (cqn, options, csn) => {
     return build(_getCustomBuilderIfExists(options, 'UPDATE') || UpdateBuilder)
   }
 
+  if (cqn.UPSERT) {
+    return build(_getCustomBuilderIfExists(options, 'UPSERT') || UpsertBuilder)
+  }
+
   if (cqn.DELETE) {
     return build(_getCustomBuilderIfExists(options, 'DELETE') || DeleteBuilder)
   }

package/libx/_runtime/db/utils/columns.js

@@ -16,12 +16,14 @@ const getColumns = (entity, { _4db, onlyKeys } = { _4db: true, onlyKeys: false }
   if (!(entity && entity.elements)) return []
   const columnNames = []
   // REVISIT!!!
-  const elements = Object.getPrototypeOf(entity.elements) || entity.elements
+  const elements = cds.env.features.lean_draft
+    ? entity.elements
+    : Object.getPrototypeOf(entity.elements) || entity.elements
   for (const elementName in elements) {
     const element = elements[elementName]
     if (onlyKeys && !element.key) continue
     if (element.isAssociation) continue
-    if (_4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
+    if (!cds.env.features.lean_draft && _4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
     if ((cds.env.effective.odata.structs || cds.env.features.ucsn_struct_conversion) && element.elements) {
       columnNames.push(...resolveStructured({ element, structProperties: [] }, false))
       continue

package/libx/_runtime/fiori/generic/read.js

@@ -714,16 +714,6 @@ const _getSiblingScenario = (req, columns, model, siblingIndex, nav) => {
   const _getSiblingQueryFromWhere = (query, queryIndex, parentQuery) => {
     if (query.SELECT && query.SELECT.where && queryIndex > 0) {
       for (let i = 0; i < query.SELECT.where.length; i++) {
-        if (query.SELECT.where[i].xpr && queryIndex > 0) {
-          const sibilingQueryFromWhere = _getSiblingQueryFromWhere(
-            { SELECT: { where: query.SELECT.where[i].xpr } },
-            queryIndex - 1,
-            query
-          )
-
-          if (sibilingQueryFromWhere) return sibilingQueryFromWhere
-        }
-
         if (query.SELECT.where[i] === 'exists' && queryIndex > 0) {
           return _getSiblingQueryFromWhere(query.SELECT.where[i + 1], queryIndex - 1, query)
         }
@@ -757,7 +747,6 @@ const _replaceWhereExists = (query, _siblingIndex, siblingCQN) => {
 
       const indexExists = query.SELECT.where.indexOf('exists')
       if (indexExists > -1) {
-        if (_siblingIndex > 0) return _replaceWhereExists(query.SELECT.where[indexExists + 1], _siblingIndex - 1)
         query.SELECT.where.splice(indexExists + 1, 1, siblingCQN)
       }
     }
@@ -1019,7 +1008,7 @@ const _generateCQN = (req, columns, from, model) => {
   let siblingIndex = nav.indexOf('SiblingEntity')
 
   // it can also be a property access (new parser), then we must shift it
-  if (siblingIndex === 1 && req.target.elements[nav[0]]) {
+  if (siblingIndex > 0 && req.target.elements[nav[0]] && !req.target.elements[nav[0]].isAssociation) {
     nav.shift()
     siblingIndex = siblingIndex - 1
   }