@axinom/mosaic-db-common 0.27.0 → 0.28.0-rc.1

package/dist/zapatos/transaction-with-context.d.ts

@@ -1,6 +1,13 @@
-import { Pool } from 'pg';
-import { IsolationLevel, IsolationSatisfying, TxnClient } from 'zapatos/db';
+import { ClientBase, Pool } from 'pg';
+import { IsolationLevel, TxnClient } from 'zapatos/db';
 export type DbClient = Pool | TxnClient<IsolationLevel>;
+/**
+ * Iterates through pgSettings properties, composes and runs a single SELECT
+ * query to execute set_config for each property.
+ */
+export declare const setPgSettingsConfig: (pgSettings: {
+    [key: string]: string;
+} | undefined, txn: ClientBase) => Promise<void>;
 /**
  * Creates a transaction and sets pg settings before executing queries.
  * The applied pgSettings are added to the field "_debugPgSettings" in the transaction object for debug purposes.
@@ -12,12 +19,4 @@ export type DbClient = Pool | TxnClient<IsolationLevel>;
 export declare const transactionWithContext: <T>(pool: DbClient, isolationLevel: IsolationLevel, pgSettings: {
     [key: string]: string;
 } | undefined, callback: (client: TxnClient<IsolationLevel>) => Promise<T>) => Promise<T>;
-/**
- * Set a key-value pair as PostgreSQL config variables via `set_config(key, value, TRUE)`.
- * The applied values are added to the field "_debugPgSettings" in the transaction object for debug purposes.
- * @param key The configuration key to set. There are a few well known keys like MOSAIC_AUTH_SUBJECT_NAME and MOSAIC_AUTH_PERMISSIONS.
- * @param value The value to set for the key
- * @param txn The transaction client for which to set those config values
- */
-export declare const setConfigInTransaction: (key: string, value: string, txn: TxnClient<IsolationSatisfying<IsolationLevel>>) => Promise<void>;
 //# sourceMappingURL=transaction-with-context.d.ts.map

