npm - @bitblit/ratchet-rdbms - Versions diffs - 5.1.695-alpha → 5.1.697-alpha - Mend

@bitblit/ratchet-rdbms 5.1.695-alpha → 5.1.697-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.

Files changed (24) hide show

package/lib/postgres/model/postgres-db-config.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import { SshTunnelConfig } from "../../model/ssh/ssh-tunnel-config.ts";
+import { Config } from 'pg';
+export interface PostgresDbConfig {
+    label: string;
+    dbConfig: Config;
+    sshTunnelConfig?: SshTunnelConfig;
+}

package/lib/postgres/model/postgres-db-config.js ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=postgres-db-config.js.map

package/lib/postgres/model/postgres-db-config.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"postgres-db-config.js","sourceRoot":"","sources":["../../../src/postgres/model/postgres-db-config.ts"],"names":[],"mappings":""}

package/lib/postgres/postgres-style-connection-provider.d.ts ADDED Viewed

@@ -0,0 +1,27 @@
+import { SshTunnelService } from '../service/ssh-tunnel-service.js';
+import { DatabaseConfigList } from '../model/database-config-list.js';
+import { QueryDefaults } from '../model/query-defaults.js';
+import { ConnectionAndTunnel } from '../model/connection-and-tunnel.js';
+import { DatabaseAccessProvider } from '../model/database-access-provider.js';
+import { DatabaseAccess } from '../model/database-access.js';
+import { Client } from 'pg';
+import { PostgresDbConfig } from "./model/postgres-db-config.ts";
+export declare class PostgresStyleConnectionProvider implements DatabaseAccessProvider {
+    private configPromiseProvider;
+    private ssh?;
+    private connectionCache;
+    private cacheConfigPromise;
+    constructor(configPromiseProvider: () => Promise<DatabaseConfigList<PostgresDbConfig>>, ssh?: SshTunnelService);
+    get usingSshTunnel(): boolean;
+    private addShutdownHandlerToProcess;
+    clearDatabaseAccessCache(): Promise<boolean>;
+    getConnectionAndTunnel(name: string): Promise<ConnectionAndTunnel<Client, PostgresDbConfig>>;
+    getDatabaseAccess(name: string): Promise<DatabaseAccess | undefined>;
+    createNonPooledConnectionAndTunnel(queryDefaults: QueryDefaults): Promise<ConnectionAndTunnel<Client, PostgresDbConfig>>;
+    createNonPooledDatabaseConnection(queryDefaults: QueryDefaults): Promise<Client | undefined>;
+    private getDbConfig;
+    private createConnectionAndTunnel;
+    private configPromise;
+    private createConnectionConfig;
+    static validDbConfig(cfg: PostgresDbConfig): string[];
+}

package/lib/postgres/postgres-style-connection-provider.js ADDED Viewed

