Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: sort property is case insensitive #924

Merged
merged 3 commits into from
Dec 5, 2024
+18 −6
Merged

fix: sort property is case insensitive #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dedd4df
fix: sort property is case insensitive
patricebender Nov 29, 2024
ab79412
fix the issue
patricebender Nov 29, 2024
a7b4fdb
Merge branch 'main' into patrice/sort
patricebender Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions db-service/lib/cqn2sql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,8 @@ class CQN2SQLRenderer {
? c =>
this.expr(c) +
(c.element?.[this.class._localized] ? ' COLLATE NOCASE' : '') +
(c.sort === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
: c => this.expr(c) + (c.sort === 'desc' || c.sort === -1 ? ' DESC' : ' ASC'),
(c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
: c => this.expr(c) + (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC'),
)
}

Expand Down
4 changes: 2 additions & 2 deletions hana/lib/HANAService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,8 @@ SELECT ${mixing} FROM JSON_TABLE(SRC.JSON, '$' COLUMNS(${extraction})) AS NEW LE
? ` COLLATE ${collations[this.context.locale] || collations[this.context.locale.split('_')[0]] || collations['']
}`
: '') +
(c.sort === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
: c => this.expr(c) + (c.sort === 'desc' || c.sort === -1 ? ' DESC' : ' ASC'),
(c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
: c => this.expr(c) + (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC'),
)
}

Expand Down
4 changes: 2 additions & 2 deletions postgres/lib/PostgresService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ GROUP BY k
? c =>
this.expr(c) +
(c.element?.[this.class._localized] ? ` COLLATE "${locale}"` : '') +
(c.sort === 'desc' || c.sort === -1 ? ' DESC NULLS LAST' : ' ASC NULLS FIRST')
: c => this.expr(c) + (c.sort === 'desc' || c.sort === -1 ? ' DESC NULLS LAST' : ' ASC NULLS FIRST'),
(c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC NULLS LAST' : ' ASC NULLS FIRST')
: c => this.expr(c) + (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC NULLS LAST' : ' ASC NULLS FIRST'),
)
}

Expand Down
12 changes: 12 additions & 0 deletions test/compliance/SELECT.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,18 @@ describe('SELECT', () => {
assert.deepEqual(res, sorted, 'Ensure that all rows are in the correct order')
})

test('sort is case insensitive', async () => {
const { string } = cds.entities('basic.literals')
const mixedDesc = SELECT.from(string).columns('string').orderBy('string DeSc')
const desc = SELECT.from(string).columns('string').orderBy('string desc')
const mixedAsc = SELECT.from(string).columns('string').orderBy('string aSC')
const asc = SELECT.from(string).columns('string').orderBy('string asc')

expect(await cds.run(mixedDesc)).to.eql(await cds.run(desc))
expect(await cds.run(mixedAsc)).to.eql(await cds.run(asc))
})


test('localized', async () => {
const { string } = cds.entities('basic.literals')
const cqn = CQL`SELECT string FROM ${string} ORDER BY string`
Expand Down
Loading