@cap-js/sqlite 1.5.1 → 1.7.0

package/CHANGELOG.md

@@ -4,6 +4,36 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.7.0](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.6.0...sqlite-v1.7.0) (2024-05-08)
+
+
+### Added
+
+* select decimals as strings if cds.env.features.string_decimals ([#616](https://github.com/cap-js/cds-dbs/issues/616)) ([39addbf](https://github.com/cap-js/cds-dbs/commit/39addbfe01da757d86a4d65e62eda86e59fc9b87))
+
+
+### Fixed
+
+* Change `sql` property to `query` for errors ([#611](https://github.com/cap-js/cds-dbs/issues/611)) ([585577a](https://github.com/cap-js/cds-dbs/commit/585577a9817e7749fb71958c26c4bfa20981c663))
+* Improved placeholders and limit clause ([#567](https://github.com/cap-js/cds-dbs/issues/567)) ([d5d5dbb](https://github.com/cap-js/cds-dbs/commit/d5d5dbb7219bcef6134440715cf756fdd439f076))
+
+## [1.6.0](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.5.1...sqlite-v1.6.0) (2024-03-22)
+
+
+### Added
+
+* forUpdate and forShareLock ([#148](https://github.com/cap-js/cds-dbs/issues/148)) ([99a1170](https://github.com/cap-js/cds-dbs/commit/99a1170e61de4fd0c505834c25a9c03fc34da85b))
+* **hana:** drop prepared statements after end of transaction ([#537](https://github.com/cap-js/cds-dbs/issues/537)) ([b1f864e](https://github.com/cap-js/cds-dbs/commit/b1f864e0a3a0e5efacd803d3709379cab76d61cc))
+
+
+### Fixed
+
+* **`sqlite`:** use keyword list from compiler ([#526](https://github.com/cap-js/cds-dbs/issues/526)) ([a227c61](https://github.com/cap-js/cds-dbs/commit/a227c61312ba9e7d6a54944c822d5de0bb2d3f3c))
+
+### Changed
+
+* this package now requires `@cap-js/db-service >= v1.7.0` ([#545](https://github.com/cap-js/cds-dbs/issues/545)) ([2cec27d](https://github.com/cap-js/cds-dbs/commit/2cec27d91402804c3b2da25cc7169f0d81a7406a))
+
 ## [1.5.1](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.5.0...sqlite-v1.5.1) (2024-02-16)
 
 

package/lib/SQLiteService.js

@@ -5,6 +5,13 @@ const $session = Symbol('dbc.session')
 const convStrm = require('stream/consumers')
 const { Readable } = require('stream')
 
+const keywords = cds.compiler.to.sql.sqlite.keywords
+// keywords come as array
+const sqliteKeywords = keywords.reduce((prev, curr) => {
+  prev[curr] = 1
+  return prev
+}, {})
+
 class SQLiteService extends SQLService {
   init() {
     return super.init(...arguments)
@@ -73,7 +80,7 @@ class SQLiteService extends SQLService {
         stream: (..._) => this._stream(stmt, ..._),
       }
     } catch (e) {
-      e.message += ' in:\n' + (e.sql = sql)
+      e.message += ' in:\n' + (e.query = sql)
       throw e
     }
   }
@@ -160,7 +167,8 @@ class SQLiteService extends SQLService {
     }
 
     val(v) {
-      if (Buffer.isBuffer(v.val)) v.val = v.val.toString('base64')
+      if (typeof v.val === 'boolean') v.val = v.val ? 1 : 0
+      else if (Buffer.isBuffer(v.val)) v.val = v.val.toString('base64')
       // intercept DateTime values and convert to Date objects to compare ISO Strings
       else if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d{1,9})?(Z|[+-]\d{2}(:?\d{2})?)$/.test(v.val)) {
         const date = new Date(v.val)
@@ -171,15 +179,21 @@ class SQLiteService extends SQLService {
       return super.val(v)
     }
 
+    forUpdate() {
+      return ''
+    }
+
+    forShareLock() {
+      return ''
+    }
+
     // Used for INSERT statements
     static InputConverters = {
       ...super.InputConverters,
-
       // The following allows passing in ISO strings with non-zulu
       // timezones and converts them into zulu dates and times
       Date: e => `strftime('%Y-%m-%d',${e})`,
       Time: e => `strftime('%H:%M:%S',${e})`,
-
       // Both, DateTimes and Timestamps are canonicalized to ISO strings with
       // ms precision to allow safe comparisons, also to query {val}s in where clauses
       DateTime: e => `ISO(${e})`,
@@ -188,34 +202,31 @@ class SQLiteService extends SQLService {
 
     static OutputConverters = {
       ...super.OutputConverters,
-
       // Structs and arrays are stored as JSON strings; the ->'$' unwraps them.
       // Otherwise they would be added as strings to json_objects.
       Association: expr => `${expr}->'$'`,
       struct: expr => `${expr}->'$'`,
       array: expr => `${expr}->'$'`,
-
       // SQLite has no booleans so we need to convert 0 and 1
       boolean: expr => `CASE ${expr} when 1 then 'true' when 0 then 'false' END ->'$'`,
-
       // DateTimes are returned without ms added by InputConverters
       DateTime: e => `substr(${e},0,20)||'Z'`,
-
       // Timestamps are returned with ms, as written by InputConverters.
       // And as cds.builtin.classes.Timestamp inherits from DateTime we need
       // to override the DateTime converter above
       Timestamp: undefined,
-
       // int64 is stored as native int64 for best comparison
       // Reading int64 as string to not loose precision
       Int64: expr => `CAST(${expr} as TEXT)`,
-
+      // REVISIT: always cast to string in next major
+      // Reading decimal as string to not loose precision
+      Decimal: cds.env.features.string_decimals ? expr => `CAST(${expr} as TEXT)` : undefined,
       // Binary is not allowed in json objects
       Binary: expr => `${expr} || ''`,
     }
 
     // Used for SQL function expressions
-    static Functions = { ...super.Functions, ...require('./func') }
+    static Functions = { ...super.Functions, ...require('./cql-functions') }
 
     // Used for CREATE TABLE statements
     static TypeMap = {
@@ -234,7 +245,7 @@ class SQLiteService extends SQLService {
       return 'is'
     }
 
-    static ReservedWords = { ...super.ReservedWords, ...require('./ReservedWords.json') }
+    static ReservedWords = { ...super.ReservedWords, ...sqliteKeywords }
   }
 
   // REALLY REVISIT: Here we are doing error handling which we probably never should have started.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/sqlite",
-  "version": "1.5.1",
+  "version": "1.7.0",
   "description": "CDS database service for SQLite",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/sqlite#cds-database-service-for-sqlite",
   "repository": {
@@ -30,7 +30,7 @@
     "test": "jest --silent"
   },
   "dependencies": {
-    "@cap-js/db-service": "^1.6.0",
+    "@cap-js/db-service": "^1.9.0",
     "better-sqlite3": "^9.3.0"
   },
   "peerDependencies": {

package/lib/ReservedWords.json

@@ -1,149 +0,0 @@
-{
-  "ABORT": 1,
-  "ACTION": 1,
-  "ADD": 1,
-  "AFTER": 1,
-  "ALL": 1,
-  "ALTER": 1,
-  "ALWAYS": 1,
-  "ANALYZE": 1,
-  "AND": 1,
-  "AS": 1,
-  "ASC": 1,
-  "ATTACH": 1,
-  "AUTOINCREMENT": 1,
-  "BEFORE": 1,
-  "BEGIN": 1,
-  "BETWEEN": 1,
-  "BY": 1,
-  "CASCADE": 1,
-  "CASE": 1,
-  "CAST": 1,
-  "CHECK": 1,
-  "COLLATE": 1,
-  "COLUMN": 1,
-  "COMMIT": 1,
-  "CONFLICT": 1,
-  "CONSTRAINT": 1,
-  "CREATE": 1,
-  "CROSS": 1,
-  "CURRENT": 1,
-  "CURRENT_DATE": 1,
-  "CURRENT_TIME": 1,
-  "CURRENT_TIMESTAMP": 1,
-  "DATABASE": 1,
-  "DEFAULT": 1,
-  "DEFERRABLE": 1,
-  "DEFERRED": 1,
-  "DELETE": 1,
-  "DESC": 1,
-  "DETACH": 1,
-  "DISTINCT": 1,
-  "DO": 1,
-  "DROP": 1,
-  "EACH": 1,
-  "ELSE": 1,
-  "END": 1,
-  "ESCAPE": 1,
-  "EXCEPT": 1,
-  "EXCLUDE": 1,
-  "EXCLUSIVE": 1,
-  "EXISTS": 1,
-  "EXPLAIN": 1,
-  "FAIL": 1,
-  "FILTER": 1,
-  "FIRST": 1,
-  "FOLLOWING": 1,
-  "FOR": 1,
-  "FOREIGN": 1,
-  "FROM": 1,
-  "FULL": 1,
-  "GENERATED": 1,
-  "GLOB": 1,
-  "GROUP": 1,
-  "GROUPS": 1,
-  "HAVING": 1,
-  "IF": 1,
-  "IGNORE": 1,
-  "IMMEDIATE": 1,
-  "IN": 1,
-  "INDEX": 1,
-  "INDEXED": 1,
-  "INITIALLY": 1,
-  "INNER": 1,
-  "INSERT": 1,
-  "INSTEAD": 1,
-  "INTERSECT": 1,
-  "INTO": 1,
-  "IS": 1,
-  "ISNULL": 1,
-  "JOIN": 1,
-  "KEY": 1,
-  "LAST": 1,
-  "LEFT": 1,
-  "LIKE": 1,
-  "LIMIT": 1,
-  "MATCH": 1,
-  "MATERIALIZED": 1,
-  "NATURAL": 1,
-  "NO": 1,
-  "NOT": 1,
-  "NOTHING": 1,
-  "NOTNULL": 1,
-  "NULL": 1,
-  "NULLS": 1,
-  "OF": 1,
-  "OFFSET": 1,
-  "ON": 1,
-  "OR": 1,
-  "ORDER": 1,
-  "OTHERS": 1,
-  "OUTER": 1,
-  "OVER": 1,
-  "PARTITION": 1,
-  "PLAN": 1,
-  "PRAGMA": 1,
-  "PRECEDING": 1,
-  "PRIMARY": 1,
-  "QUERY": 1,
-  "RAISE": 1,
-  "RANGE": 1,
-  "RECURSIVE": 1,
-  "REFERENCES": 1,
-  "REGEXP": 1,
-  "REINDEX": 1,
-  "RELEASE": 1,
-  "RENAME": 1,
-  "REPLACE": 1,
-  "RESTRICT": 1,
-  "RETURNING": 1,
-  "RIGHT": 1,
-  "ROLLBACK": 1,
-  "ROW": 1,
-  "ROWS": 1,
-  "SAVEPOINT": 1,
-  "SELECT": 1,
-  "SET": 1,
-  "TABLE": 1,
-  "TEMP": 1,
-  "TEMPORARY": 1,
-  "THEN": 1,
-  "TIES": 1,
-  "TO": 1,
-  "TRANSACTION": 1,
-  "TRIGGER": 1,
-  "UNBOUNDED": 1,
-  "UNION": 1,
-  "UNIQUE": 1,
-  "UPDATE": 1,
-  "USING": 1,
-  "VACUUM": 1,
-  "VALUES": 1,
-  "VIEW": 1,
-  "VIRTUAL": 1,
-  "WHEN": 1,
-  "WHERE": 1,
-  "WINDOW": 1,
-  "WITH": 1,
-  "WITHOUT": 1
-}