fix: Support static conditions inside unmanaged associations (#682)

Co-authored-by: Johannes Vogel <[email protected]>
cap-js · Jun 17, 2024 · e17ddfd · e17ddfd
1 parent 85ecf08
commit e17ddfd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/hana/lib/HANAService.js b/hana/lib/HANAService.js
@@ -479,12 +479,10 @@ class HANAService extends SQLService {
                 expands[this.column_name(x)] = x.SELECT.one ? null : []
 
                 const parent = src
-                let fkeys = x.element._foreignKeys
-                if (typeof fkeys === 'function') fkeys = fkeys.call(x.element)
-                fkeys.forEach(k => {
-                  if (!k?.parentElement?.name) return // not all associations have foreign key references
-                  if (!parent.SELECT.columns.find(c => this.column_name(c) === k.parentElement.name)) {
-                    parent.SELECT.columns.push({ ref: [parent.as, k.parentElement.name] })
+                this.extractForeignKeys(x.SELECT.where, parent.as, []).forEach(ref => {
+                  const columnName = this.column_name(ref)
+                  if (!parent.SELECT.columns.find(c => this.column_name(c) === columnName)) {
+                    parent.SELECT.columns.push(ref)
                   }
                 })
 

diff --git a/test/compliance/SELECT.test.js b/test/compliance/SELECT.test.js
@@ -208,7 +208,7 @@ describe('SELECT', () => {
       const cqn = {
         SELECT: {
           from: { ref: ['complex.associations.unmanaged.Authors'] },
-          columns: [{ ref: ['ID'] }, { ref: ['static'], expand: ['*'] }]
+          columns: [{ ref: ['static'], expand: ['*'] }]
         },
       }
 

diff --git a/test/compliance/resources/db/complex/associationsUnmanaged.cds b/test/compliance/resources/db/complex/associationsUnmanaged.cds
@@ -11,5 +11,5 @@ entity Authors {
   key ID : Integer;
   name   : String(111);
   books  : Association to many Books on books.author = $self;
-  static  : Association to many Books on static.author = $self and static.ID > 0;
+  static  : Association to many Books on static.author = $self and static.ID > 0 and name != null;
 }