@bitblit/ratchet-rdbms 4.0.449-alpha → 4.0.451-alpha

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.
@@ -0,0 +1,4 @@
1
+ export interface QueryAndParams {
2
+ query: string;
3
+ params: Record<string, any>;
4
+ }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=query-and-params.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"query-and-params.js","sourceRoot":"","sources":["../../../src/sqlite/model/query-and-params.ts"],"names":[],"mappings":""}
@@ -1,15 +1,16 @@
1
- import { AsyncDatabase } from 'promised-sqlite3';
2
1
  import { DatabaseAccess } from '../model/database-access.js';
3
2
  import { DatabaseRequestType } from '../model/database-request-type.js';
4
3
  import { ModifyResults } from '../model/modify-results.js';
5
4
  import { RequestResults } from '../model/request-results.js';
6
5
  import { SqliteConnectionConfigFlag } from './model/sqlite-connection-config-flag.js';
6
+ import { Database } from "better-sqlite3";
7
+ import { QueryAndParams } from "./model/query-and-params";
7
8
  export declare class SqliteDatabaseAccess implements DatabaseAccess {
8
9
  private conn;
9
10
  private flags;
10
11
  private extraConfig;
11
- constructor(conn: AsyncDatabase, flags: SqliteConnectionConfigFlag[], extraConfig: Record<string, any>);
12
- get connection(): AsyncDatabase;
12
+ constructor(conn: Database, flags: SqliteConnectionConfigFlag[], extraConfig: Record<string, any>);
13
+ get connection(): Database;
13
14
  beginTransaction(): Promise<void>;
14
15
  close(): Promise<boolean>;
15
16
  commitTransaction(): Promise<void>;
@@ -19,6 +20,7 @@ export declare class SqliteDatabaseAccess implements DatabaseAccess {
19
20
  onRequestSuccessOrFailure(_type: DatabaseRequestType): Promise<void>;
20
21
  preQuery(): Promise<void>;
21
22
  modify(query: string, fields: Record<string, any>): Promise<RequestResults<ModifyResults>>;
23
+ preprocessQuery(qap: QueryAndParams): QueryAndParams;
22
24
  query<S>(inQuery: string, inFields: Record<string, any>): Promise<RequestResults<S>>;
23
25
  testConnection(logTestResults?: boolean): Promise<number | null>;
24
26
  rollbackTransaction(): Promise<void>;
@@ -3,6 +3,7 @@ import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
3
3
  import SqlString from 'sqlstring';
4
4
  import { QueryUtil } from '../query-builder/query-util.js';
5
5
  import { SqliteConnectionConfigFlag } from './model/sqlite-connection-config-flag.js';
6
+ import { NumberRatchet } from "@bitblit/ratchet-common/lang/number-ratchet";
6
7
  export class SqliteDatabaseAccess {
7
8
  conn;
8
9
  flags;
@@ -20,7 +21,7 @@ export class SqliteDatabaseAccess {
20
21
  }
21
22
  async close() {
22
23
  try {
23
- await this.conn.close();
24
+ this.conn.close();
24
25
  return true;
25
26
  }
26
27
  catch (err) {
@@ -47,14 +48,14 @@ export class SqliteDatabaseAccess {
47
48
  return Promise.resolve(undefined);
48
49
  }
49
50
  async modify(query, fields) {
50
- const out = await this.query(query, fields);
51
- Logger.debug('Modify returned %j', out);
52
- const val = await this.conn.all('SELECT changes() as changedRows, last_insert_rowid() as insertId;');
51
+ const qap = this.preprocessQuery({ query: query, params: fields });
52
+ const stmt = this.conn.prepare(qap.query);
53
+ const tmp = stmt.run(qap.params);
53
54
  const update = {
54
- changedRows: val[0]['changedRows'],
55
- insertId: val[0]['insertId'],
55
+ changedRows: tmp.changes,
56
+ insertId: NumberRatchet.safeNumber(tmp.lastInsertRowid),
56
57
  fieldCount: undefined,
57
- affectedRows: val[0]['changedRows'],
58
+ affectedRows: tmp.changes,
58
59
  info: undefined,
59
60
  serverStatus: undefined,
60
61
  warningStatus: undefined,
@@ -65,22 +66,28 @@ export class SqliteDatabaseAccess {
65
66
  };
66
67
  return res;
67
68
  }
68
- async query(inQuery, inFields) {
69
- const fields = QueryUtil.addPrefixToFieldNames(inFields, ':');
70
- let query = QueryUtil.replaceNullReplacementsInQuery(inQuery, fields);
71
- const slFields = QueryUtil.removeUnusedFields(query, fields);
72
- Object.keys(slFields).forEach((k) => {
73
- const val = slFields[k];
69
+ preprocessQuery(qap) {
70
+ const rval = Object.assign(qap);
71
+ const tmp = QueryUtil.addPrefixToFieldNames(rval.params, ':');
72
+ rval.query = QueryUtil.replaceNullReplacementsInQuery(rval.query, tmp);
73
+ rval.params = QueryUtil.removeUnusedFields(rval.query, rval.params, ':');
74
+ Object.keys(tmp).forEach((k) => {
75
+ const val = tmp[k];
74
76
  if (Array.isArray(val)) {
75
77
  const escaped = this.escape(val);
76
- query = query.replaceAll(k, escaped);
77
- delete slFields[k];
78
+ rval.query = rval.query.replaceAll(k, escaped);
79
+ delete rval.params[k.substring(1)];
78
80
  }
79
81
  });
80
82
  if ((this.flags || []).includes(SqliteConnectionConfigFlag.AlwaysCollateNoCase)) {
81
- query += ' COLLATE NOCASE';
83
+ rval.query += ' COLLATE NOCASE';
82
84
  }
83
- const res = await this.conn.all(query, slFields);
85
+ return rval;
86
+ }
87
+ async query(inQuery, inFields) {
88
+ const qap = this.preprocessQuery({ query: inQuery, params: inFields });
89
+ const stmt = this.conn.prepare(qap.query);
90
+ const res = stmt.all(qap.params);
84
91
  const rval = {
85
92
  results: res,
86
93
  fields: null,
@@ -1 +1 @@
1
- {"version":3,"file":"sqlite-database-access.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-database-access.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqlite-database-access.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-database-access.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import { AsyncDatabase } from 'promised-sqlite3';
2
1
  import { RequireRatchet } from '@bitblit/ratchet-common/lang/require-ratchet';
3
2
  import { Logger } from '@bitblit/ratchet-common/logger/logger';
4
3
  import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
@@ -8,6 +7,7 @@ import { SqliteDatabaseAccess } from './sqlite-database-access.js';
8
7
  import { DatabaseRequestType } from '../model/database-request-type.js';
9
8
  import { FlushRemoteMode } from './model/flush-remote-mode.js';
10
9
  import { FetchRemoteMode } from './model/fetch-remote-mode.js';
10
+ import DatabaseConstructor from "better-sqlite3";
11
11
  export class SqliteRemoteSyncDatabaseAccess {
12
12
  cfg;
13
13
  flags;
@@ -31,10 +31,12 @@ export class SqliteRemoteSyncDatabaseAccess {
31
31
  }
32
32
  changeFlushRemoteMode(newMode) {
33
33
  RequireRatchet.notNullOrUndefined(newMode, 'newMode');
34
+ Logger.info('Changing flush remote mode from %s to %s', this.cfg.flushRemoteMode, newMode);
34
35
  this.cfg.flushRemoteMode = newMode;
35
36
  }
36
37
  changeFetchRemoteMode(newMode) {
37
38
  RequireRatchet.notNullOrUndefined(newMode, 'newMode');
39
+ Logger.info('Changing fetch remote mode from %s to %s', this.cfg.fetchRemoteMode, newMode);
38
40
  this.cfg.fetchRemoteMode = newMode;
39
41
  }
40
42
  async flushLocalToRemote() {
@@ -60,7 +62,7 @@ export class SqliteRemoteSyncDatabaseAccess {
60
62
  ? await this.cfg.remoteFileSync.fetchRemoteToLocal()
61
63
  : await this.cfg.remoteFileSync.sendLocalToRemote();
62
64
  Logger.info('Returned %s - reopening', result);
63
- const newDb = await AsyncDatabase.open(this.cfg.remoteFileSync.localFileName);
65
+ const newDb = new DatabaseConstructor(this.cfg.remoteFileSync.localFileName);
64
66
  rval = new SqliteDatabaseAccess(newDb, this.flags, this.extraConfig);
65
67
  Logger.info('closeSyncReopen took %s', sw.dump());
66
68
  }
@@ -74,7 +76,7 @@ export class SqliteRemoteSyncDatabaseAccess {
74
76
  Logger.info('Pulling file local');
75
77
  await this.cfg.remoteFileSync.fetchRemoteToLocal();
76
78
  Logger.info('Creating database');
77
- const db = await AsyncDatabase.open(this.cfg.remoteFileSync.localFileName);
79
+ const db = new DatabaseConstructor(this.cfg.remoteFileSync.localFileName);
78
80
  const rval = new SqliteDatabaseAccess(db, this.flags, this.extraConfig);
79
81
  return rval;
80
82
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sqlite-remote-sync-database-access.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-remote-sync-database-access.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqlite-remote-sync-database-access.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-remote-sync-database-access.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,10 @@ import { RequireRatchet } from '@bitblit/ratchet-common/lang/require-ratchet';
2
2
  import { Logger } from '@bitblit/ratchet-common/logger/logger';
3
3
  import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
4
4
  import { StringRatchet } from '@bitblit/ratchet-common/lang/string-ratchet';
5
- import { AsyncDatabase } from 'promised-sqlite3';
6
5
  import fs from 'fs';
7
6
  import { SqliteDatabaseAccess } from './sqlite-database-access.js';
8
7
  import { SqliteRemoteSyncDatabaseAccess } from './sqlite-remote-sync-database-access.js';
8
+ import DatabaseConstructor from "better-sqlite3";
9
9
  export class SqliteStyleConnectionProvider {
10
10
  configPromiseProvider;
11
11
  additionalConfig;
@@ -95,12 +95,12 @@ export class SqliteStyleConnectionProvider {
95
95
  if (!fs.existsSync(dbCfg.localFile.filePath)) {
96
96
  throw ErrorRatchet.fErr('Requested file does not exist : %s', dbCfg.localFile.filePath);
97
97
  }
98
- const db = await AsyncDatabase.open(dbCfg.localFile.filePath);
98
+ const db = new DatabaseConstructor(dbCfg.localFile.filePath);
99
99
  rval = new SqliteDatabaseAccess(db, dbCfg.flags, _additionalConfig);
100
100
  }
101
101
  else {
102
102
  Logger.info('Neither remote nor local file specified, using memory');
103
- const db = await AsyncDatabase.open(':memory:');
103
+ const db = new DatabaseConstructor(':memory:');
104
104
  rval = new SqliteDatabaseAccess(db, dbCfg.flags, _additionalConfig);
105
105
  }
106
106
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sqlite-style-connection-provider.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-style-connection-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqlite-style-connection-provider.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-style-connection-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAKzF,OAAO,mBAAuD,MAAM,gBAAgB,CAAC;AAIrF,MAAM,OAAO,6BAA6B;IAI9B;IACA;IAJF,eAAe,GAAyC,IAAI,GAAG,EAAmC,CAAC;IACnG,kBAAkB,CAAsD;IAChF,YACU,qBAAgF,EAChF,mBAAwC,EAAE;QAD1C,0BAAqB,GAArB,qBAAqB,CAA2D;QAChF,qBAAgB,GAAhB,gBAAgB,CAA0B;QAElD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,IAAI,CAAC,2BAA2B,EAAE,CAAC;IACrC,CAAC;IAEO,2BAA2B;QACjC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACtB,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YAC7D,IAAI,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5C,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,wBAAwB;QACnC,MAAM,IAAI,GAAG,KAAK,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;QAE3E,MAAM,cAAc,GAA8B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;QAG5F,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QAGjC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/C,MAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC/E,IAAI,CAAC;oBACH,MAAM,IAAI,GAAmB,MAAM,cAAc,CAAC,CAAC,CAAC,CAAC;oBACrD,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;oBAC1B,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;wBAC/C,IAAI,CAAC;4BACH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;4BACnB,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;wBAC5C,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,IAAI,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;4BAE/D,CAAC;iCAAM,CAAC;gCACN,MAAM,CAAC,KAAK,CAAC,2DAA2D,EAAE,GAAG,CAAC,CAAC;4BACjF,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,IAAY;QACzC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,oDAAoD,EAAE,IAAI,CAAC,CAAC;YACxE,MAAM,QAAQ,GAA2B,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACtE,MAAM,UAAU,GAA4B,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;YAC5G,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,IAAY;QACpC,MAAM,CAAC,IAAI,CAAC,qEAAqE,EAAE,IAAI,CAAC,CAAC;QACzF,MAAM,IAAI,GAA+C,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACpF,MAAM,MAAM,GAAW,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QACrE,MAAM,QAAQ,GAA2B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC;QAC9H,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,YAAY,CAAC,IAAI,CACrB,+DAA+D,EAC/D,IAAI,EACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAChC,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGO,KAAK,CAAC,mBAAmB,CAC/B,KAA6B,EAC7B,oBAAyC,EAAE,EAC3C,6BAAsC;QAEtC,MAAM,CAAC,IAAI,CAAC,2DAA2D,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACtF,cAAc,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAElD,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACrE,IAAI,IAAoB,CAAC;QACzB,IAAI,CAAC;YACH,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBACzB,IAAI,GAAG,IAAI,8BAA8B,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YAClG,CAAC;iBAAM,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7C,MAAM,YAAY,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAC1F,CAAC;gBACD,MAAM,EAAE,GAAa,IAAI,mBAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACvE,IAAI,GAAG,IAAI,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;gBACrE,MAAM,EAAE,GAAa,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;gBACzD,IAAI,GAAG,IAAI,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,8DAA8D,EAAE,GAAG,CAAC,CAAC;YACjF,IAAI,6BAA6B,EAAE,CAAC;gBAClC,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAC;YACpE,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAChE,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACxC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,YAAY,GAAwD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACvG,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC1C,MAAM,GAAG,GAA+C,MAAM,YAAY,CAAC;QAC3E,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;QAE3D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACxB,MAAM,MAAM,GAAa,6BAA6B,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACzE,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;gBACnB,MAAM,YAAY,CAAC,IAAI,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,GAA2B;QACrD,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;YAC/D,CAAC;YACD,IAAI,GAAG,CAAC,SAAS,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvE,IAAI,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;gBAC7D,IAAI,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;YAC9E,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bitblit/ratchet-rdbms",
3
- "version": "4.0.449-alpha",
3
+ "version": "4.0.451-alpha",
4
4
  "description": "Ratchet tooling for working with relational databases",
5
5
  "sideEffects": false,
6
6
  "type": "module",
@@ -47,25 +47,26 @@
47
47
  },
48
48
  "license": "Apache-2.0",
49
49
  "dependencies": {
50
- "@bitblit/ratchet-common": "4.0.449-alpha"
50
+ "@bitblit/ratchet-common": "4.0.451-alpha"
51
51
  },
52
52
  "optionalDependencies": {
53
+ "better-sqlite3": "11.1.2",
53
54
  "get-port": "7.1.0",
54
55
  "mysql2": "3.11.0",
55
- "promised-sqlite3": "2.1.0",
56
- "sqlite3": "5.1.7",
57
56
  "sqlstring": "2.3.3",
58
57
  "tunnel-ssh": "5.1.2"
59
58
  },
60
59
  "peerDependencies": {
61
- "@bitblit/ratchet-common": "4.0.449-alpha",
60
+ "@bitblit/ratchet-common": "4.0.451-alpha",
61
+ "better-sqlite3": "^11.1.2",
62
62
  "get-port": "^7.1.0",
63
63
  "mysql2": "^3.11.1",
64
- "promised-sqlite3": "2.1.0",
65
- "sqlite3": "^5.1.7",
66
64
  "sqlstring": "^2.3.3",
67
65
  "tunnel-ssh": "^5.1.2"
68
66
  },
67
+ "devDependencies": {
68
+ "@types/better-sqlite3": "7.6.11"
69
+ },
69
70
  "peerDependenciesMeta": {
70
71
  "mysql2": {
71
72
  "optional": true