@cap-js/sqlite 2.1.3 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/lib/SQLiteService.js +39 -10
- package/lib/node-sqlite.js +36 -0
- package/lib/sql.js.js +97 -0
- package/package.json +11 -5
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,26 @@
|
|
|
4
4
|
- The format is based on [Keep a Changelog](http://keepachangelog.com/).
|
|
5
5
|
- This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
|
+
## [2.2.0](https://github.com/cap-js/cds-dbs/compare/sqlite-v2.1.3...sqlite-v2.2.0) (2026-03-09)
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Added
|
|
11
|
+
|
|
12
|
+
* support for `node:sqlite` and `sql.js` ([#614](https://github.com/cap-js/cds-dbs/issues/614)) ([887d1bb](https://github.com/cap-js/cds-dbs/commit/887d1bba82347857364bc133983b9e16e054d6cd))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Fixed
|
|
16
|
+
|
|
17
|
+
* hana groupby with path expressions ([#1493](https://github.com/cap-js/cds-dbs/issues/1493)) ([920acde](https://github.com/cap-js/cds-dbs/commit/920acdee0edb538b74d6e5cb0a82a086556df85e))
|
|
18
|
+
* the combination of `iterator` and `SELECT.one` ([#1514](https://github.com/cap-js/cds-dbs/issues/1514)) ([4b28579](https://github.com/cap-js/cds-dbs/commit/4b2857920a7a57bcfc09a9b5fb765283cf8bd70b))
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### Dependencies
|
|
22
|
+
|
|
23
|
+
* The following workspace dependencies were updated
|
|
24
|
+
* dependencies
|
|
25
|
+
* @cap-js/db-service bumped from ^2.8.2 to ^2.9.0
|
|
26
|
+
|
|
7
27
|
## [2.1.3](https://github.com/cap-js/cds-dbs/compare/sqlite-v2.1.2...sqlite-v2.1.3) (2026-02-03)
|
|
8
28
|
|
|
9
29
|
|
package/lib/SQLiteService.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const { SQLService } = require('@cap-js/db-service')
|
|
2
|
-
const cds = require('@sap/cds')
|
|
3
|
-
|
|
2
|
+
const cds = require('@sap/cds/lib')
|
|
3
|
+
let sqlite // sqlite driver is loaded on connect
|
|
4
|
+
|
|
4
5
|
const $session = Symbol('dbc.session')
|
|
5
6
|
const sessionVariableMap = require('./session.json') // Adjust the path as necessary for your project
|
|
6
7
|
const convStrm = require('stream/consumers')
|
|
@@ -28,9 +29,12 @@ class SQLiteService extends SQLService {
|
|
|
28
29
|
get factory() {
|
|
29
30
|
return {
|
|
30
31
|
options: this.options.pool || {},
|
|
31
|
-
create: tenant => {
|
|
32
|
+
create: async tenant => {
|
|
33
|
+
if (!sqlite) loadSQLite(this.options.driver || this.options.credentials?.driver)
|
|
32
34
|
const database = this.url4(tenant)
|
|
33
|
-
const dbc = new sqlite(database, this.options.client)
|
|
35
|
+
const dbc = new sqlite(database, this.options.client || {})
|
|
36
|
+
await dbc.ready
|
|
37
|
+
|
|
34
38
|
const deterministic = { deterministic: true }
|
|
35
39
|
dbc.function('session_context', key => dbc[$session][key])
|
|
36
40
|
dbc.function('regexp', deterministic, (re, x) => (RegExp(re).test(x) ? 1 : 0))
|
|
@@ -41,7 +45,7 @@ class SQLiteService extends SQLService {
|
|
|
41
45
|
dbc.function('hour', deterministic, d => d === null ? null : toDate(d, true).getUTCHours())
|
|
42
46
|
dbc.function('minute', deterministic, d => d === null ? null : toDate(d, true).getUTCMinutes())
|
|
43
47
|
dbc.function('second', deterministic, d => d === null ? null : toDate(d, true).getUTCSeconds())
|
|
44
|
-
if (
|
|
48
|
+
if (database !== ':memory:') dbc.pragma?.('journal_mode = WAL') || dbc.exec('PRAGMA journal_mode = WAL')
|
|
45
49
|
return dbc
|
|
46
50
|
},
|
|
47
51
|
destroy: dbc => dbc.close(),
|
|
@@ -106,7 +110,10 @@ class SQLiteService extends SQLService {
|
|
|
106
110
|
const pageSize = (1 << 16)
|
|
107
111
|
// Allow for both array and iterator result sets
|
|
108
112
|
const first = Array.isArray(rs) ? { done: !rs[0], value: rs[0] } : rs.next()
|
|
109
|
-
if (first.done)
|
|
113
|
+
if (first.done) {
|
|
114
|
+
yield one ? 'null' : '[]'
|
|
115
|
+
return
|
|
116
|
+
}
|
|
110
117
|
if (one) {
|
|
111
118
|
yield first.value[0]
|
|
112
119
|
// Close result set to release database connection
|
|
@@ -134,10 +141,8 @@ class SQLiteService extends SQLService {
|
|
|
134
141
|
}
|
|
135
142
|
|
|
136
143
|
async _allStream(stmt, binding_params, one, objectMode) {
|
|
137
|
-
stmt = stmt.
|
|
138
|
-
stmt.raw(true)
|
|
139
|
-
const get = stmt.get(binding_params)
|
|
140
|
-
if (!get) return []
|
|
144
|
+
stmt = stmt.iterate ? stmt : stmt.__proto__
|
|
145
|
+
stmt.raw?.(true)
|
|
141
146
|
const rs = stmt.iterate(binding_params)
|
|
142
147
|
const stream = Readable.from(objectMode ? this._iteratorObjectMode(rs) : this._iteratorRaw(rs, one), { objectMode })
|
|
143
148
|
const close = () => rs.return() // finish result set when closed early
|
|
@@ -293,4 +298,28 @@ class SQLiteService extends SQLService {
|
|
|
293
298
|
}
|
|
294
299
|
}
|
|
295
300
|
|
|
301
|
+
function loadSQLite(driver) {
|
|
302
|
+
const drivers = {
|
|
303
|
+
node: './node-sqlite.js',
|
|
304
|
+
'better-sqlite3': 'better-sqlite3',
|
|
305
|
+
'sql.js': './sql.js.js',
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
if (driver) {
|
|
309
|
+
sqlite = require(drivers[driver])
|
|
310
|
+
return
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
try {
|
|
314
|
+
sqlite = require(drivers['better-sqlite3'])
|
|
315
|
+
} catch {
|
|
316
|
+
try {
|
|
317
|
+
sqlite = require(drivers.node)
|
|
318
|
+
} catch {
|
|
319
|
+
// When failing to load better-sqlite3 it fallsback to sql.js (wasm version of sqlite)
|
|
320
|
+
sqlite = require(drivers['sql.js'])
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
|
|
296
325
|
module.exports = SQLiteService
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
const { DatabaseSync } = require('node:sqlite');
|
|
2
|
+
|
|
3
|
+
class NodeSqlite extends DatabaseSync {
|
|
4
|
+
prepare(sql) {
|
|
5
|
+
const stmt = super.prepare(sql)
|
|
6
|
+
const ret = {
|
|
7
|
+
run(params) {
|
|
8
|
+
try {
|
|
9
|
+
params = Array.isArray(params) ? params : [params]
|
|
10
|
+
return stmt.run(...params)
|
|
11
|
+
} catch (err) {
|
|
12
|
+
if (err.message.indexOf('NOT NULL constraint failed:') === 0) {
|
|
13
|
+
err.code = 'SQLITE_CONSTRAINT_NOTNULL'
|
|
14
|
+
}
|
|
15
|
+
throw err
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
get(params) {
|
|
19
|
+
params = Array.isArray(params) ? params : [params]
|
|
20
|
+
return stmt.get(...params)
|
|
21
|
+
},
|
|
22
|
+
all(params) {
|
|
23
|
+
params = Array.isArray(params) ? params : [params]
|
|
24
|
+
return stmt.all(...params)
|
|
25
|
+
},
|
|
26
|
+
iterate(params) {
|
|
27
|
+
stmt.setReturnArrays(true)
|
|
28
|
+
params = Array.isArray(params) ? params : [params]
|
|
29
|
+
return stmt.iterate(...params)
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return ret
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
module.exports = NodeSqlite
|
package/lib/sql.js.js
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
const initSqlJs = require('sql.js');
|
|
2
|
+
|
|
3
|
+
const init = initSqlJs({})
|
|
4
|
+
|
|
5
|
+
class WasmSqlite {
|
|
6
|
+
constructor(/*database*/) {
|
|
7
|
+
// TODO: load / store database file contents
|
|
8
|
+
this.ready = init
|
|
9
|
+
.then(SQL => {
|
|
10
|
+
this.db = new SQL.Database()
|
|
11
|
+
// polyfill for missing or mismatched default sqlite3 math functions
|
|
12
|
+
this.db.create_function('ln', x => Math.log(x))
|
|
13
|
+
this.db.create_function('log', (x) => Math.log10(x))
|
|
14
|
+
this.db.create_function('log', (x, y) => Math.log(y) / Math.log(x))
|
|
15
|
+
this.db.create_function('mod', (x, y) => x % y)
|
|
16
|
+
})
|
|
17
|
+
|
|
18
|
+
this.memory = true
|
|
19
|
+
this.gc = new FinalizationRegistry(stmt => { stmt.free() })
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
prepare(sql) {
|
|
23
|
+
const stmt = this.db.prepare(sql)
|
|
24
|
+
const ret = {
|
|
25
|
+
run(params) {
|
|
26
|
+
try {
|
|
27
|
+
stmt.bind(params)
|
|
28
|
+
stmt.step()
|
|
29
|
+
return { changes: stmt.db.getRowsModified(stmt) }
|
|
30
|
+
} catch (err) {
|
|
31
|
+
if (err.message.indexOf('NOT NULL constraint failed:') === 0) {
|
|
32
|
+
err.code = 'SQLITE_CONSTRAINT_NOTNULL'
|
|
33
|
+
}
|
|
34
|
+
throw err
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
get(params) {
|
|
38
|
+
const columns = stmt.getColumnNames()
|
|
39
|
+
stmt.bind(params)
|
|
40
|
+
stmt.step()
|
|
41
|
+
const row = stmt.get()
|
|
42
|
+
const ret = {}
|
|
43
|
+
for (let i = 0; i < columns.length; i++) {
|
|
44
|
+
ret[columns[i]] = row[i]
|
|
45
|
+
}
|
|
46
|
+
return ret
|
|
47
|
+
},
|
|
48
|
+
all(params) {
|
|
49
|
+
const columns = stmt.getColumnNames()
|
|
50
|
+
const ret = []
|
|
51
|
+
stmt.bind(params)
|
|
52
|
+
while (stmt.step()) {
|
|
53
|
+
const row = stmt.get()
|
|
54
|
+
const obj = {}
|
|
55
|
+
for (let i = 0; i < columns.length; i++) {
|
|
56
|
+
obj[columns[i]] = row[i]
|
|
57
|
+
}
|
|
58
|
+
ret.push(obj)
|
|
59
|
+
}
|
|
60
|
+
return ret
|
|
61
|
+
},
|
|
62
|
+
*iterate(params) {
|
|
63
|
+
stmt.bind(params)
|
|
64
|
+
while (stmt.step()) {
|
|
65
|
+
yield stmt.get()
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
this.gc.register(ret, stmt)
|
|
70
|
+
return ret
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
exec(sql) {
|
|
74
|
+
try {
|
|
75
|
+
const { columns, values } = this.db.exec(sql)
|
|
76
|
+
return !Array.isArray(values) ? values : values.map(val => {
|
|
77
|
+
const ret = {}
|
|
78
|
+
for (let i = 0; i < columns.length; i++) {
|
|
79
|
+
ret[columns[i]] = val[i]
|
|
80
|
+
}
|
|
81
|
+
return ret
|
|
82
|
+
})
|
|
83
|
+
} catch (err) {
|
|
84
|
+
// REVISIT: address transaction errors
|
|
85
|
+
if (sql === 'BEGIN' || sql === 'ROLLBACK') { return }
|
|
86
|
+
throw err
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
function(name, config, func) {
|
|
91
|
+
this.db.create_function(name, func || config)
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
close() { this.db.close() }
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
module.exports = WasmSqlite
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cap-js/sqlite",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "CDS database service for SQLite",
|
|
5
5
|
"homepage": "https://github.com/cap-js/cds-dbs/tree/main/sqlite#cds-database-service-for-sqlite",
|
|
6
6
|
"repository": {
|
|
@@ -26,11 +26,17 @@
|
|
|
26
26
|
"test": "cds-test"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"
|
|
30
|
-
"
|
|
29
|
+
"better-sqlite3": "^12.0.0",
|
|
30
|
+
"@cap-js/db-service": "^2.9.0"
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
|
33
|
-
"@sap/cds": ">=9"
|
|
33
|
+
"@sap/cds": ">=9.8",
|
|
34
|
+
"sql.js": "^1.13.0"
|
|
35
|
+
},
|
|
36
|
+
"peerDependenciesMeta": {
|
|
37
|
+
"sql.js": {
|
|
38
|
+
"optional": true
|
|
39
|
+
}
|
|
34
40
|
},
|
|
35
41
|
"cds": {
|
|
36
42
|
"requires": {
|
|
@@ -54,4 +60,4 @@
|
|
|
54
60
|
}
|
|
55
61
|
},
|
|
56
62
|
"license": "Apache-2.0"
|
|
57
|
-
}
|
|
63
|
+
}
|