@cap-js/sqlite 1.7.8 → 1.9.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.9.0](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.8.0...sqlite-v1.9.0) (2025-03-04)
+
+
+### Added
+
+* pass through of  arbitrary client options ([#1024](https://github.com/cap-js/cds-dbs/issues/1024)) ([b090ccd](https://github.com/cap-js/cds-dbs/commit/b090ccda2dfd4fa535aa0fd5be9d2fc27531db05))
+
+## [1.8.0](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.7.8...sqlite-v1.8.0) (2025-01-28)
+
+
+### Added
+
+* support for cds.Map ([#889](https://github.com/cap-js/cds-dbs/issues/889)) ([cde7514](https://github.com/cap-js/cds-dbs/commit/cde7514df20396383e0179ffce838596e3706bb2))
+
 ## [1.7.8](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.7.7...sqlite-v1.7.8) (2024-12-16)
 
 

package/lib/SQLiteService.js

@@ -5,6 +5,7 @@ const $session = Symbol('dbc.session')
 const convStrm = require('stream/consumers')
 const { Readable } = require('stream')
 
+const SANITIZE_VALUES = process.env.NODE_ENV === 'production' && cds.env.log.sanitize_values !== false
 const keywords = cds.compiler.to.sql.sqlite.keywords
 // keywords come as array
 const sqliteKeywords = keywords.reduce((prev, curr) => {
@@ -29,7 +30,7 @@ class SQLiteService extends SQLService {
       options: { max: 1, ...this.options.pool },
       create: tenant => {
         const database = this.url4(tenant)
-        const dbc = new sqlite(database)
+        const dbc = new sqlite(database, this.options.client)
         const deterministic = { deterministic: true }
         dbc.function('session_context', key => dbc[$session][key])
         dbc.function('regexp', deterministic, (re, x) => (RegExp(re).test(x) ? 1 : 0))
@@ -247,6 +248,7 @@ class SQLiteService extends SQLService {
       Time: () => 'TIME_TEXT',
       DateTime: () => 'DATETIME_TEXT',
       Timestamp: () => 'TIMESTAMP_TEXT',
+      Map: () => 'JSON_TEXT'
     }
 
     get is_distinct_from_() {
@@ -267,7 +269,7 @@ class SQLiteService extends SQLService {
     try {
       return await super.onINSERT(req)
     } catch (err) {
-      throw _not_unique(err, 'ENTITY_ALREADY_EXISTS')
+      throw _not_unique(err, 'ENTITY_ALREADY_EXISTS', req.data)
     }
   }
 
@@ -275,7 +277,7 @@ class SQLiteService extends SQLService {
     try {
       return await super.onUPDATE(req)
     } catch (err) {
-      throw _not_unique(err, 'UNIQUE_CONSTRAINT_VIOLATION')
+      throw _not_unique(err, 'UNIQUE_CONSTRAINT_VIOLATION', req.data)
     }
   }
 }
@@ -288,13 +290,14 @@ class SQLiteService extends SQLService {
 //   })
 // }
 
-function _not_unique(err, code) {
+function _not_unique(err, code, data) {
   if (err.message.match(/unique constraint/i))
     return Object.assign(err, {
       originalMessage: err.message, // FIXME: required because of next line
       message: code, // FIXME: misusing message as code
       code: 400, // FIXME: misusing code as (http) status
     })
+  if (data) err.values = SANITIZE_VALUES ? ['***'] : data
   return err
 }
 

package/lib/cql-functions.js

@@ -1,15 +1,158 @@
 'use strict'
 
 const StandardFunctions = {
-  // Ensure ISO strings are returned for date/time functions
+  // ==============================
+  // Date and Time Functions
+  // ==============================
+
+  /**
+   * Ensures ISO strings are returned for current timestamp
+   * @returns {string} - SQL statement
+   */
   current_timestamp: () => 'ISO(current_timestamp)',
-  // SQLite doesn't support arguments for current_date and current_time
+
+  /**
+   * SQLite doesn't support arguments for current_date
+   * @returns {string} - SQL statement
+   */
   current_date: () => 'current_date',
+
+  /**
+   * SQLite doesn't support arguments for current_time
+   * @returns {string} - SQL statement
+   */
   current_time: () => 'current_time',
+
+  /**
+   * Generates SQL statement that produces the fractional seconds of a given timestamp
+   * @param {string} x - The timestamp input
+   * @returns {string} - SQL statement
+   */
+  fractionalseconds: x => `cast(substr(strftime('%f', ${x}), length(strftime('%f', ${x})) - 3) as REAL)`,
+
+  // ==============================
+  // String Functions
+  // ==============================
+
+  /**
+   * Generates SQL statement that produces a boolean value indicating whether the first string contains the second string
+   * @param  {...string} args - The strings to evaluate
+   * @returns {string} - SQL statement
+   */
+  contains: (...args) => `(ifnull(instr(${args}),0) > 0)`,
+
+  /**
+   * Generates SQL statement that produces the index of the first occurrence of the second string in the first string
+   * @param {string} x - The string to search
+   * @param {string} y - The substring to find
+   * @returns {string} - SQL statement
+   */
+  indexof: (x, y) => `instr(${x},${y}) - 1`,
+
+  /**
+   * Generates SQL statement that produces a boolean value indicating whether the first string starts with the second string
+   * @param {string} x - The string to evaluate
+   * @param {string} y - The prefix to check
+   * @returns {string} - SQL statement
+   */
+  startswith: (x, y) => `coalesce(instr(${x},${y}) = 1,false)`,
+
+  /**
+   * Generates SQL statement that produces a boolean value indicating whether the first string ends with the second string
+   * @param {string} x - The string to evaluate
+   * @param {string} y - The suffix to check
+   * @returns {string} - SQL statement
+   */
+  endswith: (x, y) => `coalesce(substr(${x}, length(${x}) + 1 - length(${y})) = ${y},false)`,
+
+  /**
+   * Generates SQL statement that matches the given string against a regular expression
+   * @param {string} x - The string to match
+   * @param {string} y - The regular expression
+   * @returns {string} - SQL statement
+   */
+  matchesPattern: (x, y) => `(${x} regexp ${y})`,
+
+  /**
+   * Alias for matchesPattern
+   * @param {string} x - The string to match
+   * @param {string} y - The regular expression
+   * @returns {string} - SQL statement
+   */
+  matchespattern: (x, y) => `(${x} regexp ${y})`,
 }
 
 const HANAFunctions = {
-  /** defined in db-service */
+  // ==============================
+  // Timestamp Difference Functions
+  // ==============================
+
+  /**
+   * Generates SQL statement that calculates the difference in 100-nanoseconds between two timestamps
+   * @param {string} x - Left timestamp
+   * @param {string} y - Right timestamp
+   * @returns {string} - SQL statement
+   */
+  nano100_between: (x, y) => `(julianday(${y}) - julianday(${x})) * 864000000000`,
+
+  /**
+   * Generates SQL statement that calculates the difference in seconds between two timestamps
+   * @param {string} x - Left timestamp
+   * @param {string} y - Right timestamp
+   * @returns {string} - SQL statement
+   */
+  seconds_between: (x, y) => `(julianday(${y}) - julianday(${x})) * 86400`,
+
+  /**
+   * Generates SQL statement that calculates the difference in days between two timestamps
+   * @param {string} x - Left timestamp
+   * @param {string} y - Right timestamp
+   * @returns {string} - SQL statement
+   */
+  days_between: (x, y) => `(
+    cast(julianday(${y}) as Integer) - cast(julianday(${x}) as Integer)
+  ) + (
+    case
+      when (julianday(${y}) < julianday(${x})) then
+        (cast(strftime('%H%M%S%f0000', ${y}) as Integer) < cast(strftime('%H%M%S%f0000', ${x}) as Integer))
+      else
+        (cast(strftime('%H%M%S%f0000', ${y}) as Integer) > cast(strftime('%H%M%S%f0000', ${x}) as Integer)) * -1
+    end
+  )`,
+
+  /**
+   * Generates SQL statement that calculates the difference in months between two timestamps
+   * @param {string} x - Left timestamp
+   * @param {string} y - Right timestamp
+   * @returns {string} - SQL statement
+   */
+  months_between: (x, y) => `
+  (
+    (
+      (cast(strftime('%Y', ${y}) as Integer) - cast(strftime('%Y', ${x}) as Integer)) * 12
+    ) + (
+      cast(strftime('%m', ${y}) as Integer) - cast(strftime('%m', ${x}) as Integer)
+    ) + (
+      (
+        case
+          when (cast(strftime('%Y%m', ${y}) as Integer) < cast(strftime('%Y%m', ${x}) as Integer)) then
+            (cast(strftime('%d%H%M%S%f0000', ${y}) as Integer) > cast(strftime('%d%H%M%S%f0000', ${x}) as Integer))
+          else
+            (cast(strftime('%d%H%M%S%f0000', ${y}) as Integer) < cast(strftime('%d%H%M%S%f0000', ${x}) as Integer)) * -1
+        end
+      )
+    )
+  )`,
+
+  /**
+   * Generates SQL statement that calculates the difference in years between two timestamps
+   * @param {string} x - Left timestamp
+   * @param {string} y - Right timestamp
+   * @returns {string} - SQL statement
+   */
+  years_between(x, y) {
+    return `floor(${this.months_between(x, y)} / 12)`
+  },
 }
 
 for (let each in HANAFunctions) HANAFunctions[each.toUpperCase()] = HANAFunctions[each]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/sqlite",
-  "version": "1.7.8",
+  "version": "1.9.0",
   "description": "CDS database service for SQLite",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/sqlite#cds-database-service-for-sqlite",
   "repository": {
@@ -23,10 +23,10 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "cds-test $(../test/find)"
+    "test": "cds-test"
   },
   "dependencies": {
-    "@cap-js/db-service": "^1.14.1",
+    "@cap-js/db-service": "^1.18.0",
     "better-sqlite3": "^11.0.0"
   },
   "peerDependencies": {