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

[PoC]: SQL Native FOR JSON implemenation #766

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+40 −7
Draft

[PoC]: SQL Native FOR JSON implemenation #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c023b09
SQL native FOR JSON alternative
BobdenOs Aug 1, 2024
7fc5788
Add some more escaped characters tests
BobdenOs Aug 1, 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
30 changes: 23 additions & 7 deletions hana/lib/HANAService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const hanaKeywords = keywords.reduce((prev, curr) => {

const DEBUG = cds.debug('sql|db')
let HANAVERSION = 0
const JSON_CONCAT = true

/**
* @implements SQLService
Expand Down Expand Up @@ -545,8 +546,16 @@ class HANAService extends SQLService {
return false
}
if (x.element?.type === 'cds.Boolean') hasBooleans = true
const converter = x.element?.[this.class._convertOutput] || (e => e)
return `${converter(this.quote(columnName))} as "${columnName.replace(/"/g, '""')}"`
let converter = x.element?.[this.class._convertOutput] || src?.elements[columnName]?.[this.class._convertOutput]
if (JSON_CONCAT && converter) {
const _converter = converter
converter = (expr, elem) => `'"' || ${_converter(expr, elem)} || '"'`
} else {
converter = e => e
}
return JSON_CONCAT
? `${this.string(JSON.stringify(columnName) + ':')} || coalesce((${converter(this.quote(columnName))}) || '', 'null')`
: `${converter(this.quote(columnName))} as "${columnName.replace(/"/g, '""')}"`
}
: x => {
if (x === '*') return '*'
Expand Down Expand Up @@ -580,7 +589,10 @@ class HANAService extends SQLService {
// Making each row a maximum size of 2gb instead of the whole result set to be 2gb
// Excluding binary columns as they are not supported by FOR JSON and themselves can be 2gb
const rawJsonColumn = sql.length
? `(SELECT ${sql} FROM JSON_TABLE('[{}]', '$' COLUMNS("'$$FaKeDuMmYCoLuMn$$'" FOR ORDINALITY)) FOR JSON ('format'='no', 'omitnull'='no', 'arraywrap'='no') RETURNS NVARCHAR(2147483647))`
?
JSON_CONCAT
? `'{' || ${sql.join(` || ',' || `)} || '}'`
: `(SELECT ${sql} FROM JSON_TABLE('[{}]', '$' COLUMNS("'$$FaKeDuMmYCoLuMn$$'" FOR ORDINALITY)) FOR JSON ('format'='no', 'omitnull'='no', 'arraywrap'='no') RETURNS NVARCHAR(2147483647))`
: `'{}'`

let jsonColumn = rawJsonColumn
Expand Down Expand Up @@ -1126,16 +1138,20 @@ class HANAService extends SQLService {
...super.OutputConverters,
// REVISIT: binaries should use BASE64_ENCODE, but this results in BASE64_ENCODE(BINTONHEX(${e}))
Binary: e => `BINTONHEX(${e})`,
Date: e => `to_char(${e}, 'YYYY-MM-DD')`,
Time: e => `to_char(${e}, 'HH24:MI:SS')`,
DateTime: e => `to_char(${e}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
Timestamp: e => `to_char(${e}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3"Z"')`,
Date: e => `TO_NVARCHAR(${e}, 'YYYY-MM-DD')`,
Time: e => `TO_NVARCHAR(${e}, 'HH24:MI:SS')`,
DateTime: e => `TO_NVARCHAR(${e}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"')`,
Timestamp: e => `TO_NVARCHAR(${e}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3"Z"')`,
Vector: e => `TO_NVARCHAR(${e})`,
// Reading int64 as string to not loose precision
Int64: expr => `TO_NVARCHAR(${expr})`,
// Reading decimal as string to not loose precision
Decimal: expr => `TO_NVARCHAR(${expr})`,

String: JSON_CONCAT
? e => `${['\\', '"', '\b', '\t', '\n', '\f', '\r'].reduce((l, c) => `REPLACE(${l},'${c}','${JSON.stringify(c).slice(1, -1)}')`, e)}`
: undefined,

// HANA types
'cds.hana.ST_POINT': e => `(SELECT NEW ST_POINT(TO_NVARCHAR(${e})).ST_X() as "x", NEW ST_POINT(TO_NVARCHAR(${e})).ST_Y() as "y" FROM DUMMY WHERE (${e}) IS NOT NULL FOR JSON ('format'='no', 'omitnull'='no', 'arraywrap'='no') RETURNS NVARCHAR(2147483647))`,
'cds.hana.ST_GEOMETRY': e => `TO_NVARCHAR(${e})`,
Expand Down
17 changes: 17 additions & 0 deletions test/compliance/resources/db/basic/literals/basic.literals.string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'

const alphabetize = (_, i) => alphabet[i % alphabet.length]

const bs = String.fromCharCode(92)

module.exports = [
{
string: null,
Expand Down Expand Up @@ -44,6 +46,21 @@ module.exports = [
string:
'Simplified Chinese: 中国, Traditional Chinese: 中國, Korean: 대한민국, Japanese: 日本国, Russion: Российская Федерация, Greek: Ελληνική Δημοκρατία',
},
{
string: `${bs}\b\t\n\r"${bs}b${bs}t${bs}n${bs}r${bs}"`,
},
{
string: `${bs}b`,
},
{
string: `${bs}`,
},
{
string: `${bs}${bs}`,
},
{
string: `${bs}\b`,
},
/* Ignoring transformations
{
char: () => alphabet,
Expand Down
Loading