@cap-js/sqlite 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,12 +1,36 @@
-# Change Log
+# Changelog
 
 - All notable changes to this project are documented in this file.
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.4.0](https://github.com/cap-js/cds-dbs/compare/sqlite-v1.3.1...sqlite-v1.4.0) (2023-11-20)
+
+
+### Added
+
+* **temporal data:** add time slice key to conflict clause ([#249](https://github.com/cap-js/cds-dbs/issues/249)) ([67b8edf](https://github.com/cap-js/cds-dbs/commit/67b8edf9b7f6b0fbab0010d7c93ed03a01e103ed))
+
+
+### Fixed
+
+* align time function behavior ([#322](https://github.com/cap-js/cds-dbs/issues/322)) ([c3ab40a](https://github.com/cap-js/cds-dbs/commit/c3ab40a007c105465349dd2f612178367b8e713a))
+* date functions with null value ([#347](https://github.com/cap-js/cds-dbs/issues/347)) ([bdc8967](https://github.com/cap-js/cds-dbs/commit/bdc8967f07276acdb249dec42231d432e132e0d4))
+
+
+### Changed
+
+* upgrade to better-sqlite@9 ([#334](https://github.com/cap-js/cds-dbs/issues/334)) ([5184e41](https://github.com/cap-js/cds-dbs/commit/5184e4155ccd1a2945a1fc033204e24425d70341))
+
+## [1.3.1](https://github.com/cap-js/cds-dbs/compare/v1.3.0...v1.3.1) (2023-10-10)
+
+### Changed
+
+- Updated minimum required version of `@cap-js/db-service`.
+
 ## Version 1.3.0 - 2023-10-06
 
-### Fixed 
+### Fixed
 
 - `CURRENT_TIMESTAMP` in view definition preserves the timezone. #254 
 

package/README.md

@@ -14,7 +14,6 @@ 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).
@@ -23,6 +22,11 @@ This project is open to feature requests/suggestions, bug reports etc. via [GitH
 
 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).
 
+## Versioning
+
+This library follows [Semantic Versioning](https://semver.org/).
+All notable changes are documented in [CHANGELOG.md](CHANGELOG.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.

package/lib/SQLiteService.js

@@ -12,10 +12,30 @@ 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: 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, ','))
+        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())
+
+        dbc.function('json_merge', { varargs: true, deterministic: true }, (...args) =>
+          args.join('').replace(/}{/g, ','),
+        )
         if (!dbc.memory) dbc.pragma('journal_mode = WAL')
         return dbc
       },
@@ -136,7 +156,6 @@ class SQLiteService extends SQLService {
   }
 
   static CQN2SQL = class CQN2SQLite extends SQLService.CQN2SQL {
-
     column_alias4(x, q) {
       let alias = super.column_alias4(x, q)
       if (alias) return alias
@@ -201,13 +220,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 = {
@@ -219,8 +232,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.3.0",
+  "version": "1.4.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,8 +30,8 @@
     "test": "jest --silent"
   },
   "dependencies": {
-    "@cap-js/db-service": "^1.3.0",
-    "better-sqlite3": "^8"
+    "@cap-js/db-service": "^1.3.1",
+    "better-sqlite3": "^9"
   },
   "peerDependencies": {
     "@sap/cds": ">=7"