@cap-js/sqlite 1.2.1 → 1.3.1

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 1.3.1 - 2023-10-10
+
+### Changed
+
+- Updated minimum required version of `@cap-js/db-service`.
+
+## Version 1.3.0 - 2023-10-06
+
+### Fixed 
+
+- `CURRENT_TIMESTAMP` in view definition preserves the timezone. #254 
+
 ## Version 1.2.1 - 2023-09-08
 
 ### Fixed

package/README.md

@@ -2,5 +2,31 @@
 
 Welcome to the new SQLite database service for [SAP Cloud Application Programming Model](https://cap.cloud.sap) Node.js, based on new, streamlined database architecture and [*better-sqlite* driver](https://www.npmjs.com/package/better-sqlite3) .
 
-Find documentation at https://cap.cloud.sap/docs/guides/databases-sqlite.
+## Setup
 
+In general, all you need to do is to install one of the database packages, as follows:
+
+Using SQLite for development:
+
+```sh
+npm add @cap-js/sqlite -D
+```
+
+Learn more about setup and usage in the [respective database guide](https://cap.cloud.sap/docs/guides/databases-sqlite).
+
+
+## Support
+
+This project is open to feature requests/suggestions, bug reports etc. via [GitHub issues](https://github.com/cap-js/cds-dbs/issues).
+
+## Contribution
+
+Contribution and feedback are encouraged and always welcome. For more information about how to contribute, the project structure, as well as additional contribution information, see our [Contribution Guidelines](CONTRIBUTING.md).
+
+## Code of Conduct
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone. By participating in this project, you agree to abide by its [Code of Conduct](CODE_OF_CONDUCT.md) at all times.
+
+## Licensing
+
+Copyright 2023 SAP SE or an SAP affiliate company and cds-dbs contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/cap-js/cds-dbs).

package/lib/SQLiteService.js

@@ -15,6 +15,9 @@ class SQLiteService extends SQLService {
         dbc.function('session_context', key => dbc[$session][key])
         dbc.function('regexp', { deterministic: true }, (re, x) => (RegExp(re).test(x) ? 1 : 0))
         dbc.function('ISO', { deterministic: true }, d => d && new Date(d).toISOString())
+        dbc.function('json_merge', { varargs: true, deterministic: true }, (...args) =>
+          args.join('').replace(/}{/g, ','),
+        )
         if (!dbc.memory) dbc.pragma('journal_mode = WAL')
         return dbc
       },
@@ -123,8 +126,18 @@ class SQLiteService extends SQLService {
     return this.dbc.exec(sql)
   }
 
-  static CQN2SQL = class CQN2SQLite extends SQLService.CQN2SQL {
+  onPlainSQL({ query, data }, next) {
+    if (typeof query === 'string') {
+      // REVISIT: this is a hack the target of $now might not be a timestamp or date time
+      // Add input converter to CURRENT_TIMESTAMP inside views using $now
+      if (/^CREATE VIEW.* CURRENT_TIMESTAMP[( ]/is.test(query)) {
+        query = query.replace(/CURRENT_TIMESTAMP/gi, "STRFTIME('%Y-%m-%dT%H:%M:%fZ','NOW')")
+      }
+    }
+    return super.onPlainSQL({ query, data }, next)
+  }
 
+  static CQN2SQL = class CQN2SQLite extends SQLService.CQN2SQL {
     column_alias4(x, q) {
       let alias = super.column_alias4(x, q)
       if (alias) return alias
@@ -189,13 +202,7 @@ class SQLiteService extends SQLService {
     }
 
     // Used for SQL function expressions
-    static Functions = { ...super.Functions,
-      // Ensure ISO strings are returned for date/time functions
-      current_timestamp: () => 'ISO(current_timestamp)',
-      // SQLite doesn't support arguments for current_date and current_time
-      current_date: () => 'current_date',
-      current_time: () => 'current_time',
-    }
+    static Functions = { ...super.Functions, ...require('./func') }
 
     // Used for CREATE TABLE statements
     static TypeMap = {
@@ -207,8 +214,12 @@ class SQLiteService extends SQLService {
       Timestamp: () => 'TIMESTAMP_TEXT',
     }
 
-    get is_distinct_from_() { return 'is not' }
-    get is_not_distinct_from_() { return 'is' }
+    get is_distinct_from_() {
+      return 'is not'
+    }
+    get is_not_distinct_from_() {
+      return 'is'
+    }
 
     static ReservedWords = { ...super.ReservedWords, ...require('./ReservedWords.json') }
   }

package/lib/func.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const StandardFunctions = {
+  // Ensure ISO strings are returned for date/time functions
+  current_timestamp: () => 'ISO(current_timestamp)',
+  // SQLite doesn't support arguments for current_date and current_time
+  current_date: () => 'current_date',
+  current_time: () => 'current_time',
+}
+
+const HANAFunctions = {
+  /** defined in db-service */
+}
+
+for (let each in HANAFunctions) HANAFunctions[each.toUpperCase()] = HANAFunctions[each]
+
+module.exports = { ...StandardFunctions, ...HANAFunctions }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/sqlite",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "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.2.1",
+    "@cap-js/db-service": "^1.3.1",
     "better-sqlite3": "^8"
   },
   "peerDependencies": {