b.santos/cloud-cap-samples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #282 from SAP-samples/ql-changes

Browse Source 
Changes in ql for cds version 5.6.0
This commit is contained in:
Dr. David A. Kunz
2021-10-26 11:32:09 +02:00
committed by GitHub
parent 139d957495 5f1b7b8cbf
commit ff9bbe6d8d
1 changed files with 77 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
test/cds.ql.test.js
View File

@@ -86,14 +86,24 @@ describe('cds.ql → cqn', () => {
.to.eql(SELECT.from(Foo,{ID:11})) .to.eql(SELECT.from(Foo,{ID:11}))
.to.eql(SELECT.from(Foo).byKey(11)) .to.eql(SELECT.from(Foo).byKey(11))
.to.eql(SELECT.from(Foo).byKey({ID:11})) .to.eql(SELECT.from(Foo).byKey({ID:11}))
expect.one(cqn) if (cds.version >= '5.6.0') {
.to.eql({ expect.one(cqn)
SELECT: { .to.eql({
one: true, SELECT: {
from: { ref: ['Foo'] }, one: true,
where: [{ ref: ['ID'] }, '=', { val: 11 }], ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }],
}, },
}) })
} else {
expect.one(cqn)
.to.eql({
SELECT: {
one: true,
from: { ref: ['Foo'] },
where: [{ ref: ['ID'] }, '=', { val: 11 }],
},
})
}
}) })
@@ -131,15 +141,27 @@ describe('cds.ql → cqn', () => {
// Test combination with key as second argument to .from // Test combination with key as second argument to .from
expect(cqn = SELECT.from(Foo, 11, ['a'])) expect(cqn = SELECT.from(Foo, 11, ['a']))
.to.eql(SELECT.from(Foo, 11, foo => foo.a)) .to.eql(SELECT.from(Foo, 11, foo => foo.a))
expect.one(cqn)
.to.eql({ if (cds.version >= '5.6.0') {
SELECT: { expect.one(cqn)
one: true, .to.eql({
from: { ref: ['Foo'] }, SELECT: {
columns: [{ ref: ['a'] }], one: true,
where: [{ ref: ['ID'] }, '=', { val: 11 }], from: { ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }]}] },
}, columns: [{ ref: ['a'] }]
}) },
})
} else {
expect.one(cqn)
.to.eql({
SELECT: {
one: true,
from: { ref: ['Foo'] },
columns: [{ ref: ['a'] }],
where: [{ ref: ['ID'] }, '=', { val: 11 }],
},
})
}
}) })
@@ -551,21 +573,31 @@ describe('cds.ql → cqn', () => {
describe(`UPDATE...`, () => { describe(`UPDATE...`, () => {
test('entity (..., <key>)', () => { test('entity (..., <key>)', () => {
expect(UPDATE(Books, 4711)) const cqnWhere = {
.to.eql(UPDATE(Books, { ID: 4711 }))
.to.eql(UPDATE(Books).byKey(4711))
.to.eql(UPDATE(Books).byKey({ ID: 4711 }))
.to.eql(UPDATE(Books).where({ ID: 4711 }))
.to.eql(UPDATE(Books).where(`ID=`, 4711))
.to.eql(UPDATE.entity(Books, 4711))
.to.eql(UPDATE.entity(Books, { ID: 4711 }))
// etc...
.to.eql({
UPDATE: { UPDATE: {
entity: 'capire.bookshop.Books', entity: 'capire.bookshop.Books',
where: [{ ref: ['ID'] }, '=', { val: 4711 }], where: [{ ref: ['ID'] }, '=', { val: 4711 }],
}, },
}) }
expect(UPDATE(Books).where({ ID: 4711 }))
.to.eql(UPDATE(Books).where(`ID=`, 4711))
.to.eql(cqnWhere)
const cqnKey = (cds.version >= '5.6.0') ?
{
UPDATE: {
entity: { ref: [{ id: 'capire.bookshop.Books', where: [{ ref: ['ID'] }, '=', { val: 4711 }] }] }
}
}
: cqnWhere
expect(UPDATE(Books, 4711))
.to.eql(UPDATE(Books, { ID: 4711 }))
.to.eql(UPDATE(Books).byKey(4711))
.to.eql(UPDATE(Books).byKey({ ID: 4711 }))
.to.eql(UPDATE.entity(Books, 4711))
.to.eql(UPDATE.entity(Books, { ID: 4711 }))
// etc...
.to.eql(cqnKey)
}) })
/* /*
@@ -616,20 +648,29 @@ describe('cds.ql → cqn', () => {
describe(`DELETE...`, () => { describe(`DELETE...`, () => {
test('from (..., <key>)', () => { test('from (..., <key>)', () => {
const cqnWhere = {
DELETE: {
from: 'capire.bookshop.Books',
where: [{ ref: ['ID'] }, '=', { val: 4711 }],
},
}
expect(DELETE.from(Books).where({ ID: 4711 }))
.to.eql(DELETE.from(Books).where(`ID=`, 4711))
.to.eql(cqnWhere)
const cqnKey = (cds.version >= '5.6.0') ?
{
DELETE: {
from: { ref: [{ id: 'capire.bookshop.Books', where: [{ ref: ['ID'] }, '=', { val: 4711 }]}] }
},
} : cqnWhere
expect(DELETE(Books, 4711)) expect(DELETE(Books, 4711))
.to.eql(DELETE(Books, { ID: 4711 })) .to.eql(DELETE(Books, { ID: 4711 }))
.to.eql(DELETE.from(Books, 4711)) .to.eql(DELETE.from(Books, 4711))
.to.eql(DELETE.from(Books, { ID: 4711 })) .to.eql(DELETE.from(Books, { ID: 4711 }))
.to.eql(DELETE.from(Books).byKey(4711)) .to.eql(DELETE.from(Books).byKey(4711))
.to.eql(DELETE.from(Books).byKey({ ID: 4711 })) .to.eql(DELETE.from(Books).byKey({ ID: 4711 }))
.to.eql(DELETE.from(Books).where({ ID: 4711 })) .to.eql(cqnKey)
.to.eql(DELETE.from(Books).where(`ID=`, 4711))
.to.eql({
DELETE: {
from: 'capire.bookshop.Books',
where: [{ ref: ['ID'] }, '=', { val: 4711 }],
},
})
}) })
test('/w plain SQL', () => { test('/w plain SQL', () => {