support update / delete

Author: patricebender

db-service/lib/cqn4sql.js

@@ -83,10 +83,10 @@ function cqn4sql(originalQuery, model) {
       transformedProp.where = getTransformedTokenStream(where)
     }
 
+    const queryNeedsJoins = inferred.joinTree && !inferred.joinTree.isInitial
     // Transform the from clause: association path steps turn into `WHERE EXISTS` subqueries.
     // The already transformed `where` clause is then glued together with the resulting subqueries.
     const { transformedWhere, transformedFrom } = getTransformedFrom(from || entity, transformedProp.where)
-    const queryNeedsJoins = inferred.joinTree && !inferred.joinTree.isInitial
 
     if (inferred.SELECT) {
       transformedQuery = transformSelectQuery(queryProp, transformedFrom, transformedWhere, transformedQuery)
@@ -1721,8 +1721,13 @@ function cqn4sql(originalQuery, model) {
       }
 
       // only append infix filter to outer where if it is the leaf of the from ref
-      if (refReverse[0].where)
-        filterConditions.push(getTransformedTokenStream(refReverse[0].where, $refLinksReverse[0]))
+      if (refReverse[0].where) {
+        const whereIsTransformedLater = (inferred.joinTree && !inferred.joinTree.isInitial) && (originalQuery.DELETE || originalQuery.UPDATE)
+        if (whereIsTransformedLater)
+          filterConditions.push(refReverse[0].where)
+        else
+          filterConditions.push(getTransformedTokenStream(refReverse[0].where, $refLinksReverse[0]))
+      }
 
       if (existingWhere.length > 0) filterConditions.push(existingWhere)
       if (whereExistsSubSelects.length > 0) {

db-service/test/cqn4sql/where-exists.test.js

@@ -1720,4 +1720,71 @@ describe('path expression within infix filter following exists predicate', () =>
       )`,
     )
   })
+
+  it('renders inner joins for the path expression at the leaf of scoped queries (DELETE)', () => {
+    // subquery has flat author_ID, which is not part of client csn
+    const forNodeModel = cds.compile.for.nodejs(JSON.parse(JSON.stringify(cds.model)))
+    let query = DELETE.from('bookshop.Authors:books[genre.name = null]')
+
+    const transformed = cqn4sql(query, forNodeModel)
+    const subquery = cds.ql`
+      SELECT books.ID from bookshop.Books as books
+        inner join bookshop.Genres as genre on genre.ID = books.genre_ID
+      WHERE EXISTS (
+        SELECT 1 from bookshop.Authors as Authors where Authors.ID = books.author_ID
+      ) and genre.name = null`
+    const expected = DELETE.from('bookshop.Books').alias('books2')
+    expected.DELETE.where = [ { list: [ {ref: ['books2', 'ID'] }] }, 'in', subquery ]
+    expect(transformed).to.deep.equal( expected )
+  })
+  it('renders inner joins for the path expression at the leaf of scoped queries, two assocs (DELETE)', () => {
+    // subquery has flat author_ID, which is not part of client csn
+    const forNodeModel = cds.compile.for.nodejs(JSON.parse(JSON.stringify(cds.model)))
+    let query = DELETE.from('bookshop.Authors:books[genre.parent.name = null]')
+
+    const transformed = cqn4sql(query, forNodeModel)
+    const subquery = cds.ql`
+      SELECT books.ID from bookshop.Books as books
+        inner join bookshop.Genres as genre on genre.ID = books.genre_ID
+        inner join bookshop.Genres as parent on parent.ID = genre.parent_ID
+      WHERE EXISTS (
+        SELECT 1 from bookshop.Authors as Authors where Authors.ID = books.author_ID
+      ) and parent.name = null`
+    const expected = DELETE.from('bookshop.Books').alias('books2')
+    expected.DELETE.where = [ { list: [ {ref: ['books2', 'ID'] }] }, 'in', subquery ]
+    expect(transformed).to.deep.equal( expected )
+  })
+  it('renders inner joins for the path expression at the leaf of scoped queries (UPDATE)', () => {
+    // subquery has flat author_ID, which is not part of client csn
+    const forNodeModel = cds.compile.for.nodejs(JSON.parse(JSON.stringify(cds.model)))
+    let query = UPDATE.entity('bookshop.Authors:books[genre.name = null]')
+
+    const transformed = cqn4sql(query, forNodeModel)
+    const subquery = cds.ql`
+      SELECT books.ID from bookshop.Books as books
+        inner join bookshop.Genres as genre on genre.ID = books.genre_ID
+      WHERE EXISTS (
+        SELECT 1 from bookshop.Authors as Authors where Authors.ID = books.author_ID
+      ) and genre.name = null`
+    const expected = UPDATE.entity('bookshop.Books').alias('books2')
+    expected.UPDATE.where = [ { list: [ {ref: ['books2', 'ID'] }] }, 'in', subquery ]
+    expect(transformed).to.deep.equal( expected )
+  })
+  it('renders inner joins for the path expression at the leaf of scoped queries, two assocs (DELETE)', () => {
+    // subquery has flat author_ID, which is not part of client csn
+    const forNodeModel = cds.compile.for.nodejs(JSON.parse(JSON.stringify(cds.model)))
+    let query = UPDATE.entity('bookshop.Authors:books[genre.parent.name = null]')
+
+    const transformed = cqn4sql(query, forNodeModel)
+    const subquery = cds.ql`
+      SELECT books.ID from bookshop.Books as books
+        inner join bookshop.Genres as genre on genre.ID = books.genre_ID
+        inner join bookshop.Genres as parent on parent.ID = genre.parent_ID
+      WHERE EXISTS (
+        SELECT 1 from bookshop.Authors as Authors where Authors.ID = books.author_ID
+      ) and parent.name = null`
+    const expected = UPDATE.entity('bookshop.Books').alias('books2')
+    expected.UPDATE.where = [ { list: [ {ref: ['books2', 'ID'] }] }, 'in', subquery ]
+    expect(transformed).to.deep.equal( expected )
+  })
 })