@@ -0,0 +1,202 @@
+import { RequireRatchet } from '@bitblit/ratchet-common/lang/require-ratchet';
+import { Logger } from '@bitblit/ratchet-common/logger/logger';
+import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
+import { StringRatchet } from '@bitblit/ratchet-common/lang/string-ratchet';
+import getPort from 'get-port';
+import { Client } from 'pg';
+import { PostgresStyleDatabaseAccess } from "./postgres-style-database-access.js";
+export class PostgresStyleConnectionProvider {
+    configPromiseProvider;
+    ssh;
+    connectionCache = new Map();
+    cacheConfigPromise;
+    constructor(configPromiseProvider, ssh) {
+        this.configPromiseProvider = configPromiseProvider;
+        this.ssh = ssh;
+        this.cacheConfigPromise = this.createConnectionConfig();
+        Logger.info('Added shutdown handler to the process (Only once per instantiation)');
+        this.addShutdownHandlerToProcess();
+    }
+    get usingSshTunnel() {
+        return !!this.ssh;
+    }
+    addShutdownHandlerToProcess() {
+        process.on('exit', () => {
+            Logger.info('Process is shutting down, closing connections');
+            this.clearDatabaseAccessCache().catch((err) => {
+                Logger.error('Shutdown connection failed : %s', err);
+            });
+        });
+    }
+    async clearDatabaseAccessCache() {
+        const rval = false;
+        Logger.info('Clearing connection cache for PostgresStyleConnectionProvider');
+        const oldConnections = Array.from(this.connectionCache.values());
+        this.cacheConfigPromise = null;
+        this.connectionCache = new Map();
+        if (oldConnections.length > 0) {
+            for (let i = 0; i < oldConnections.length; i++) {
+                Logger.info('Shutting down old connection %d of %d', i, oldConnections.length);
+                try {
+                    const conn = await oldConnections[i];
+                    Logger.info('Conn %d is %s', i, conn?.config?.label);
+                    if (conn.db) {
+                        Logger.info('Stopping connection to database');
+                        try {
+                            await conn.db.end();
+                            Logger.info('Database connection closed');
+                        }
+                        catch (err) {
+                            if (ErrorRatchet.asErr(err).message.includes('closed state')) {
+                            }
+                            else {
+                                Logger.error('Something went wrong closing the database connection : %s', err);
+                            }
+                        }
+                    }
+                    if (conn.ssh) {
+                        try {
+                            Logger.info('Stopping ssh tunnel');
+                            await this.ssh.shutdown(conn.ssh);
+                            Logger.info('Ssh tunnel stopped');
+                        }
+                        catch (err) {
+                            Logger.warn('Failed to stop ssh tunnel : %s', err, err);
+                        }
+                    }
+                }
+                catch (err) {
+                    Logger.warn('Shutdown failed : %s ', err, err);
+                }
+            }
+        }
+        Logger.info('Old db and tunnels removed');
+        return rval;
+    }
+    async getConnectionAndTunnel(name) {
+        Logger.silly('getConnectionAndTunnel : %s', name);
+        if (!this.connectionCache.has(name)) {
+            Logger.info('No connectionCache found for %s - creating new one', name);
+            const dbConfig = await this.getDbConfig(name);
+            const connection = this.createConnectionAndTunnel(dbConfig, true);
+            this.connectionCache.set(name, connection);
+            Logger.info('Added connectionCache for %s', name);
+        }
+        return this.connectionCache.get(name);
+    }
+    async getDatabaseAccess(name) {
+        Logger.silly('getConnection : %s', name);
+        const conn = await this.getConnectionAndTunnel(name);
+        const dbConfig = await this.getDbConfig(name);
+        const rval = conn?.db ? new PostgresStyleDatabaseAccess(conn.db, dbConfig) : null;
+        return rval;
+    }
+    async createNonPooledConnectionAndTunnel(queryDefaults) {
+        Logger.info('Creating non-pooled connection for %s', queryDefaults.databaseName);
+        const dbConfig = await this.getDbConfig(queryDefaults.databaseName);
+        const rval = await this.createConnectionAndTunnel(dbConfig, false);
+        return rval;
+    }
+    async createNonPooledDatabaseConnection(queryDefaults) {
+        const conTunnel = await this.createNonPooledConnectionAndTunnel(queryDefaults);
+        return conTunnel?.db;
+    }
+    async getDbConfig(name) {
+        Logger.info('PostgresStyleConnectionProvider:getDbConfig:Initiating promise for %s', name);
+        const cfgs = await this.configPromise();
+        const finder = StringRatchet.trimToEmpty(name).toLowerCase();
+        const dbConfig = cfgs.dbList.find((s) => StringRatchet.trimToEmpty(s.label).toLowerCase() === finder);
+        if (!dbConfig) {
+            throw ErrorRatchet.fErr('Cannot find any connection config named %s (Available are %j)', name, cfgs.dbList.map((d) => d.label));
+        }
+        return dbConfig;
+    }
+    async createConnectionAndTunnel(dbCfg, clearCacheOnConnectionFailure) {
+        Logger.info('In PostgresStyleConnectionProvider:createConnectionAndTunnel : %s', dbCfg.label);
+        RequireRatchet.notNullOrUndefined(dbCfg, 'dbCfg');
+        let tunnel = null;
+        if (dbCfg.sshTunnelConfig) {
+            const localPort = dbCfg.sshTunnelConfig.forceLocalPort || (await getPort());
+            Logger.debug('SSH tunnel config found, opening tunnel to %s / %s to using local port %s', dbCfg.sshTunnelConfig.host, dbCfg.sshTunnelConfig.port, localPort);
+            tunnel = await this.ssh.createSSHTunnel(dbCfg.sshTunnelConfig, dbCfg.dbConfig.host, dbCfg.dbConfig.port, localPort);
+            Logger.debug('SSH Tunnel open');
+        }
+        else {
+            Logger.debug('No ssh configuration - skipping tunnel');
+        }
+        Logger.debug('Opening connection for PostgresStyleConnectionProvider');
+        let connection;
+        try {
+            const cfgCopy = structuredClone(dbCfg);
+            delete cfgCopy.label;
+            delete cfgCopy.sshTunnelConfig;
+            if (tunnel) {
+                cfgCopy.dbConfig.host = 'localhost';
+                cfgCopy.dbConfig.port = tunnel.localPort;
+            }
+            connection = new Client(cfgCopy.dbConfig);
+            await connection.connect();
+        }
+        catch (err) {
+            Logger.info('Failed trying to create connection : %s : clearing for retry', err);
+            if (clearCacheOnConnectionFailure) {
+                this.connectionCache = new Map();
+            }
+            return undefined;
+        }
+        const rval = {
+            config: dbCfg,
+            db: connection,
+            ssh: tunnel,
+        };
+        return rval;
+    }
+    configPromise() {
+        if (!this.cacheConfigPromise) {
+            this.cacheConfigPromise = this.createConnectionConfig();
+        }
+        return this.cacheConfigPromise;
+    }
+    async createConnectionConfig() {
+        RequireRatchet.notNullOrUndefined(this.configPromiseProvider, 'input');
+        const inputPromise = this.configPromiseProvider();
+        Logger.info('Creating connection config');
+        const cfg = await inputPromise;
+        RequireRatchet.true(cfg.dbList.length > 0, 'input.dbList');
+        cfg.dbList.forEach((db) => {
+            const errors = PostgresStyleConnectionProvider.validDbConfig(db);
+            if (errors?.length) {
+                throw ErrorRatchet.fErr('Errors found in db config : %j', errors);
+            }
+        });
+        return cfg;
+    }
+    static validDbConfig(cfg) {
+        let rval = [];
+        if (!cfg) {
+            rval.push('The config is null');
+        }
+        else if (!cfg.dbConfig) {
+            rval.push('The options field is null');
+        }
+        else {
+            if (StringRatchet.trimToNull(cfg?.dbConfig?.connectionString)) {
+            }
+            else {
+                rval.push(StringRatchet.trimToNull(cfg.dbConfig.host) ? null : 'host is required and non-empty');
+                rval.push(StringRatchet.trimToNull(cfg.label) ? null : 'label is required and non-empty');
+                rval.push(StringRatchet.trimToNull(cfg.dbConfig.database) ? null : 'database is required and non-empty');
+                rval.push(StringRatchet.trimToNull(cfg.dbConfig.user) ? null : 'user is required and non-empty');
+                rval.push(cfg.dbConfig.password ? null : 'password is required and non-empty');
+                rval.push(cfg.dbConfig.port ? null : 'port is required and non-empty');
+            }
+        }
+        if (cfg.sshTunnelConfig) {
+            rval.push(StringRatchet.trimToNull(cfg.sshTunnelConfig.host) ? null : 'If sshTunnelConfig is non-null, host is required and non-empty');
+            rval.push(cfg.sshTunnelConfig.port ? null : 'If sshTunnelConfig is non-null, port is required and non-empty');
+        }
+        rval = rval.filter((s) => !!s);
+        return rval;
+    }
+}
+//# sourceMappingURL=postgres-style-connection-provider.js.map

