Skip to content

feat: replace like with CQN function calls #36

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

Merged
schwma merged 8 commits into from
Jan 23, 2023
Merged

feat: replace like with CQN function calls #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b359e6
replace like with contains func
larsplessing Jan 20, 2023
5c37470
Merge branch 'main' into replace-like-with-contains
larsplessing Jan 20, 2023
1dc51c6
formating
larsplessing Jan 20, 2023
6b5512b
Merge branch 'replace-like-with-contains' of https://github.com/cap-j…
larsplessing Jan 20, 2023
085e3a9
Cleanup and use CQN functions for startswith and endsWith
schwma Jan 20, 2023
77d6216
Rm helper function
schwma Jan 20, 2023
147f98e
Add changelog entry
schwma Jan 20, 2023
5cbb7ee
Improve wording
schwma Jan 20, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Register `aliasFieldResolver` during schema generation instead of passing it to the GraphQL server
- The filters `contains`, `startswith`, and `endswith` now generate CQN function calls instead of generating `like` expressions directly

### Fixed

Expand Down
25 changes: 9 additions & 16 deletions lib/resolvers/parse/ast2cqn/where.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const { RELATIONAL_OPERATORS, STRING_OPERATIONS } = require('../../../constants'
const { Kind } = require('graphql')

const GQL_TO_CDS_STRING_OPERATIONS = {
[STRING_OPERATIONS.startswith]: 'like',
[STRING_OPERATIONS.endswith]: 'like',
[STRING_OPERATIONS.contains]: 'like'
[STRING_OPERATIONS.startswith]: 'startswith',
[STRING_OPERATIONS.endswith]: 'endswith',
[STRING_OPERATIONS.contains]: 'contains'
}

const GQL_TO_CDS_QL_OPERATOR = {
Expand All @@ -16,26 +16,19 @@ const GQL_TO_CDS_QL_OPERATOR = {
[RELATIONAL_OPERATORS.lt]: '<'
}

const _stringOperationToLikeString = (operator, string) =>
({
[STRING_OPERATIONS.startswith]: `${string}%`,
[STRING_OPERATIONS.endswith]: `%${string}`,
[STRING_OPERATIONS.contains]: `%${string}%`
}[operator])

const _gqlValueToCdsValue = (cdsOperator, gqlOperator, gqlValue) =>
cdsOperator === 'like' ? _stringOperationToLikeString(gqlOperator, gqlValue) : gqlValue

const _gqlOperatorToCdsOperator = gqlOperator =>
GQL_TO_CDS_QL_OPERATOR[gqlOperator] || GQL_TO_CDS_STRING_OPERATIONS[gqlOperator]

const _objectFieldTo_xpr = (objectField, columnName) => {
const gqlOperator = objectField.name.value
const cdsOperator = _gqlOperatorToCdsOperator(gqlOperator)
const gqlValue = objectField.value.value
const cdsValue = _gqlValueToCdsValue(cdsOperator, gqlOperator, gqlValue)

return [{ ref: [columnName] }, cdsOperator, { val: cdsValue }]
const ref = { ref: [columnName] }
const val = { val: objectField.value.value }

if (STRING_OPERATIONS[gqlOperator]) return [{ func: cdsOperator, args: [ref, val] }]

return [ref, cdsOperator, val]
}

const _parseObjectField = (objectField, columnName) => {
Expand Down