@axinom/mosaic-db-common 0.14.0-rc.9 → 0.14.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.14.0](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-db-common@0.13.0&targetVersion=GT@axinom/mosaic-db-common@0.14.0) (2022-03-16)
+
+
+### Features
+
+* generate-define-func-migration command added to mosaic-db cli ([2ac186a](https://dev.azure.com/axinom/CMS/_git/Navy/commit/2ac186a441f03c8c3995150fda62874027b46f98)), closes [#34023](https://dev.azure.com/axinom/CMS/_workitems/edit/34023)
+* modular @axinom/mosaic-cli ([3cefbdb](https://dev.azure.com/axinom/CMS/_git/Navy/commit/3cefbdb5ff38fa99ee5e1f89b8ee44ac35ad92f9)), closes [#34705](https://dev.azure.com/axinom/CMS/_workitems/edit/34705) [#34288](https://dev.azure.com/axinom/CMS/_workitems/edit/34288)
+* mosaic-db CLI dropped in favor of modular mosaic CLI ([6bdbea0](https://dev.azure.com/axinom/CMS/_git/Navy/commit/6bdbea06f2cae3dfaf766444b6c49d3775b686bd))
+* multitenancy delete safety net ([f09f6d3](https://dev.azure.com/axinom/CMS/_git/Navy/commit/f09f6d3f0fd07dc2227095f583625d8708b97ee2)), closes [#34820](https://dev.azure.com/axinom/CMS/_workitems/edit/34820)
+* renamed consumer to end-user where possible ([c24f49b](https://dev.azure.com/axinom/CMS/_git/Navy/commit/c24f49b4e471e4de83836f587dc10c8efdb0f751))
+
+
+
 ## [0.13.0](https://dev.azure.com/axinom/CMS/_git/Navy/branchCompare?baseVersion=GT@axinom/mosaic-db-common@0.12.0&targetVersion=GT@axinom/mosaic-db-common@0.13.0) (2022-03-01)
 
 

package/dist/common/types.d.ts

@@ -1,3 +1,4 @@
+import { Pool } from 'pg';
 /**
  * A dictionary of string keys and generic values. Consider using it instead of `any`.
  */
@@ -33,4 +34,18 @@ export interface DbLogger {
 export interface DbShutdownActions {
     push(action: () => void | Promise<void>): void;
 }
+/**
+ * An abstract type extending PostgreSQL Pool. All labelled pool types extend
+ * pg.Pool but labelled pool types are not interchangeable so typescript can be
+ * leveraged to ensure the correct pool type is being used in a given context.
+ */
+export declare type LabelledPgPool<T extends string> = Pool & {
+    label: T;
+};
+/**
+ * Default labelled pool types
+ */
+export declare type OwnerPgPool = LabelledPgPool<'Owner'>;
+export declare type EnvOwnerPgPool = LabelledPgPool<'EnvOwner'>;
+export declare type LoginPgPool = LabelledPgPool<'Login'>;
 //# sourceMappingURL=types.d.ts.map

package/dist/common/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,IAAI,CAAC,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAChD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,IAAI,CAAC,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAChD;AAED;;;;GAIG;AACH,oBAAY,cAAc,CAAC,CAAC,SAAS,MAAM,IAAI,IAAI,GAAG;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAEnE;;GAEG;AACH,oBAAY,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;AAClD,oBAAY,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;AACxD,oBAAY,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC"}

package/dist/messaging/messaging-counter.d.ts

@@ -1,4 +1,4 @@
-import { Pool } from 'pg';
+import { OwnerPgPool } from '../common/types';
 export interface NextRedeliveriesFunction {
     (error: Error | undefined | null, redeliveries?: number): void;
 }
@@ -6,7 +6,7 @@ export interface NextRedeliveriesFunction {
  * This method can be called from a CRON job/task scheduler to regularly cleanup expired messages.
  * @param ownerPool database pool with select and delete permissions to `app_private.messaging_counter`
  */
-export declare const cleanupExpiredMessagingCounters: (ownerPool: Pool) => Promise<void>;
+export declare const cleanupExpiredMessagingCounters: (ownerPool: OwnerPgPool) => Promise<void>;
 /**
  * ## PostgreSQL messaging counter for Rascal redeliveries
  *
@@ -84,7 +84,7 @@ export declare const cleanupExpiredMessagingCounters: (ownerPool: Pool) => Promi
  * ```
  * @param ownerPool database pool with full read/modify permissions to `app_private.messaging_counter`
  */
-export declare const initMessagingCounter: (ownerPool: Pool) => () => {
+export declare const initMessagingCounter: (ownerPool: OwnerPgPool) => () => {
     incrementAndGet: (key: string, next: NextRedeliveriesFunction) => void;
 };
 //# sourceMappingURL=messaging-counter.d.ts.map

package/dist/messaging/messaging-counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messaging-counter.d.ts","sourceRoot":"","sources":["../../src/messaging/messaging-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AA0C1B,MAAM,WAAW,wBAAwB;IACvC,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChE;AAED;;;GAGG;AACH,eAAO,MAAM,+BAA+B,cAC/B,IAAI,KACd,QAAQ,IAAI,CAQd,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AACH,eAAO,MAAM,oBAAoB,cAAe,IAAI;2BAEzB,MAAM,QAAQ,wBAAwB,KAAK,IAAI;CAiBzE,CAAC"}
+{"version":3,"file":"messaging-counter.d.ts","sourceRoot":"","sources":["../../src/messaging/messaging-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAyC9C,MAAM,WAAW,wBAAwB;IACvC,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChE;AAED;;;GAGG;AACH,eAAO,MAAM,+BAA+B,cAC/B,WAAW,KACrB,QAAQ,IAAI,CAQd,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AACH,eAAO,MAAM,oBAAoB,cAAe,WAAW;2BAEhC,MAAM,QAAQ,wBAAwB,KAAK,IAAI;CAiBzE,CAAC"}

package/dist/messaging/messaging-counter.js.map

@@ -1 +1 @@
-{"version":3,"file":"messaging-counter.js","sourceRoot":"","sources":["../../src/messaging/messaging-counter.ts"],"names":[],"mappings":";;;AACA,mCAA+E;AAE/E,MAAM,sBAAsB,GAAG,KAAK,EAClC,GAAW,EACX,SAAe,EACE,EAAE;IACnB,OAAO,IAAA,gBAAW,EAChB,SAAS,EACT,mBAAc,CAAC,YAAY,EAC3B,KAAK,EAAE,SAAS,EAAE,EAAE;QAClB,MAAM,UAAU,GAAG;YACjB,GAAG,EAAE,GAAG;SACT,CAAC;QACF,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,IAAA,QAAG,EAAA;;oBAEjB,IAAA,SAAI,EAAC,UAAU,CAAC;;;;;;OAM7B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEjB,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,EAAE;YACxB,wDAAwD;YACxD,4GAA4G;YAC5G,MAAM,8BAA8B,CAAC,SAAS,CAAC,CAAC;SACjD;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,SAAiD,EAClC,EAAE;IACjB,MAAM,IAAA,QAAG,EAAA,qFAAqF,CAAC,GAAG,CAChG,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAMF;;;GAGG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAClD,SAAe,EACA,EAAE;IACjB,MAAM,IAAA,gBAAW,EACf,SAAS,EACT,mBAAc,CAAC,YAAY,EAC3B,KAAK,EAAE,SAAS,EAAE,EAAE;QAClB,MAAM,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,+BAA+B,mCAU1C;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AACI,MAAM,oBAAoB,GAAG,CAAC,SAAe,EAAE,EAAE;IACtD,OAAO,SAAS,IAAI;QAGlB,OAAO;YACL,eAAe,EAAE,UAAS,GAAW,EAAE,IAA8B;gBACnE,sBAAsB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,IAAI,CACzC,CAAC,OAAe,EAAE,EAAE;oBAClB,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACtB,CAAC,EACD,CAAC,GAAU,EAAE,EAAE;oBACb,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;qBAClB;gBACH,CAAC,CACF,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,oBAAoB,wBAmB/B"}
+{"version":3,"file":"messaging-counter.js","sourceRoot":"","sources":["../../src/messaging/messaging-counter.ts"],"names":[],"mappings":";;;AAAA,mCAA+E;AAG/E,MAAM,sBAAsB,GAAG,KAAK,EAClC,GAAW,EACX,SAAsB,EACL,EAAE;IACnB,OAAO,IAAA,gBAAW,EAChB,SAAS,EACT,mBAAc,CAAC,YAAY,EAC3B,KAAK,EAAE,SAAS,EAAE,EAAE;QAClB,MAAM,UAAU,GAAG;YACjB,GAAG,EAAE,GAAG;SACT,CAAC;QACF,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,IAAA,QAAG,EAAA;;oBAEjB,IAAA,SAAI,EAAC,UAAU,CAAC;;;;;;OAM7B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEjB,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,EAAE;YACxB,wDAAwD;YACxD,4GAA4G;YAC5G,MAAM,8BAA8B,CAAC,SAAS,CAAC,CAAC;SACjD;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,SAAiD,EAClC,EAAE;IACjB,MAAM,IAAA,QAAG,EAAA,qFAAqF,CAAC,GAAG,CAChG,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAMF;;;GAGG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAClD,SAAsB,EACP,EAAE;IACjB,MAAM,IAAA,gBAAW,EACf,SAAS,EACT,mBAAc,CAAC,YAAY,EAC3B,KAAK,EAAE,SAAS,EAAE,EAAE;QAClB,MAAM,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,+BAA+B,mCAU1C;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AACI,MAAM,oBAAoB,GAAG,CAAC,SAAsB,EAAE,EAAE;IAC7D,OAAO,SAAS,IAAI;QAGlB,OAAO;YACL,eAAe,EAAE,UAAU,GAAW,EAAE,IAA8B;gBACpE,sBAAsB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,IAAI,CACzC,CAAC,OAAe,EAAE,EAAE;oBAClB,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACtB,CAAC,EACD,CAAC,GAAU,EAAE,EAAE;oBACb,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;qBAClB;gBACH,CAAC,CACF,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,oBAAoB,wBAmB/B"}

package/dist/middleware/pg-pool.middleware.d.ts

@@ -1,6 +1,5 @@
 import { Application, Express } from 'express';
-import { Pool } from 'pg';
-import { DbLogger, DbShutdownActions } from '../common';
+import { DbLogger, DbShutdownActions, EnvOwnerPgPool, LabelledPgPool, LoginPgPool, OwnerPgPool } from '../common';
 /**
  * Creates a PostgreSQL Pool for a given connection string, and returns it.
  *
@@ -10,40 +9,40 @@ import { DbLogger, DbShutdownActions } from '../common';
  * @param shutdownActions
  * @returns
  */
-export declare const createPgPool: (connectionString: string, poolLabel: string, logger: DbLogger, shutdownActions: DbShutdownActions) => Pool;
+export declare const createPgPool: <T extends string>(connectionString: string, poolLabel: T, logger: DbLogger, shutdownActions: DbShutdownActions) => LabelledPgPool<T>;
 /**
  * Returns the previously set up PostgreSQL pool for the database owner. The owner pool has full access to the database.
  * @param app express app
  */
-export declare const getOwnerPgPool: (app: Express | Application) => Pool;
+export declare const getOwnerPgPool: (app: Express | Application) => OwnerPgPool;
 /**
  * Sets a given pool as the Owner Pool for an Express Application
  * @param app
  * @param ownerPool
  */
-export declare const setOwnerPgPool: (app: Application, ownerPool: Pool) => void;
+export declare const setOwnerPgPool: (app: Application, ownerPool: OwnerPgPool) => void;
 /**
  * Returns the previously set up PostgreSQL pool for the environment owner. The environment owner cannot bypass Row Level Security and database requests will only operate on specific tenant and environment rows.
  * @param app express app
  */
-export declare const getEnvOwnerPgPool: (app: Express | Application) => Pool;
+export declare const getEnvOwnerPgPool: (app: Express | Application) => EnvOwnerPgPool;
 /**
  * Sets a given pool as the Environment Owner Pool for an Express Application
  * @param app
  * @param envOwnerPool
  */
-export declare const setEnvOwnerPgPool: (app: Application, envOwnerPool: Pool) => void;
+export declare const setEnvOwnerPgPool: (app: Application, envOwnerPool: EnvOwnerPgPool) => void;
 /**
  * Returns the previously set up PostgreSQL pool for the login user. The login pool is internally used by postgraphile to access the database via GraphQL API endpoints.
  * @param app express app
  */
-export declare const getLoginPgPool: (app: Express | Application) => Pool;
+export declare const getLoginPgPool: (app: Express | Application) => LoginPgPool;
 /**
  * Sets a given pool as the Login Pool for an Express Application
  * @param app
  * @param loginPool
  */
-export declare const setLoginPgPool: (app: Application, loginPool: Pool) => void;
+export declare const setLoginPgPool: (app: Application, loginPool: LoginPgPool) => void;
 /**
  * Sets up a PostgreSQL pool for the owner to be reused by other app components. The owner pool has full access to the database.
  * @param app express app
@@ -74,19 +73,19 @@ export declare const setupLoginPgPool: (app: Express | Application, connectionSt
  * @param logger logger to log errors and shutdown action messages
  * @param shutdownActions shutdown actions middleware
  */
-export declare const createOwnerPgPool: (connectionString: string, logger: DbLogger, shutdownActions: DbShutdownActions) => Pool;
+export declare const createOwnerPgPool: (connectionString: string, logger: DbLogger, shutdownActions: DbShutdownActions) => OwnerPgPool;
 /**
  * Sets up a PostgreSQL pool for the environment owner. The environment owner cannot bypass Row Level Security and database requests will only operate on specific tenant and environment rows.
  * @param connectionString full database connection string
  * @param logger logger to log errors and shutdown action messages
  * @param shutdownActions shutdown actions middleware
  */
-export declare const createEnvOwnerPgPool: (connectionString: string, logger: DbLogger, shutdownActions: DbShutdownActions) => Pool;
+export declare const createEnvOwnerPgPool: (connectionString: string, logger: DbLogger, shutdownActions: DbShutdownActions) => EnvOwnerPgPool;
 /**
  * Sets up a PostgreSQL pool for the login user. The login pool is internally used by postgraphile to access the database via GraphQL API endpoints.
  * @param connectionString full database connection string
  * @param logger logger to log errors and shutdown action messages
  * @param shutdownActions shutdown actions middleware
  */
-export declare const createLoginPgPool: (connectionString: string, logger: DbLogger, shutdownActions: DbShutdownActions) => Pool;
+export declare const createLoginPgPool: (connectionString: string, logger: DbLogger, shutdownActions: DbShutdownActions) => LoginPgPool;
 //# sourceMappingURL=pg-pool.middleware.d.ts.map

package/dist/middleware/pg-pool.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-pool.middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/pg-pool.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAExD;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,qBACL,MAAM,aACb,MAAM,UACT,QAAQ,mBACC,iBAAiB,KACjC,IAyBF,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAS,OAAO,GAAG,WAAW,KAAG,IAE3D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,QAAS,WAAW,aAAa,IAAI,KAAG,IAElE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAS,OAAO,GAAG,WAAW,KAAG,IAE9D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,QACvB,WAAW,gBACF,IAAI,KACjB,IAEF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAS,OAAO,GAAG,WAAW,KAAG,IAE3D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,QAAS,WAAW,aAAa,IAAI,KAAG,IAElE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,QACtB,OAAO,GAAG,WAAW,oBACR,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAKF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,QACzB,OAAO,GAAG,WAAW,oBACR,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAKF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,QACtB,OAAO,GAAG,WAAW,oBACR,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAKF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,qBACV,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAEF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,qBACb,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAEF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,qBACV,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAEF,CAAC"}
+{"version":3,"file":"pg-pool.middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/pg-pool.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACZ,MAAM,WAAW,CAAC;AAEnB;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,uCACL,MAAM,wBAEhB,QAAQ,mBACC,iBAAiB,sBA2BnC,CAAC;AAMF;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAS,OAAO,GAAG,WAAW,KAAG,WAE3D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,QACpB,WAAW,aACL,WAAW,KACrB,IAEF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QACvB,OAAO,GAAG,WAAW,KACzB,cAEF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,QACvB,WAAW,gBACF,cAAc,KAC3B,IAEF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAS,OAAO,GAAG,WAAW,KAAG,WAE3D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,QACpB,WAAW,aACL,WAAW,KACrB,IAEF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,QACtB,OAAO,GAAG,WAAW,oBACR,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAKF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,QACzB,OAAO,GAAG,WAAW,oBACR,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAKF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,QACtB,OAAO,GAAG,WAAW,oBACR,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,IAKF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,qBACV,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,WAEF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,qBACb,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,cAEF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,qBACV,MAAM,UAChB,QAAQ,mBACC,iBAAiB,KACjC,WAEF,CAAC"}

package/dist/middleware/pg-pool.middleware.js

@@ -13,6 +13,7 @@ const pg_1 = require("pg");
  */
 const createPgPool = (connectionString, poolLabel, logger, shutdownActions) => {
     const pgPool = new pg_1.Pool({ connectionString });
+    pgPool.label = poolLabel;
     // If a pg pool error happens and triggers the exit of node process (e.g postgres server stopped while postgraphile service is running) -
     // it is possible for it to not be caught using this handler, because node process will close faster.
     // But such errors can always be caught using 'uncaughtException' process event.

package/dist/middleware/pg-pool.middleware.js.map

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

package/migrations/before-migration/{005-created-updated-triggers.sql → 005-created-updated-deleted-triggers.sql}

@@ -26,12 +26,17 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql volatile SET search_path TO pg_catalog, public, pg_temp;
 
--- trigger function to set tenant_id and environment_id from settings
--- mosaic.tenant_id and mosaic.environment_id are added by PostGraphile to the 
--- pool context. If a pool is manually created the settings must be supplied as well.
--- Manually inserting tenant/env ID will still set the ones from the settings.
--- The only exception are superusers who can manually set them for e.g. local development.
--- usage:
+-- Trigger function to set tenant_id and environment_id from settings and to 
+-- prevent accidental cross-tenant/environment updates. mosaic.tenant_id and 
+-- mosaic.environment_id are added by PostGraphile to the pool context. If a 
+-- pool is manually created the settings must be supplied as well. The only 
+-- exception are superusers who can manually set them for e.g. local 
+-- development.
+-- IMPORTANT: UPDATE operations made by db owner must explicitly specify 
+--    tenant_id / environment_id in a WHERE condition. If UPDATE or INSERT 
+--    would affect/create rows for a tenant / environment that does not match 
+--    settings then an exception will occur.
+-- Usage:
 -- SELECT set_config('mosaic.tenant_id', '00000000-0000-0000-0000-000000000000', TRUE);
 -- SELECT set_config('mosaic.environment_id', '00000000-0000-0000-0000-000000000000', TRUE);
 -- or
@@ -66,6 +71,42 @@ $$ LANGUAGE plpgsql VOLATILE;
 COMMENT ON FUNCTION ax_utils.tg__tenant_environment() IS
   E'This trigger should be called on tables needing automatic tenant_id, environment_id - to support multi-tenancy';
 
+-- Trigger function to prevent accidental cross-tenant/environment deletion.
+-- This trigger should be applied alongside 'ax_utils.tg__tenant_environment'
+-- Settings & usage are the same as for 'ax_utils.tg__tenant_environment'.
+-- IMPORTANT: DELETE operations made by db owner must explicitly specify 
+--    tenant_id / environment_id in a WHERE condition. If DELETE would affect
+--    rows from a tenant / environment that does not match settings then an 
+--    exception will occur.
+CREATE OR REPLACE FUNCTION ax_utils.tg__tenant_environment_on_delete() RETURNS TRIGGER AS $$
+DECLARE
+	tenant_id text = current_setting('mosaic.tenant_id', TRUE);
+  environment_id text = current_setting('mosaic.environment_id', TRUE);
+  is_superuser text = current_setting('is_superuser', TRUE);
+  ignore_multitenancy text = current_setting('mosaic.ignore_multitenancy', TRUE);
+BEGIN
+  IF tenant_id <> '' THEN   -- Not null and not empty
+    IF OLD.tenant_id::TEXT <> tenant_id THEN
+      perform ax_utils.raise_error('The "mosaic.tenant_id" set via set_config must match the deleted row.', 'TENAN');
+    END IF;
+  ELSIF is_superuser <> 'on' AND ignore_multitenancy <> 'on' THEN
+    perform ax_utils.raise_error('The "mosaic.tenant_id" must be set via set_config value.', 'TENAN');
+  END IF;
+  IF environment_id <> '' THEN   -- Not null and not empty
+    IF OLD.environment_id::TEXT <> environment_id THEN
+      perform ax_utils.raise_error('The "mosaic.environment_id" set via set_config must match the deleted row.', 'ENVVV');
+    END IF;
+  ELSIF is_superuser <> 'on' AND ignore_multitenancy <> 'on' THEN
+    perform ax_utils.raise_error('The "mosaic.environment_id" must be set via set_config value.', 'ENVVV');
+  END IF;
+  RETURN OLD;
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+COMMENT ON FUNCTION ax_utils.tg__tenant_environment_on_delete() IS
+  E'This trigger should be called on tables needing automatic tenant_id, environment_id - to support multi-tenancy';
+
+
 -- Trigger function to set user_id from settings mosaic.auth.user_id.
 -- The setting is added by Postgraphile to the pool context referring 
 -- to the 'sub' property of the AuthenticatedSubject when the type is of EndUserAccount.

package/migrations/define/define-functions.sql

@@ -142,6 +142,7 @@ CREATE OR REPLACE FUNCTION ax_define.drop_tenant_environment_trigger(tableName t
     AS $$
 BEGIN
   EXECUTE 'DROP trigger IF EXISTS _200_tenant_environment on ' || schemaName || '.' || tableName || ';';
+  EXECUTE 'DROP trigger IF EXISTS _200_tenant_environment_on_delete on ' || schemaName || '.' || tableName || ';';
 END;
 $$;
 
@@ -162,6 +163,8 @@ BEGIN
   PERFORM ax_define.drop_tenant_environment_trigger(tableName, schemaName);
   EXECUTE 'CREATE trigger _200_tenant_environment BEFORE INSERT OR UPDATE ON ' || schemaName || '.' || tableName ||
           ' for each ROW EXECUTE PROCEDURE ax_utils.tg__tenant_environment();';
+  EXECUTE 'CREATE trigger _200_tenant_environment_on_delete BEFORE DELETE ON ' || schemaName || '.' || tableName ||
+          ' for each ROW EXECUTE PROCEDURE ax_utils.tg__tenant_environment_on_delete();';
 END;
 $$;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-db-common",
-  "version": "0.14.0-rc.9",
+  "version": "0.14.0",
   "description": "This library encapsulates database-related functionality to develop Mosaic based services.",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2d0e54ce162fee123183ccaf13a38bba24314117"
+  "gitHead": "0f2b502b5ab032e6430cf4dac79a54e346447a2f"
 }