package/lib/postgres/postgres-style-connection-provider.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"postgres-style-connection-provider.js","sourceRoot":"","sources":["../../src/postgres/postgres-style-connection-provider.ts"],"names":[],"mappings":"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"}

package/lib/postgres/postgres-style-database-access.d.ts ADDED Viewed

@@ -0,0 +1,21 @@
+import { DatabaseAccess } from '../model/database-access.js';
+import { RequestResults } from '../model/request-results.js';
+import { ModifyResults } from '../model/modify-results.js';
+import { DatabaseRequestType } from '../model/database-request-type.js';
+import { PostgresDbConfig } from "./model/postgres-db-config.ts";
+import { Client } from 'pg';
+export declare class PostgresStyleDatabaseAccess implements DatabaseAccess {
+    private _connection;
+    private _connectionOptions;
+    constructor(_connection: Client, _connectionOptions: PostgresDbConfig);
+    testConnection(logTestResults?: boolean): Promise<number | null>;
+    getRawDatabase(): Client;
+    getRawDatabaseConfig(): PostgresDbConfig;
+    testConnectionQueryString(): string;
+    close(): Promise<boolean>;
+    escape(query: any): string;
+    preQuery(): Promise<void>;
+    query<R>(query: any, fields: any): Promise<RequestResults<R>>;
+    modify(query: string, fields: Record<string, any>): Promise<RequestResults<ModifyResults>>;
+    onRequestSuccessOrFailure(_type: DatabaseRequestType): Promise<void>;
+}