package/dist/zapatos/transaction-with-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-with-context.d.ts","sourceRoot":"","sources":["../../src/zapatos/transaction-with-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EACL,cAAc,EACd,mBAAmB,EAMnB,SAAS,EACV,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;AA0BxD;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,YAC3B,QAAQ,kBACE,cAAc;;kCAEX,UAAU,cAAc,CAAC,8BAM7C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,QAC5B,MAAM,SACJ,MAAM,OACR,UAAU,oBAAoB,cAAc,CAAC,CAAC,KAClD,QAAQ,IAAI,CAYd,CAAC"}
+{"version":3,"file":"transaction-with-context.d.ts","sourceRoot":"","sources":["../../src/zapatos/transaction-with-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EACL,cAAc,EAGd,SAAS,EAGV,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,mBAAmB;;oBAEzB,UAAU,KACd,QAAQ,IAAI,CAiBd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,YAC3B,QAAQ,kBACE,cAAc;;kCAEX,UAAU,cAAc,CAAC,8BAM7C,CAAC"}

package/dist/zapatos/transaction-with-context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConfigInTransaction = exports.transactionWithContext = void 0;
+exports.transactionWithContext = exports.setPgSettingsConfig = void 0;
 const db_1 = require("zapatos/db");
 /**
  * Iterates through pgSettings properties, composes and runs a single SELECT
@@ -18,8 +18,11 @@ const setPgSettingsConfig = async (pgSettings = {}, txn) => {
     }
     if (params.length > 0) {
         await new db_1.SQLFragment(`${literal.slice(0, -2)};`.split('$'), params).run(txn);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for debug purposes add the applied PG settings to the transaction object
+        txn._debugPgSettings = pgSettings;
     }
 };
+exports.setPgSettingsConfig = setPgSettingsConfig;
 /**
  * Creates a transaction and sets pg settings before executing queries.
  * The applied pgSettings are added to the field "_debugPgSettings" in the transaction object for debug purposes.
@@ -30,29 +33,9 @@ const setPgSettingsConfig = async (pgSettings = {}, txn) => {
  */
 const transactionWithContext = async (pool, isolationLevel, pgSettings = {}, callback) => {
     return (0, db_1.transaction)(pool, isolationLevel, async (txn) => {
-        await setPgSettingsConfig(pgSettings, txn);
+        await (0, exports.setPgSettingsConfig)(pgSettings, txn);
         return callback(txn);
     });
 };
 exports.transactionWithContext = transactionWithContext;
-/**
- * Set a key-value pair as PostgreSQL config variables via `set_config(key, value, TRUE)`.
- * The applied values are added to the field "_debugPgSettings" in the transaction object for debug purposes.
- * @param key The configuration key to set. There are a few well known keys like MOSAIC_AUTH_SUBJECT_NAME and MOSAIC_AUTH_PERMISSIONS.
- * @param value The value to set for the key
- * @param txn The transaction client for which to set those config values
- */
-const setConfigInTransaction = async (key, value, txn) => {
-    const keyParm = (0, db_1.param)(key);
-    const valueParam = (0, db_1.param)(value);
-    await (0, db_1.sql) `SELECT set_config(${keyParm}, ${valueParam}, TRUE)`.run(txn);
-    // for debug purposes add the applied PG settings to the transaction object
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const transaction = txn;
-    if (!('_debugPgSettings' in transaction)) {
-        transaction._debugPgSettings = {};
-    }
-    transaction._debugPgSettings[key] = value;
-};
-exports.setConfigInTransaction = setConfigInTransaction;
 //# sourceMappingURL=transaction-with-context.js.map

package/dist/zapatos/transaction-with-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-with-context.js","sourceRoot":"","sources":["../../src/zapatos/transaction-with-context.ts"],"names":[],"mappings":";;;AACA,mCASoB;AAIpB;;;GAGG;AACH,MAAM,mBAAmB,GAAG,KAAK,EAC/B,aAAwC,EAAE,EAC1C,GAAmD,EACpC,EAAE;IACjB,IAAI,OAAO,GAAG,SAAS,CAAC;IACxB,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;QACjC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;YAC/D,SAAS;SACV;QACD,MAAM,CAAC,IAAI,CAAC,IAAA,UAAK,EAAC,QAAQ,CAAC,EAAE,IAAA,UAAK,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,0BAA0B,CAAC;KACvC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,gBAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CACtE,GAAG,CACJ,CAAC;KACH;AACH,CAAC,CAAC;AAEF;;;;;;;GAOG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAc,EACd,cAA8B,EAC9B,aAAwC,EAAE,EAC1C,QAA2D,EAC/C,EAAE;IACd,OAAO,IAAA,gBAAW,EAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrD,MAAM,mBAAmB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC3C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,sBAAsB,0BAUjC;AAEF;;;;;;GAMG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAW,EACX,KAAa,EACb,GAAmD,EACpC,EAAE;IACjB,MAAM,OAAO,GAAG,IAAA,UAAK,EAAC,GAAG,CAAC,CAAC;IAC3B,MAAM,UAAU,GAAG,IAAA,UAAK,EAAC,KAAK,CAAC,CAAC;IAChC,MAAM,IAAA,QAAG,EAAA,qBAAqB,OAAO,KAAK,UAAU,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEvE,2EAA2E;IAC3E,8DAA8D;IAC9D,MAAM,WAAW,GAAG,GAAU,CAAC;IAC/B,IAAI,CAAC,CAAC,kBAAkB,IAAI,WAAW,CAAC,EAAE;QACxC,WAAW,CAAC,gBAAgB,GAAG,EAAE,CAAC;KACnC;IACD,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC5C,CAAC,CAAC;AAhBW,QAAA,sBAAsB,0BAgBjC"}
+{"version":3,"file":"transaction-with-context.js","sourceRoot":"","sources":["../../src/zapatos/transaction-with-context.ts"],"names":[],"mappings":";;;AACA,mCAOoB;AAIpB;;;GAGG;AACI,MAAM,mBAAmB,GAAG,KAAK,EACtC,aAAwC,EAAE,EAC1C,GAAe,EACA,EAAE;IACjB,IAAI,OAAO,GAAG,SAAS,CAAC;IACxB,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;QACjC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;YAC/D,SAAS;SACV;QACD,MAAM,CAAC,IAAI,CAAC,IAAA,UAAK,EAAC,QAAQ,CAAC,EAAE,IAAA,UAAK,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,0BAA0B,CAAC;KACvC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,gBAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CACtE,GAAG,CACJ,CAAC;QACF,0IAA0I;QACzI,GAAW,CAAC,gBAAgB,GAAG,UAAU,CAAC;KAC5C;AACH,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B;AAEF;;;;;;;GAOG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAc,EACd,cAA8B,EAC9B,aAAwC,EAAE,EAC1C,QAA2D,EAC/C,EAAE;IACd,OAAO,IAAA,gBAAW,EAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrD,MAAM,IAAA,2BAAmB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC3C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,sBAAsB,0BAUjC"}

package/migrations/before-migration/006-authorization.sql

@@ -117,7 +117,7 @@ $$;
 }
 snippet-*/
 CREATE OR REPLACE FUNCTION ax_utils.current_tenant_id() RETURNS UUID AS $$
