@cap-js/sqlite 1.7.7 → 1.8.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.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)
+
+
+### Fixed
+
+* default `[development]` URL to `:memory:` ([#926](https://github.com/cap-js/cds-dbs/issues/926)) ([51e8aa7](https://github.com/cap-js/cds-dbs/commit/51e8aa70868a78594626ba19c02ff495571e751f))
+
 ## [1.7.7](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.7.6...sqlite-v1.7.7) (2024-11-14)
 
 

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) => {
@@ -12,10 +13,17 @@ const sqliteKeywords = keywords.reduce((prev, curr) => {
   return prev
 }, {})
 
+// define date and time functions in js to allow for throwing errors
+const isTime = /^\d{1,2}:\d{1,2}:\d{1,2}$/
+const hasTimezone = /([+-]\d{1,2}:?\d{0,2}|Z)$/
+const toDate = (d, allowTime = false) => {
+  const date = new Date(allowTime && isTime.test(d) ? `1970-01-01T${d}Z` : hasTimezone.test(d) ? d : d + 'Z')
+  if (Number.isNaN(date.getTime())) throw new Error(`Value does not contain a valid ${allowTime ? 'time' : 'date'} "${d}"`)
+  return date
+}
+
+
 class SQLiteService extends SQLService {
-  init() {
-    return super.init(...arguments)
-  }
 
   get factory() {
     return {
@@ -23,27 +31,16 @@ class SQLiteService extends SQLService {
       create: tenant => {
         const database = this.url4(tenant)
         const dbc = new sqlite(database)
-
         const deterministic = { deterministic: true }
         dbc.function('session_context', key => dbc[$session][key])
         dbc.function('regexp', deterministic, (re, x) => (RegExp(re).test(x) ? 1 : 0))
         dbc.function('ISO', deterministic, d => d && new Date(d).toISOString())
-
-        // define date and time functions in js to allow for throwing errors
-        const isTime = /^\d{1,2}:\d{1,2}:\d{1,2}$/
-        const hasTimezone = /([+-]\d{1,2}:?\d{0,2}|Z)$/
-        const toDate = (d, allowTime = false) => {
-          const date = new Date(allowTime && isTime.test(d) ? `1970-01-01T${d}Z` : hasTimezone.test(d) ? d : d + 'Z')
-          if (Number.isNaN(date.getTime())) throw new Error(`Value does not contain a valid ${allowTime ? 'time' : 'date'} "${d}"`)
-          return date
-        }
         dbc.function('year', deterministic, d => d === null ? null : toDate(d).getUTCFullYear())
         dbc.function('month', deterministic, d => d === null ? null : toDate(d).getUTCMonth() + 1)
         dbc.function('day', deterministic, d => d === null ? null : toDate(d).getUTCDate())
         dbc.function('hour', deterministic, d => d === null ? null : toDate(d, true).getUTCHours())
         dbc.function('minute', deterministic, d => d === null ? null : toDate(d, true).getUTCMinutes())
         dbc.function('second', deterministic, d => d === null ? null : toDate(d, true).getUTCSeconds())
-
         if (!dbc.memory) dbc.pragma('journal_mode = WAL')
         return dbc
       },
@@ -118,6 +115,15 @@ class SQLiteService extends SQLService {
     yield ']'
   }
 
+  pragma (pragma, options) {
+    if (!this.dbc) return this.begin('pragma') .then (tx => {
+      try { return tx.pragma (pragma, options) }
+      finally { tx.release() }
+    })
+    return this.dbc.pragma (pragma, options)
+  }
+
+
   exec(sql) {
     return this.dbc.exec(sql)
   }
@@ -242,6 +248,7 @@ class SQLiteService extends SQLService {
       Time: () => 'TIME_TEXT',
       DateTime: () => 'DATETIME_TEXT',
       Timestamp: () => 'TIMESTAMP_TEXT',
+      Map: () => 'JSON_TEXT'
     }
 
     get is_distinct_from_() {
@@ -262,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)
     }
   }
 
@@ -270,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)
     }
   }
 }
@@ -283,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/sqlite",
-  "version": "1.7.7",
+  "version": "1.8.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.17.0",
     "better-sqlite3": "^11.0.0"
   },
   "peerDependencies": {
@@ -37,7 +37,10 @@
       "kinds": {
         "sql": {
           "[development]": {
-            "kind": "sqlite"
+            "kind": "sqlite",
+            "credentials": {
+              "url": ":memory:"
+            }
           }
         },
         "sqlite": {