package/lib/postgres/postgres-style-database-access.js ADDED Viewed

@@ -0,0 +1,73 @@
+import { Logger } from '@bitblit/ratchet-common/logger/logger';
+import SqlString from 'sqlstring';
+import { NamedParameterAdapter } from "../util/named-parameter-adapter/named-parameter-adapter.js";
+export class PostgresStyleDatabaseAccess {
+    _connection;
+    _connectionOptions;
+    constructor(_connection, _connectionOptions) {
+        this._connection = _connection;
+        this._connectionOptions = _connectionOptions;
+    }
+    async testConnection(logTestResults) {
+        if (logTestResults) {
+            Logger.info('Running connection test');
+        }
+        const res = await this.query(this.testConnectionQueryString(), {});
+        const rows = res.results;
+        const timestamp = rows.length === 1 ? rows[0].test : null;
+        if (logTestResults) {
+            Logger.info('Test returned : %j', timestamp);
+        }
+        return timestamp;
+    }
+    getRawDatabase() {
+        return this._connection;
+    }
+    getRawDatabaseConfig() {
+        return this._connectionOptions;
+    }
+    testConnectionQueryString() {
+        return 'SELECT 1 AS test';
+    }
+    async close() {
+        return Promise.resolve(false);
+    }
+    escape(query) {
+        return SqlString.escape(query);
+    }
+    async preQuery() {
+    }
+    async query(query, fields) {
+        const qap = NamedParameterAdapter.applyNamedValuesToQuery({ query: query, params: fields });
+        const formatted = SqlString.format(qap.query, {});
+        const res = await this._connection.query(formatted);
+        const rval = {
+            results: res.rows,
+            fields: res.fields
+        };
+        return rval;
+    }
+    async modify(query, fields) {
+        const qap = NamedParameterAdapter.applyNamedValuesToQuery({ query: query, params: fields });
+        const formatted = SqlString.format(qap.query, {});
+        const res = await this._connection.query(formatted);
+        let insertId = null;
+        if (res?.rows?.length) {
+            const r = res.rows[0];
+            const keyName = Object.keys(r)[0];
+            insertId = r[keyName];
+        }
+        const mr = {
+            changedRows: res.rowCount,
+            insertId: insertId
+        };
+        const rval = {
+            results: mr,
+            fields: null
+        };
+        return rval;
+    }
+    async onRequestSuccessOrFailure(_type) {
+    }
+}
+//# sourceMappingURL=postgres-style-database-access.js.map

package/lib/postgres/postgres-style-database-access.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"postgres-style-database-access.js","sourceRoot":"","sources":["../../src/postgres/postgres-style-database-access.ts"],"names":[],"mappings":"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"}

package/lib/query-builder/query-builder.js CHANGED Viewed

