Skip to content

Commit e6285cb

Browse files
chore(tests): replace CQL with cds.ql (#1075)
Used search & replace to resolve ```shell > q = CQL`SELECT from ${Books}` ------------------------------------------------------------------------------ DEPRECATED: CQL Global constant CQL is deprecated and will be removed in upcoming releases! => Please use cds.parse.cql instead. at REPL1:1:8 at ContextifyScript.runInThisContext (node:vm:121:12) at REPLServer.defaultEval (node:repl:599:22) at bound (node:domain:432:15) at REPLServer.runBound [as eval] (node:domain:443:12) at REPLServer.onLine (node:repl:929:10) at REPLServer.emit (node:events:518:28) at REPLServer.emit (node:domain:488:12) at [_onLine] [as _onLine] (node:internal/readline/interface:416:12) ```
1 parent a9b4d8c commit e6285cb

40 files changed

+1678
-1678
lines changed

db-service/test/cds-infer/api.test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('infer elements', () => {
1616

1717
describe('all query elements are linked', () => {
1818
it('expands and inlines are linked', () => {
19-
let query = CQL`SELECT from bookshop.Books {
19+
let query = cds.ql`SELECT from bookshop.Books {
2020
ID,
2121
author as expandOnAssoc { * },
2222
dedication as expandOnStruct { * },
@@ -29,7 +29,7 @@ describe('infer elements', () => {
2929
})
3030
})
3131
it('values / functions / expr with type are linked', () => {
32-
let query = CQL`SELECT from bookshop.Books {
32+
let query = cds.ql`SELECT from bookshop.Books {
3333
1,
3434
true,
3535
'foo',
@@ -45,7 +45,7 @@ describe('infer elements', () => {
4545
})
4646

4747
it('element has the same name as the query alias', () => {
48-
let query = CQL`SELECT from bookshop.Books as dedication { ID, dedication.dedication.text }`
48+
let query = cds.ql`SELECT from bookshop.Books as dedication { ID, dedication.dedication.text }`
4949
let inferred = _inferred(query)
5050
let { Books } = model.entities
5151
expect(inferred.elements).to.deep.equal({
@@ -55,7 +55,7 @@ describe('infer elements', () => {
5555
})
5656

5757
it('infer inferred query multiple times', () => {
58-
let query = CQL`SELECT from bookshop.Books as dedication { ID, dedication.dedication.text }`
58+
let query = cds.ql`SELECT from bookshop.Books as dedication { ID, dedication.dedication.text }`
5959
let inferred = _inferred(query)
6060
let inferredInferred = _inferred(inferred)
6161
expect(inferred).to.eql(inferredInferred)
@@ -66,7 +66,7 @@ describe('infer elements', () => {
6666
const keepModel = cds.model
6767
cds.model = null
6868
// subsequent infer calls should always use explicitly passed model parameter
69-
let query = CQL`SELECT from bookshop.Books { ID, (SELECT from bookshop.Books) as triggerRecursiveInfer }`
69+
let query = cds.ql`SELECT from bookshop.Books { ID, (SELECT from bookshop.Books) as triggerRecursiveInfer }`
7070
let inferred = _inferred(query, model)
7171
let { Books } = model.entities
7272
expect(inferred.elements).to.deep.equal({

db-service/test/cds-infer/calculated-elements.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('Infer types of calculated elements in select list', () => {
1111
})
1212
it('calc element has type or has cast', () => {
1313
let inferred = _inferred(
14-
CQL`SELECT from booksCalc.Books {
14+
cds.ql`SELECT from booksCalc.Books {
1515
ID,
1616
area,
1717
area as strArea : String,
@@ -33,7 +33,7 @@ describe('Infer types of calculated elements in select list', () => {
3333
})
3434
it('calc elements via wildcard', () => {
3535
let inferred = _inferred(
36-
CQL`SELECT from booksCalc.Books { * } excluding { length, width, height, stock, price}`,
36+
cds.ql`SELECT from booksCalc.Books { * } excluding { length, width, height, stock, price}`,
3737
model,
3838
)
3939
let { Books } = model.entities

db-service/test/cds-infer/column.element.test.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('assign element onto columns', () => {
2020

2121
describe('assigns element property for path expressions', () => {
2222
it('along simple association', () => {
23-
let query = CQL`SELECT from bookshop.Books { ID, currency.code }`
23+
let query = cds.ql`SELECT from bookshop.Books { ID, currency.code }`
2424
let inferred = _inferred(query)
2525
let { Books } = model.entities
2626
// ID
@@ -32,7 +32,7 @@ describe('assign element onto columns', () => {
3232
})
3333

3434
it('with filter conditions', () => {
35-
let query = CQL`SELECT from bookshop.Books { dedication.addressee[placeOfBirth <> 'foo'].name, dedication.addressee.name as nameWithoutFilter }`
35+
let query = cds.ql`SELECT from bookshop.Books { dedication.addressee[placeOfBirth <> 'foo'].name, dedication.addressee.name as nameWithoutFilter }`
3636
let inferred = _inferred(query)
3737
let { Books } = model.entities
3838
// dedication_addressee_name
@@ -48,7 +48,7 @@ describe('assign element onto columns', () => {
4848

4949
describe('literals', () => {
5050
it('should allow selecting simple literal values', () => {
51-
const inferred = _inferred(CQL`
51+
const inferred = _inferred(cds.ql`
5252
SELECT 11, 'foo', true, false from bookshop.Books
5353
`)
5454
// '11'
@@ -72,7 +72,7 @@ describe('assign element onto columns', () => {
7272

7373
describe('virtual', () => {
7474
it("infers a query's virtual elements", () => {
75-
let query = CQL`SELECT from bookshop.Foo { ID, virtualField }`
75+
let query = cds.ql`SELECT from bookshop.Foo { ID, virtualField }`
7676
let inferred = _inferred(query)
7777
let { Foo } = model.entities
7878
expect(inferred.elements).to.deep.equal({
@@ -90,7 +90,7 @@ describe('assign element onto columns', () => {
9090

9191
describe('scoped queries', () => {
9292
it('use table alias of scoped query (assoc defined via type reference)', () => {
93-
let inferred = _inferred(CQL`SELECT from bookshop.Books:coAuthor {
93+
let inferred = _inferred(cds.ql`SELECT from bookshop.Books:coAuthor {
9494
coAuthor.name as name
9595
}`)
9696
let { Authors } = model.entities
@@ -106,7 +106,7 @@ describe('assign element onto columns', () => {
106106
})
107107
describe('subqueries', () => {
108108
it('supports expressions and subqueries in the select list', () => {
109-
let query = CQL`
109+
let query = cds.ql`
110110
SELECT from bookshop.Books {
111111
1 + 1 as Two,
112112
(select from bookshop.Authors { name }) as subquery
@@ -128,7 +128,7 @@ describe('assign element onto columns', () => {
128128
})
129129
describe('expressions', () => {
130130
it('anonymous functions are inferred by their func property name', () => {
131-
let functionWithoutAlias = CQL`SELECT from bookshop.Books { sum(1 + 1), count(*) }`
131+
let functionWithoutAlias = cds.ql`SELECT from bookshop.Books { sum(1 + 1), count(*) }`
132132
const inferred = _inferred(functionWithoutAlias)
133133
// 'sum'
134134
expect(inferred.SELECT.columns[0].element).to.deep.equal(inferred.elements['sum']).to.deep.equal({})
@@ -137,7 +137,7 @@ describe('assign element onto columns', () => {
137137
})
138138

139139
it('supports an expression with fields in the select list', () => {
140-
let query = CQL`SELECT from bookshop.Books { title + descr as noType }`
140+
let query = cds.ql`SELECT from bookshop.Books { title + descr as noType }`
141141
let inferred = _inferred(query)
142142
// 'noType'
143143
expect(inferred.SELECT.columns[0].element).to.deep.equal(inferred.elements['noType']).to.deep.equal({})
@@ -158,7 +158,7 @@ describe('assign element onto columns', () => {
158158
})
159159

160160
it('supports a cast expression in the select list', () => {
161-
let query = CQL`SELECT from bookshop.Books {
161+
let query = cds.ql`SELECT from bookshop.Books {
162162
cast(cast(ID as Integer) as String) as IDS,
163163
cast(ID as bookshop.DerivedFromDerivedString) as IDCustomType
164164
}`
@@ -174,7 +174,7 @@ describe('assign element onto columns', () => {
174174
})
175175

176176
it('supports a cdl-style cast in the select list', () => {
177-
let query = CQL`
177+
let query = cds.ql`
178178
SELECT from bookshop.Books {
179179
dedication.sub.foo: Integer,
180180
ID as IDS: String,
@@ -211,7 +211,7 @@ describe('assign element onto columns', () => {
211211
},
212212
},
213213
}
214-
let query = CQL`SELECT from bookshop.Bar {
214+
let query = cds.ql`SELECT from bookshop.Bar {
215215
$user,
216216
$user.tenant,
217217
$user.unknown.foo.bar,
@@ -234,7 +234,7 @@ describe('assign element onto columns', () => {
234234

235235
describe('binding params', () => {
236236
it('put binding parameter into query elements as empty object', () => {
237-
const query = CQL`
237+
const query = cds.ql`
238238
SELECT from bookshop.Books {
239239
ID,
240240
? as discount
@@ -245,7 +245,7 @@ describe('assign element onto columns', () => {
245245
expect(inferred.SELECT.columns[1].element).to.deep.equal(inferred.elements['discount']).to.deep.equal({})
246246
})
247247
it('respect cast type on binding parameter', () => {
248-
const query = CQL`
248+
const query = cds.ql`
249249
SELECT from bookshop.Books {
250250
ID,
251251
? as discount: Integer

0 commit comments

Comments
 (0)