Merge branch 'main' into fix/insert-calculated-column

db-service/lib/cqn2sql.js

@@ -13,14 +13,14 @@ const BINARY_TYPES = {
 const { Readable } = require('stream')
 
 const DEBUG = (() => {
- let DEBUG = cds.debug('sql-json')
- if (DEBUG) return DEBUG
- else DEBUG = cds.debug('sql|sqlite')
- if (DEBUG) {
- return DEBUG
+ const LOG = cds.log('sql-json')
+ if (LOG._debug) return cds.debug('sql-json')
+ return cds.debug('sql|sqlite')
+ //if (DEBUG) {
+ // return DEBUG
  // (sql, ...more) => DEBUG (sql.replace(/(?:SELECT[\n\r\s]+(json_group_array\()?[\n\r\s]*json_insert\((\n|\r|.)*?\)[\n\r\s]*\)?[\n\r\s]+as[\n\r\s]+_json_[\n\r\s]+FROM[\n\r\s]*\(|\)[\n\r\s]*(\)[\n\r\s]+AS )|\)$)/gim,(a,b,c,d) => d || ''), ...more)
  // FIXME: looses closing ) on INSERT queries
- }
+ //}
 })()
 
 class CQN2SQLRenderer {

hana/lib/HANAService.js

@@ -977,6 +977,13 @@ class HANAService extends SQLService {
  this.values.push(JSON.stringify(list.list.map(l => l.list.reduce((l, c, i) => { l[`V${i}`] = c.val; return l }, {}))))
  return `(SELECT * FROM JSON_TABLE(?, '$' COLUMNS(${extraction})))`
  }
+ // If the list only contains of vals it is replaced with a json function and a placeholder
+ if (this.values && first.val) {
+ const v = first
+ const extraction = `"val" ${this.constructor.InsertTypeMap[typeof v.val]()} PATH '$.val'`
+ this.values.push(JSON.stringify(list.list))
+ return `(SELECT * FROM JSON_TABLE(?, '$' COLUMNS(${extraction})))`
+ }
  // Call super for normal SQL behavior
  return super.list(list)
  }
@@ -1124,6 +1131,7 @@ class HANAService extends SQLService {
 
  static OutputConverters = {
  ...super.OutputConverters,
+ LargeString: cds.env.features.sql_simple_queries > 0 ? e => `TO_NVARCHAR(${e})` : undefined,
  // 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')`,