@@ -77,7 +77,7 @@ export class QueryBuilder {
         return this;
     }
     withParams(params) {
-        this.namedParams = Object.assign(this.namedParams, params);
+        this.namedParams = Object.assign(this.namedParams, params ?? {});
         return this;
     }
     withExpandedParam(keyPrefix, values, extendIfExists) {

package/lib/query-builder/query-builder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder/query-builder.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder/query-builder.ts"],"names":[],"mappings":"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"}

package/lib/service/named-parameter-database-service.d.ts CHANGED Viewed

@@ -24,8 +24,8 @@ export declare class NamedParameterDatabaseService {
     executeUpdateOrInsertByName(queryPath: string, params?: object, timeoutMS?: number): Promise<ModifyResults>;
     buildAndExecuteUpdateOrInsert(queryBuilder: QueryBuilder, timeoutMS?: number): Promise<ModifyResults>;
     buildAndExecuteUpdateOrInsertWithRetry(queryBuilder: QueryBuilder, maxRetries: number, timeoutMS?: number): Promise<ModifyResults>;
-    executeQueryByName<Row>(queryPath: string, params: object, timeoutMS?: number): Promise<Row[]>;
-    executeQueryByNameSingle<Row>(queryPath: string, params: object, timeoutMS?: number): Promise<Row | null>;
+    executeQueryByName<Row>(queryPath: string, params?: object, timeoutMS?: number): Promise<Row[]>;
+    executeQueryByNameSingle<Row>(queryPath: string, params?: object, timeoutMS?: number): Promise<Row | null>;
     buildAndExecute<Row>(queryBuilder: QueryBuilder, timeoutMS?: number): Promise<Row[]>;
     buildAndExecuteSingle<Row>(queryBuilder: QueryBuilder, timeoutMS?: number): Promise<Row | null>;
     buildAndExecuteFetchTotalRows(queryBuilder: QueryBuilder, groupBy?: string, timeoutMS?: number): Promise<GroupByCountResult[]>;

package/lib/service/named-parameter-database-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"named-parameter-database-service.js","sourceRoot":"","sources":["../../src/service/named-parameter-database-service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"named-parameter-database-service.js","sourceRoot":"","sources":["../../src/service/named-parameter-database-service.ts"],"names":[],"mappings":"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"}

package/lib/sqlite/sqlite-database-access.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { ModifyResults } from '../model/modify-results.js';
 import { RequestResults } from '../model/request-results.js';
 import { SqliteConnectionConfigFlag } from './model/sqlite-connection-config-flag.js';
 import { Database } from 'better-sqlite3';
-import { QueryAndParams } from './model/query-and-params';
+import { QueryAndParams } from "../util/named-parameter-adapter/query-and-params.ts";
 export declare class SqliteDatabaseAccess implements DatabaseAccess {
     private conn;
     private flags;

package/lib/sqlite/sqlite-database-access.js CHANGED Viewed

@@ -1,9 +1,9 @@
 import { Logger } from '@bitblit/ratchet-common/logger/logger';
 import { ErrorRatchet } from '@bitblit/ratchet-common/lang/error-ratchet';
 import SqlString from 'sqlstring';
-import { QueryUtil } from '../query-builder/query-util.js';
 import { SqliteConnectionConfigFlag } from './model/sqlite-connection-config-flag.js';
 import { NumberRatchet } from '@bitblit/ratchet-common/lang/number-ratchet';
+import { NamedParameterAdapter } from "../util/named-parameter-adapter/named-parameter-adapter.js";
 export class SqliteDatabaseAccess {
     conn;
     flags;
@@ -69,27 +69,7 @@ export class SqliteDatabaseAccess {
         return res;
     }
     preprocessQuery(qap) {
-        const rval = Object.assign(qap);
-        let tmp = QueryUtil.addPrefixToFieldNames(rval.params, ':');
-        rval.query = QueryUtil.replaceNullReplacementsInQuery(rval.query, tmp);
-        rval.params = QueryUtil.removeUnusedFields(rval.query, rval.params, ':');
-        tmp = QueryUtil.removeUnusedFields(rval.query, tmp);
-        Object.keys(tmp).forEach((k) => {
-            const val = tmp[k];
-            if (Array.isArray(val)) {
-                const escaped = this.escape(val);
-                rval.query = rval.query.replaceAll(k, escaped);
-                delete rval.params[k.substring(1)];
-            }
-            else if (typeof val === 'boolean') {
-                const strVal = val ? 'true' : 'false';
-                rval.query = rval.query.replaceAll(k, strVal);
-                delete rval.params[k.substring(1)];
-            }
-        });
-        if ((this.flags || []).includes(SqliteConnectionConfigFlag.AlwaysCollateNoCase)) {
-            rval.query += ' COLLATE NOCASE';
-        }
+        const rval = NamedParameterAdapter.applyNamedValuesToQuery(qap, (this.flags || []).includes(SqliteConnectionConfigFlag.AlwaysCollateNoCase) ? ' COLLATE NOCASE' : '', this.escape);
         return rval;
     }
     async query(inQuery, inFields) {

package/lib/sqlite/sqlite-database-access.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sqlite-database-access.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-database-access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,SAAS,MAAM,WAAW,CAAC;AAKlC,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~gCAAgC~~,CAAC;~~AAC3D~~,OAAO,EAAE,~~0BAA0B~~,EAAE,MAAM,~~0CAA0C~~,CAAC;~~AAEtF~~,OAAO,EAAE,~~aAAa~~,EAAE,MAAM,~~6CAA6C~~,CAAC;~~AAG5E~~,MAAM,OAAO,oBAAoB;IAErB;IACA;IACA;IAHV,YACU,IAAc,EACd,KAAmC,EACnC,WAAgC;QAFhC,SAAI,GAAJ,IAAI,CAAU;QACd,UAAK,GAAL,KAAK,CAA8B;QACnC,gBAAW,GAAX,WAAW,CAAqB;IACvC,CAAC;IAEJ,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,gBAAgB;QACd,MAAM,YAAY,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,iBAAiB;QACf,MAAM,YAAY,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,KAAU;QACf,IAAI,IAAI,GAAW,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAA0B;QACnD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAA0B;QACnD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,KAA0B;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,MAA2B;QACrD,MAAM,GAAG,GAAmB,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAEnF,MAAM,IAAI,GAAc,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,GAAG,GAAc,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE5C,MAAM,MAAM,GAAkB;YAC5B,WAAW,EAAE,GAAG,CAAC,OAAO;YACxB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC;YACvD,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,GAAG,CAAC,OAAO;YACzB,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,SAAS;YACvB,aAAa,EAAE,SAAS;SACzB,CAAC;QACF,MAAM,GAAG,GAAkC;YACzC,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,IAAI;SACb,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,eAAe,CAAC,GAAmB;QACjC,MAAM,IAAI,GAAmB,~~MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAGhD,IAAI,GAAG,GAAwB,SAAS,CAAC,~~qBAAqB,CAAC,~~IAAI~~,~~CAAC~~,~~MAAM,EAAE,~~GAAG,~~CAAC~~,CAAC~~;QAEjF~~,IAAI,CAAC,KAAK,~~GAAG,SAAS,CAAC,8BAA8B,CAAC,~~IAAI,~~CAAC,KAAK,~~EAAE,~~GAAG,~~CAAC,CAAC~~;QAEvE~~,~~IAAI~~,CAAC,~~MAAM~~,~~GAAG,SAAS,~~CAAC,~~kBAAkB~~,CAAC,~~IAAI,~~CAAC,~~KAAK,EAAE,IAAI,~~CAAC,~~MAAM,EAAE,GAAG,~~CAAC,~~CAAC;QACzE~~,~~GAAG,GAAG,SAAS,~~CAAC,~~kBAAkB,~~CAAC,~~IAAI,~~CAAC,~~KAAK,~~EAAE,~~GAAG~~,~~CAAC,CAAC;QAIpD,MAAM,CAAC,~~IAAI,CAAC,~~GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,~~MAAM,~~GAAG~~,~~GAAQ,GAAG,~~CAAC~~,CAAC,CAAC,CAAC~~;~~YACxB~~,~~IAAI,KAAK,CAAC,~~OAAO,~~CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,OAAO,GAAW,~~IAAI,CAAC~~,MAAM,CAAC,GAAG,CAAC,CAAC~~;gBACzC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAE/C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpC,MAAM,MAAM,GAAW,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC9C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBAE9C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;QAGH,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAChF,IAAI,CAAC,KAAK,IAAI,iBAAiB,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,KAAK,CAAI,OAAe,EAAE,QAA6B;QAC3D,MAAM,GAAG,GAAmB,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEvF,MAAM,IAAI,GAAc,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,GAAG,GAAQ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAQ,CAAC;QAE7C,MAAM,IAAI,GAAsB;YAC9B,OAAO,EAAE,GAAQ;YACjB,MAAM,EAAE,IAAI;SACb,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,cAAwB;QAClD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,GAAG,GAAwB,MAAM,IAAI,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,CAAC,CAAC;QACzF,MAAM,IAAI,GAAG,GAAG,CAAC,OAA6B,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1D,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,MAAM,YAAY,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAClE,CAAC;CACF"}
1	+ {"version":3,"file":"sqlite-database-access.js","sourceRoot":"","sources":["../../src/sqlite/sqlite-database-access.ts"],"names":[],"mappings":"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"}

package/lib/util/named-parameter-adapter/named-parameter-adapter.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { QueryAndParams } from "./query-and-params.ts";
+export declare class NamedParameterAdapter {
+    static applyNamedValuesToQuery(qap: QueryAndParams, suffix?: string, customEscape?: (val: any) => string): QueryAndParams;
+}

package/lib/util/named-parameter-adapter/named-parameter-adapter.js ADDED Viewed

@@ -0,0 +1,33 @@
+import SqlString from 'sqlstring';
+import { QueryUtil } from "../../query-builder/query-util.js";
+export class NamedParameterAdapter {
+    static applyNamedValuesToQuery(qap, suffix, customEscape = SqlString.escape) {
+        const rval = Object.assign(qap);
+        let tmp = QueryUtil.addPrefixToFieldNames(rval.params, ':');
+        rval.query = QueryUtil.replaceNullReplacementsInQuery(rval.query, tmp);
+        rval.params = QueryUtil.removeUnusedFields(rval.query, rval.params, ':');
+        tmp = QueryUtil.removeUnusedFields(rval.query, tmp);
+        Object.keys(tmp).forEach((k) => {
+            const val = tmp[k];
+            if (Array.isArray(val)) {
+                const escaped = customEscape(val);
+                rval.query = rval.query.replaceAll(k, escaped);
+                delete rval.params[k.substring(1)];
+            }
+            else if (typeof val === 'boolean') {
+                const strVal = val ? 'true' : 'false';
+                rval.query = rval.query.replaceAll(k, strVal);
+                delete rval.params[k.substring(1)];
+            }
+            else {
+                rval.query = rval.query.replaceAll(k, customEscape(val));
+                delete rval.params[k.substring(1)];
+            }
+        });
+        if (suffix) {
+            rval.query += suffix;
+        }
+        return rval;
+    }
+}
+//# sourceMappingURL=named-parameter-adapter.js.map

package/lib/util/named-parameter-adapter/named-parameter-adapter.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"named-parameter-adapter.js","sourceRoot":"","sources":["../../../src/util/named-parameter-adapter/named-parameter-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAS9D,MAAM,OAAO,qBAAqB;IAEzB,MAAM,CAAC,uBAAuB,CAAC,GAAmB,EAAE,MAAe,EAAE,eAAkC,SAAS,CAAC,MAAM;QAC5H,MAAM,IAAI,GAAmB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAGhD,IAAI,GAAG,GAAwB,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAEjF,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,8BAA8B,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACzE,GAAG,GAAG,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAGpD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,MAAM,GAAG,GAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;YACxB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,OAAO,GAAW,YAAY,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;gBAE/C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpC,MAAM,MAAM,GAAW,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC9C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBAE9C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CAEF"}

package/lib/util/named-parameter-adapter/query-and-params.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"query-and-params.js","sourceRoot":"","sources":["../../../src/util/named-parameter-adapter/query-and-params.ts"],"names":[],"mappings":""}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitblit/ratchet-rdbms",
-  "version": "5.1.695-alpha",
+  "version": "5.1.697-alpha",
   "description": "Ratchet tooling for working with relational databases",
   "sideEffects": false,
   "type": "module",
@@ -47,20 +47,22 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@bitblit/ratchet-common": "5.1.695-alpha"
+    "@bitblit/ratchet-common": "5.1.697-alpha"
   },
   "optionalDependencies": {
     "better-sqlite3": "12.2.0",
     "get-port": "7.1.0",
     "mysql2": "3.14.3",
+    "pg": "8.16.3",
     "sqlstring": "2.3.3",
     "tunnel-ssh": "5.2.0"
   },
   "peerDependencies": {
-    "@bitblit/ratchet-common": "5.1.695-alpha",
+    "@bitblit/ratchet-common": "5.1.697-alpha",
     "better-sqlite3": "^12.2.0",
     "get-port": "^7.1.0",
     "mysql2": "^3.14.3",
+    "pg": "^8.16.3",
     "sqlstring": "^2.3.3",
     "tunnel-ssh": "^5.2.0"
   },

package/lib/sqlite/model/query-and-params.js.map DELETED Viewed

	@@ -1 +0,0 @@
1	- {"version":3,"file":"query-and-params.js","sourceRoot":"","sources":["../../../src/sqlite/model/query-and-params.ts"],"names":[],"mappings":""}

/package/lib/{sqlite/model → util/named-parameter-adapter}/query-and-params.d.ts RENAMED Viewed

File without changes

/package/lib/{sqlite/model → util/named-parameter-adapter}/query-and-params.js RENAMED Viewed

File without changes