-  SELECT coalesce(nullif(current_setting('mosaic.tenant_id', TRUE), ''), uuid_nil()::TEXT)::UUID;
+  SELECT coalesce(nullif(current_setting('mosaic.tenant_id', TRUE), ''), 'ffffffff-ffff-ffff-ffff-ffffffffffff')::UUID;
 $$ LANGUAGE sql STABLE;
 
 /*-snippet
@@ -132,7 +132,7 @@ $$ LANGUAGE sql STABLE;
 }
 snippet-*/
 CREATE OR REPLACE FUNCTION ax_utils.current_environment_id() RETURNS UUID AS $$
-  SELECT coalesce(nullif(current_setting('mosaic.environment_id', TRUE), ''), uuid_nil()::TEXT)::UUID;
+  SELECT coalesce(nullif(current_setting('mosaic.environment_id', TRUE), ''), 'ffffffff-ffff-ffff-ffff-ffffffffffff')::UUID;
 $$ LANGUAGE sql STABLE;
 
 /*-snippet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-db-common",
-  "version": "0.27.0",
+  "version": "0.28.0-rc.1",
   "description": "This library encapsulates database-related functionality to develop Mosaic based services.",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -32,7 +32,7 @@
   "dependencies": {
     "express": "^4.17.1",
     "graphile-migrate": "^1.4.0",
-    "pg": "^8.5.1",
+    "pg": "^8.11.3",
     "pg-logical-replication": "^2.0.3",
     "prom-client": "^13.2.0",
     "readdirp": "^3.4.0",
@@ -52,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7eb762e7cec90f882c2fe11f5c294c44fc2c3bc3"
+  "gitHead": "19386d17cc908f49f470c3a2095c084a93ceab55"
 }

package/src/zapatos/transaction-with-context.ts

@@ -1,13 +1,11 @@
-import { Pool } from 'pg';
+import { ClientBase, Pool } from 'pg';
 import {
   IsolationLevel,
-  IsolationSatisfying,
-  param,
   Parameter,
-  sql,
   SQLFragment,
-  transaction,
   TxnClient,
+  param,
+  transaction,
 } from 'zapatos/db';
 
 export type DbClient = Pool | TxnClient<IsolationLevel>;
@@ -16,9 +14,9 @@ export type DbClient = Pool | TxnClient<IsolationLevel>;
  * Iterates through pgSettings properties, composes and runs a single SELECT
  * query to execute set_config for each property.
  */
-const setPgSettingsConfig = async (
+export const setPgSettingsConfig = async (
   pgSettings: { [key: string]: string } = {},
-  txn: TxnClient<IsolationSatisfying<IsolationLevel>>,
+  txn: ClientBase,
 ): Promise<void> => {
   let literal = 'SELECT ';
   const params: Parameter<string>[] = [];
@@ -33,6 +31,8 @@ const setPgSettingsConfig = async (
     await new SQLFragment(`${literal.slice(0, -2)};`.split('$'), params).run(
       txn,
     );
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for debug purposes add the applied PG settings to the transaction object
+    (txn as any)._debugPgSettings = pgSettings;
   }
 };
 
@@ -55,28 +55,3 @@ export const transactionWithContext = async <T>(
     return callback(txn);
   });
 };
-
-/**
- * Set a key-value pair as PostgreSQL config variables via `set_config(key, value, TRUE)`.
- * The applied values are added to the field "_debugPgSettings" in the transaction object for debug purposes.
- * @param key The configuration key to set. There are a few well known keys like MOSAIC_AUTH_SUBJECT_NAME and MOSAIC_AUTH_PERMISSIONS.
- * @param value The value to set for the key
- * @param txn The transaction client for which to set those config values
- */
-export const setConfigInTransaction = async (
-  key: string,
-  value: string,
-  txn: TxnClient<IsolationSatisfying<IsolationLevel>>,
-): Promise<void> => {
-  const keyParm = param(key);
-  const valueParam = param(value);
-  await sql`SELECT set_config(${keyParm}, ${valueParam}, TRUE)`.run(txn);
-
-  // for debug purposes add the applied PG settings to the transaction object
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const transaction = txn as any;
-  if (!('_debugPgSettings' in transaction)) {
-    transaction._debugPgSettings = {};
-  }
-  transaction._debugPgSettings[key] = value;
-};