@memberjunction/external-data-sources 6.2.0-edge.6 → 6.2.0-edge.7

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 (17) hide show
  1. package/dist/BaseExternalDataSourceDriver.d.ts +1 -0
  2. package/dist/BaseExternalDataSourceDriver.d.ts.map +1 -1
  3. package/dist/BaseExternalDataSourceDriver.js +3 -0
  4. package/dist/BaseExternalDataSourceDriver.js.map +1 -1
  5. package/dist/BaseSqlExternalDataSourceDriver.d.ts +5 -1
  6. package/dist/BaseSqlExternalDataSourceDriver.d.ts.map +1 -1
  7. package/dist/BaseSqlExternalDataSourceDriver.js +17 -1
  8. package/dist/BaseSqlExternalDataSourceDriver.js.map +1 -1
  9. package/dist/ExternalDataSourceReadRouterImpl.d.ts +1 -0
  10. package/dist/ExternalDataSourceReadRouterImpl.d.ts.map +1 -1
  11. package/dist/ExternalDataSourceReadRouterImpl.js +9 -0
  12. package/dist/ExternalDataSourceReadRouterImpl.js.map +1 -1
  13. package/dist/sqlReadOnlyScreen.d.ts +3 -1
  14. package/dist/sqlReadOnlyScreen.d.ts.map +1 -1
  15. package/dist/sqlReadOnlyScreen.js +141 -45
  16. package/dist/sqlReadOnlyScreen.js.map +1 -1
  17. package/package.json +7 -7
package/dist/BaseExternalDataSourceDriver.d.ts CHANGED
@@ -8,6 +8,7 @@ export declare abstract class BaseExternalDataSourceDriver<TConnection = unknown
8
8
  abstract RunView<TRow extends ExternalRow = ExternalRow>(dataSource: MJExternalDataSourceEntity, params: ExternalViewParams, contextUser?: UserInfo): Promise<ExternalViewResult<TRow>>;
9
9
  abstract LoadSingle<TRow extends ExternalRow = ExternalRow>(dataSource: MJExternalDataSourceEntity, objectName: string, primaryKeys: readonly ExternalQueryParameter[], contextUser?: UserInfo): Promise<TRow | null>;
10
10
  abstract RunNativeQuery<TRow extends ExternalRow = ExternalRow>(dataSource: MJExternalDataSourceEntity, queryText: string, params: ExternalQueryParameter[] | undefined, contextUser?: UserInfo): Promise<ExternalQueryResult<TRow>>;
11
+ get QueryDialectKey(): string | null;
11
12
  ResolveObjectName(entity: EntityInfo): string;
12
13
  protected abstract getConnection(dataSource: MJExternalDataSourceEntity, contextUser?: UserInfo): Promise<TConnection>;
13
14
  protected resolveCredential<TCred extends Record<string, string> = Record<string, string>>(dataSource: MJExternalDataSourceEntity, contextUser?: UserInfo): Promise<ResolvedCredential<TCred> | null>;
package/dist/BaseExternalDataSourceDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseExternalDataSourceDriver.d.ts","sourceRoot":"","sources":["../src/BaseExternalDataSourceDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseExternalDataSourceDriver.d.ts","sourceRoot":"","sources":["../src/BaseExternalDataSourceDriver.ts"],"names":[],"mappings":"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"}
package/dist/BaseExternalDataSourceDriver.js CHANGED
@@ -1,6 +1,9 @@
1
1
  import { CredentialEngine } from "@memberjunction/credentials";
2
2
  import { redactConnectionSecrets, } from "./types.js";
3
3
  export class BaseExternalDataSourceDriver {
4
+ get QueryDialectKey() {
5
+ return null;
6
+ }
4
7
  ResolveObjectName(entity) {
5
8
  return entity.ExternalObjectName || entity.BaseTable || entity.Name;
6
9
  }
package/dist/BaseExternalDataSourceDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseExternalDataSourceDriver.js","sourceRoot":"","sources":["../src/BaseExternalDataSourceDriver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAOL,uBAAuB,GACxB,MAAM,SAAS,CAAC;AAsBjB,MAAM,OAAgB,4BAA4B;IA2DzC,iBAAiB,CAAC,MAAkB;QACzC,OAAO,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;IACtE,CAAC;IAiBS,KAAK,CAAC,iBAAiB,CAC/B,UAAsC,EACtC,WAAsB;QAEtB,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3D,OAAO,gBAAgB,CAAC,QAAQ,CAAC,aAAa,CAAQ,EAAE,EAAE;YACxD,YAAY,EAAE,UAAU,CAAC,YAAY;YACrC,WAAW;YACX,SAAS,EAAE,qBAAqB;SACjC,CAAC,CAAC;IACL,CAAC;IAOS,qBAAqB,CAC7B,UAAsC;QAEtC,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YACjC,OAAO,EAAa,CAAC;QACvB,CAAC;QACD,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAY,CAAC;QAC5D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,uBAAuB,UAAU,CAAC,IAAI,sCAAsC,CAAC,CAAC;QAChG,CAAC;IACH,CAAC;IAaS,qBAAqB,CAAC,IAK/B;QAIC,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC5E,MAAM,IAAI,KAAK,CACb,gDAAgD,IAAI,CAAC,cAAc,SAAS,IAAI,IAAI,oBAAoB,oCAAoC;gBAC1I,oHAAoH,CACvH,CAAC;QACJ,CAAC;IACH,CAAC;IAQS,WAAW,CAAC,IAAwB;QAC5C,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACpE,OAAO,CACL,CAAC,KAAK,WAAW;YACjB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;YACxB,CAAC,KAAK,KAAK;YACX,kCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC3C,CAAC;IACJ,CAAC;IAGS,SAAS,CAAC,CAAU;QAC5B,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAQS,uBAAuB,CAAC,OAAe;QAC/C,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAeS,cAAc,CAAC,CAAU;QACjC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/C,IAAI,CAAC,YAAY,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAI,CAA4B,CAAC,SAAS,CAAC;YACzD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,QAAQ,EAAE,CAAC;oBACjB,KAAK,MAAM,CAAC;oBACZ,KAAK,YAAY,CAAC;oBAClB,KAAK,UAAU,CAAC;oBAChB,KAAK,UAAU;wBACb,OAAQ,CAA4B,CAAC,QAAQ,EAAE,CAAC;oBAClD,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,MAAM,GAAG,GAAG,CAA6D,CAAC;wBAC1E,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC/E,CAAC;oBACD,KAAK,QAAQ,CAAC;oBACd,KAAK,OAAO;wBACV,OAAQ,CAA2B,CAAC,OAAO,EAAE,CAAC;oBAChD;wBACE,OAAQ,CAA4B,CAAC,QAAQ,EAAE,CAAC;gBACpD,CAAC;YACH,CAAC;YAKD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IASO,oBAAoB,CAAC,CAAU;QACrC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/C,IAAI,CAAC,YAAY,IAAI;YAAE,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAI,CAA4B,CAAC,SAAS,CAAC;YACzD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,QAAQ,EAAE,CAAC;oBACjB,KAAK,MAAM,CAAC;oBACZ,KAAK,YAAY,CAAC;oBAClB,KAAK,UAAU,CAAC;oBAChB,KAAK,UAAU;wBACb,OAAQ,CAA4B,CAAC,QAAQ,EAAE,CAAC;oBAClD,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,MAAM,GAAG,GAAG,CAA6D,CAAC;wBAC1E,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;wBAC1F,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAA4B,CAAC,QAAQ,EAAE,CAAC;oBAClG,CAAC;oBACD,KAAK,QAAQ,CAAC;oBACd,KAAK,OAAO;wBACV,OAAQ,CAA2B,CAAC,OAAO,EAAE,CAAC;oBAChD;wBACE,OAAQ,CAA4B,CAAC,QAAQ,EAAE,CAAC;gBACpD,CAAC;YACH,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;YACD,MAAM,GAAG,GAA4B,EAAE,CAAC;YACxC,KAAK,MAAM,CAAC,IAAI,CAA4B,EAAE,CAAC;gBAC7C,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAE,CAA6B,CAAC,CAAC,CAAC,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAGS,aAAa,CAAuC,IAAY;QACxE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;gBACnB,GAA+B,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAoBS,cAAc,CAAC,aAAqB;QAC5C,OAAO,SAAS,CAAC;IACnB,CAAC;IAQM,KAAK,CAAC,eAAe,CAAC,YAAoB;QAC/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IASS,KAAK,CAAC,mBAAmB,CACjC,UAAsC,EACtC,EAAoB;QAIpB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzB,MAAM,CAAC,CAAC;YACV,CAAC;YAGD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC3D,CAAC;YAAC,MAAM,CAAC,CAA6D,CAAC;YACvE,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAaS,WAAW,CAAC,CAAU;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,IAAI,IAAI,4BAA4B,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACvE,OAAO,CACL,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;YACzB,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;YACxB,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1B,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC;YAC5B,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC;YAC7B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;YACrB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CACtB,CAAC;IACJ,CAAC;aAOuB,mBAAc,GAAG,IAAI,GAAG,CAAS;QACvD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;KAC5F,CAAC,CAAC;IAGK,gBAAgB,CAAC,CAAU;QACjC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,CAA8E,CAAC;YAC3F,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC"}
1
+ {"version":3,"file":"BaseExternalDataSourceDriver.js","sourceRoot":"","sources":["../src/BaseExternalDataSourceDriver.ts"],"names":[],"mappings":"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"}
package/dist/BaseSqlExternalDataSourceDriver.d.ts CHANGED
@@ -2,10 +2,14 @@ import { ExternalObjectType, ExternalSchemaRelationship, EntityInfo } from "@mem
2
2
  import { MJExternalDataSourceEntity } from "@memberjunction/core-entities";
3
3
  import { BaseExternalDataSourceDriver } from "./BaseExternalDataSourceDriver.js";
4
4
  import { ExternalFkRow, ExternalViewParams, ExternalQueryParameter } from "./types.js";
5
+ import type { QueryDialect } from "@memberjunction/sql-dialect";
5
6
  import { type SqlDialectKey } from "./sqlReadOnlyScreen.js";
6
7
  export declare abstract class BaseSqlExternalDataSourceDriver<TConnection = unknown> extends BaseExternalDataSourceDriver<TConnection> {
7
- protected abstract quoteIdent(name: string): string;
8
+ private resolvedDialect;
8
9
  protected sqlDialectKey(): SqlDialectKey;
10
+ get QueryDialectKey(): string | null;
11
+ protected get SourceDialect(): QueryDialect;
12
+ protected quoteIdent(name: string): string;
9
13
  protected screenReadOnlyNativeQuery(sql: string): void;
10
14
  protected normalizeForReadOnlyParse(sql: string): string;
11
15
  protected buildPrimaryKeyWhere(primaryKeys: readonly ExternalQueryParameter[], placeholder: (index: number) => string): {
package/dist/BaseSqlExternalDataSourceDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseSqlExternalDataSourceDriver.d.ts","sourceRoot":"","sources":["../src/BaseSqlExternalDataSourceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACpF,OAAO,EAAmD,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAiB1G,8BAAsB,+BAA+B,CAAC,WAAW,GAAG,OAAO,CAAE,SAAQ,4BAA4B,CAAC,WAAW,CAAC;IAE5H,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAQnD,SAAS,CAAC,aAAa,IAAI,aAAa;IAWxC,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAYtD,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAWxD,SAAS,CAAC,oBAAoB,CAC5B,WAAW,EAAE,SAAS,sBAAsB,EAAE,EAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GACrC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;KAAE;IAoBrE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI;IAQ/E,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAMzE,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM;IAK9D,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAU7C,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;IAanF,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAUzD,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;IAmBxE,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAa3E,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAyB5E,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB;IAS7E,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB;IAK/D,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAmB3E,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM;IAgB7D,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC;CAoB/F"}
1
+ {"version":3,"file":"BaseSqlExternalDataSourceDriver.d.ts","sourceRoot":"","sources":["../src/BaseSqlExternalDataSourceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAqE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAiB5H,8BAAsB,+BAA+B,CAAC,WAAW,GAAG,OAAO,CAAE,SAAQ,4BAA4B,CAAC,WAAW,CAAC;IAC5H,OAAO,CAAC,eAAe,CAA6B;IAQpD,SAAS,CAAC,aAAa,IAAI,aAAa;IAKxC,IAAoB,eAAe,IAAI,MAAM,GAAG,IAAI,CAEnD;IAGD,SAAS,KAAK,aAAa,IAAI,YAAY,CAK1C;IAGD,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAW1C,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAYtD,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAWxD,SAAS,CAAC,oBAAoB,CAC5B,WAAW,EAAE,SAAS,sBAAsB,EAAE,EAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GACrC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;KAAE;IAoBrE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI;IAQ/E,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAMzE,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM;IAK9D,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAU7C,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;IAanF,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAUzD,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;IAmBxE,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAa3E,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,MAAM;IAyB5E,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB;IAS7E,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB;IAK/D,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAmB3E,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM;IAgB7D,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC;CAoB/F"}
package/dist/BaseSqlExternalDataSourceDriver.js CHANGED
@@ -1,9 +1,25 @@
1
1
  import { BaseExternalDataSourceDriver } from "./BaseExternalDataSourceDriver.js";
2
- import { AssertReadOnlyNativeQuery, AssertReadOnlyClause } from "./sqlReadOnlyScreen.js";
2
+ import { AssertReadOnlyNativeQuery, AssertReadOnlyClause, GetScreenDialect } from "./sqlReadOnlyScreen.js";
3
3
  export class BaseSqlExternalDataSourceDriver extends BaseExternalDataSourceDriver {
4
+ constructor() {
5
+ super(...arguments);
6
+ this.resolvedDialect = null;
7
+ }
4
8
  sqlDialectKey() {
5
9
  return 'ansi';
6
10
  }
11
+ get QueryDialectKey() {
12
+ return this.SourceDialect.Key;
13
+ }
14
+ get SourceDialect() {
15
+ if (!this.resolvedDialect) {
16
+ this.resolvedDialect = GetScreenDialect(this.sqlDialectKey());
17
+ }
18
+ return this.resolvedDialect;
19
+ }
20
+ quoteIdent(name) {
21
+ return this.SourceDialect.Writer.QuoteIdentifier(name);
22
+ }
7
23
  screenReadOnlyNativeQuery(sql) {
8
24
  AssertReadOnlyNativeQuery(this.normalizeForReadOnlyParse(sql), this.sqlDialectKey());
9
25
  }
package/dist/BaseSqlExternalDataSourceDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseSqlExternalDataSourceDriver.js","sourceRoot":"","sources":["../src/BaseSqlExternalDataSourceDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseSqlExternalDataSourceDriver.js","sourceRoot":"","sources":["../src/BaseSqlExternalDataSourceDriver.ts"],"names":[],"mappings":"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"}
package/dist/ExternalDataSourceReadRouterImpl.d.ts CHANGED
@@ -3,6 +3,7 @@ export declare class ExternalDataSourceReadRouterImpl extends ExternalDataSource
3
3
  RunViewExternal<T = unknown>(entity: EntityInfo, params: RunViewParams, contextUser?: UserInfo, provider?: IMetadataProvider): Promise<RunViewResult<T>>;
4
4
  LoadExternalRecord<T = unknown>(entity: EntityInfo, compositeKey: CompositeKey, contextUser?: UserInfo, provider?: IMetadataProvider): Promise<RunViewResult<T>>;
5
5
  RunQueryExternal(externalDataSourceID: string, queryID: string, queryName: string, sql: string, _params: RunQueryParams, contextUser?: UserInfo, provider?: IMetadataProvider): Promise<RunQueryResult>;
6
+ GetQueryDialectKey(externalDataSourceID: string, contextUser?: UserInfo, provider?: IMetadataProvider): Promise<string | null>;
6
7
  GetCacheTTLSeconds(externalDataSourceID: string, contextUser?: UserInfo, provider?: IMetadataProvider): Promise<number>;
7
8
  IntrospectExternalSchema(externalDataSourceID: string, schemaName?: string, contextUser?: UserInfo, provider?: IMetadataProvider): Promise<ExternalSchemaDescriptor>;
8
9
  private resolveMaxRows;
package/dist/ExternalDataSourceReadRouterImpl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ExternalDataSourceReadRouterImpl.d.ts","sourceRoot":"","sources":["../src/ExternalDataSourceReadRouterImpl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,4BAA4B,EAC5B,wBAAwB,EACxB,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,EACb,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAoC9B,qBACa,gCAAiC,SAAQ,4BAA4B;IACnE,eAAe,CAAC,CAAC,GAAG,OAAO,EACtC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IA+Df,kBAAkB,CAAC,CAAC,GAAG,OAAO,EACzC,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAkCf,gBAAgB,CAC3B,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,cAAc,CAAC;IAwBb,kBAAkB,CAC7B,oBAAoB,EAAE,MAAM,EAC5B,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,MAAM,CAAC;IAaL,wBAAwB,CACnC,oBAAoB,EAAE,MAAM,EAC5B,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,wBAAwB,CAAC;IAWpC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,SAAS;CAKlB"}
1
+ {"version":3,"file":"ExternalDataSourceReadRouterImpl.d.ts","sourceRoot":"","sources":["../src/ExternalDataSourceReadRouterImpl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,UAAU,EACV,4BAA4B,EAC5B,wBAAwB,EACxB,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,EACb,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAoC9B,qBACa,gCAAiC,SAAQ,4BAA4B;IACnE,eAAe,CAAC,CAAC,GAAG,OAAO,EACtC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IA+Df,kBAAkB,CAAC,CAAC,GAAG,OAAO,EACzC,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,EAC1B,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAkCf,gBAAgB,CAC3B,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,cAAc,CAAC;IAyBJ,kBAAkB,CACtC,oBAAoB,EAAE,MAAM,EAC5B,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IASZ,kBAAkB,CAC7B,oBAAoB,EAAE,MAAM,EAC5B,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,MAAM,CAAC;IAaL,wBAAwB,CACnC,oBAAoB,EAAE,MAAM,EAC5B,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,QAAQ,EACtB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,wBAAwB,CAAC;IAWpC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,SAAS;CAKlB"}
package/dist/ExternalDataSourceReadRouterImpl.js CHANGED
@@ -102,6 +102,15 @@ let ExternalDataSourceReadRouterImpl = class ExternalDataSourceReadRouterImpl ex
102
102
  return this.failQuery(queryID, queryName, this.errorText(e), Date.now() - start);
103
103
  }
104
104
  }
105
+ async GetQueryDialectKey(externalDataSourceID, contextUser, provider) {
106
+ try {
107
+ const { driver } = await ExternalDataSourceRouter.Instance.Resolve(externalDataSourceID, contextUser, provider);
108
+ return driver.QueryDialectKey;
109
+ }
110
+ catch {
111
+ return null;
112
+ }
113
+ }
105
114
  async GetCacheTTLSeconds(externalDataSourceID, contextUser, provider) {
106
115
  try {
107
116
  const { dataSource } = await ExternalDataSourceRouter.Instance.Resolve(externalDataSourceID, contextUser, provider);
package/dist/ExternalDataSourceReadRouterImpl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ExternalDataSourceReadRouterImpl.js","sourceRoot":"","sources":["../src/ExternalDataSourceReadRouterImpl.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAGL,4BAA4B,GAQ7B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAA2D,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAG3G,MAAM,kCAAkC,GAAG,GAAG,CAAC;AAM/C,MAAM,yBAAyB,GAAG,IAAI,CAAC;AAcvC,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAW/B,IAAM,gCAAgC,GAAtC,MAAM,gCAAiC,SAAQ,4BAA4B;IACzE,KAAK,CAAC,eAAe,CAC1B,MAAkB,EAClB,MAAqB,EACrB,WAAsB,EACtB,QAA4B;QAE5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAC5E,MAAM,CAAC,oBAAoB,EAC3B,WAAW,EACX,QAAQ,CACT,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAQpF,MAAM,OAAO,GAAI,MAAM,CAAC,OAAkB,IAAI,SAAS,CAAC;YACxD,IAAI,qBAA2C,CAAC;YAChD,IAAI,CAAC,OAAO,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC/B,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAClC,qBAAqB,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAClE,CAAC;qBAAM,CAAC;oBAGN,OAAO,IAAI,CAAC,QAAQ,CAClB,oBAAoB,MAAM,CAAC,IAAI,wFAAwF,EACvH,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CACnB,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,MAAM,UAAU,GAAuB;gBAIrC,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;gBACzE,MAAM,EAAG,MAAM,CAAC,WAAsB,IAAI,SAAS;gBACnD,OAAO;gBACP,qBAAqB;gBAIrB,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC;gBACxD,MAAM;aACP,CAAC;YACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAc,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YACnF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC,QAAQ,CAAI,GAAG,CAAC,YAAY,IAAI,yBAAyB,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;YAC7F,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBAEb,OAAO,EAAE,GAAG,CAAC,IAAsB;gBACnC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;gBACzB,aAAa,EAAE,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM;gBACnD,aAAa,EAAE,GAAG,CAAC,eAAe;gBAClC,YAAY,EAAE,EAAE;aACjB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,QAAQ,CAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC7B,MAAkB,EAClB,YAA0B,EAC1B,WAAsB,EACtB,QAA4B;QAE5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAC5E,MAAM,CAAC,oBAAoB,EAC3B,WAAW,EACX,QAAQ,CACT,CAAC;YACF,MAAM,WAAW,GAA6B,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACpF,IAAI,EAAE,EAAE,CAAC,SAAS;gBAClB,KAAK,EAAE,EAAE,CAAC,KAAK;aAChB,CAAC,CAAC,CAAC;YACJ,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC,QAAQ,CAClB,oCAAoC,MAAM,CAAC,IAAI,yCAAyC,EACxF,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CACnB,CAAC;YACJ,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACpD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAc,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;YACnG,OAAO;gBACL,OAAO,EAAE,IAAI;gBAEb,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAmB;gBAC7C,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrB,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1B,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;gBACjC,YAAY,EAAE,EAAE;aACjB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,QAAQ,CAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,oBAA4B,EAC5B,OAAe,EACf,SAAiB,EACjB,GAAW,EACX,OAAuB,EACvB,WAAsB,EACtB,QAA4B;QAE5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;YAE5H,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,cAAc,CAAc,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAC9F,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,YAAY,IAAI,uBAAuB,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;YAC7G,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,GAAG,CAAC,IAAI;gBACjB,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;gBACzB,aAAa,EAAE,GAAG,CAAC,QAAQ;gBAC3B,aAAa,EAAE,GAAG,CAAC,eAAe;gBAClC,YAAY,EAAE,EAAE;aACjB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC7B,oBAA4B,EAC5B,WAAsB,EACtB,QAA4B;QAE5B,IAAI,CAAC;YACH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;YACpH,MAAM,GAAG,GAAG,UAAU,CAAC,sBAAsB,CAAC;YAE9C,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,kCAAkC,CAAC;QAC5E,CAAC;QAAC,MAAM,CAAC;YAGP,OAAO,kCAAkC,CAAC;QAC5C,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,wBAAwB,CACnC,oBAA4B,EAC5B,UAAmB,EACnB,WAAsB,EACtB,QAA4B;QAE5B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5H,OAAO,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACtE,CAAC;IAQO,cAAc,CAAC,MAAqB,EAAE,MAAkB,EAAE,UAAsC;QACtG,MAAM,SAAS,GACb,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC;YAClC,CAAC,CAAC,MAAM,CAAC,OAAO;YAChB,CAAC,CAAC,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,eAAe,GAAG,CAAC;gBACpD,CAAC,CAAC,MAAM,CAAC,eAAe;gBACxB,CAAC,CAAC,yBAAyB,CAAC;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,sBAAsB,CAAC;QAChF,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAGO,oBAAoB,CAAC,UAAsC;QACjE,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAA8B,CAAC;YACjF,OAAO,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,IAAI,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAClG,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,QAAQ,CAAI,YAAoB,EAAE,aAAqB;QAC7D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IAClI,CAAC;IAEO,SAAS,CAAC,OAAe,EAAE,SAAiB,EAAE,YAAoB,EAAE,aAAqB;QAC/F,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,CAAC;YACX,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,aAAa;YAC5B,YAAY,EAAE,YAAY;SAC3B,CAAC;IACJ,CAAC;IAEO,SAAS,CAAC,CAAU;QAG1B,OAAO,uBAAuB,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AA3NY,gCAAgC;IAD5C,aAAa,CAAC,4BAA4B,EAAE,8BAA8B,CAAC;GAC/D,gCAAgC,CA2N5C"}
1
+ {"version":3,"file":"ExternalDataSourceReadRouterImpl.js","sourceRoot":"","sources":["../src/ExternalDataSourceReadRouterImpl.ts"],"names":[],"mappings":"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"}
package/dist/sqlReadOnlyScreen.d.ts CHANGED
@@ -1,4 +1,6 @@
1
- export type SqlDialectKey = "sqlserver" | "ansi";
1
+ import { QueryDialect } from "@memberjunction/sql-dialect";
2
+ export type SqlDialectKey = "sqlserver" | "postgresql" | "mysql" | "oracle" | "snowflake" | "databricks" | "ansi";
3
+ export declare function GetScreenDialect(key: SqlDialectKey): QueryDialect;
2
4
  export declare function AssertReadOnlyNativeQuery(sql: string, dialectKey: SqlDialectKey): void;
3
5
  export declare function assertReadOnlyNativeQuery(sql: string, dialectKey: SqlDialectKey): void;
4
6
  export declare function AssertReadOnlyClause(clause: string, dialectKey: SqlDialectKey, kind: "where" | "orderby"): void;
package/dist/sqlReadOnlyScreen.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sqlReadOnlyScreen.d.ts","sourceRoot":"","sources":["../src/sqlReadOnlyScreen.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,CAAC;AA6EjD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CAqDtF;AAGD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CAEtF;AAmBD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CA6B/G;AAGD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAE/G"}
1
+ {"version":3,"file":"sqlReadOnlyScreen.d.ts","sourceRoot":"","sources":["../src/sqlReadOnlyScreen.ts"],"names":[],"mappings":"AACA,OAAO,EAEH,YAAY,EAKf,MAAM,6BAA6B,CAAC;AAWrC,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,MAAM,CAAC;AAwBlH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY,CAEjE;AAoND,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CAiBtF;AAGD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CAEtF;AAwDD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAuB/G;AAGD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAE/G"}
package/dist/sqlReadOnlyScreen.js CHANGED
@@ -1,77 +1,173 @@
1
- import { SQLParser } from "@memberjunction/sql-parser";
2
- import { SQLServerDialect, PostgreSQLDialect } from "@memberjunction/sql-dialect";
3
- function dialectFor(key) {
4
- return key === "sqlserver" ? new SQLServerDialect() : new PostgreSQLDialect();
1
+ import { LexSQL, SignificantTokens, SQLParser, StrictFragmentValidator } from "@memberjunction/sql-parser";
2
+ import { GetQueryDialect, SQLDialect, } from "@memberjunction/sql-dialect";
3
+ const ANSI_ALIAS_DIALECT = "postgresql";
4
+ const FALLBACK_CLAUSE_DIALECT = "postgresql";
5
+ const GRAMMAR_NAME_PART_LIMITS = { Hive: 2 };
6
+ const LEXICAL_SCREEN_EXTRA_FORBIDDEN_WORDS = ["INTO", "FUNCTION", "PROCEDURE"];
7
+ export function GetScreenDialect(key) {
8
+ return GetQueryDialect(key === "ansi" ? ANSI_ALIAS_DIALECT : key);
5
9
  }
6
- const WRITE_NODE_TYPES = new Set([
7
- "insert", "update", "delete", "merge", "replace", "drop", "create", "alter", "truncate",
8
- "rename", "call", "exec", "execute", "grant", "revoke", "use", "load", "copy", "do",
9
- ]);
10
- function astContainsWriteNode(node) {
11
- if (!node || typeof node !== "object") {
12
- return false;
10
+ function parserDialectFor(dialect, grammar) {
11
+ if (dialect instanceof SQLDialect && dialect.Grammar.ParserGrammar === grammar) {
12
+ return dialect;
13
13
  }
14
- if (Array.isArray(node)) {
15
- return node.some(astContainsWriteNode);
14
+ const lexical = dialect.Lexical;
15
+ return {
16
+ Key: dialect.Key,
17
+ Lexical: lexical,
18
+ Grammar: dialect.Grammar,
19
+ ParserDialect: grammar,
20
+ QuoteIdentifier: (name) => dialect.Writer.QuoteIdentifier(name),
21
+ AllowsOrderByInCTE: dialect.Grammar.AllowsOrderByInCTE,
22
+ DefaultPagingOrderBy: dialect.Grammar.DefaultPagingOrderBy,
23
+ SupportsEscapeStringLiterals: lexical.StringLiterals.some(f => f.BackslashEscape && f.Prefixes.some(p => p.toUpperCase() === "E")),
24
+ SupportsDollarQuotedStrings: lexical.DollarQuotedStrings !== "none",
25
+ QueryHintKeyword: dialect.Grammar.QueryHintKeyword,
26
+ CallerSQLForbiddenFunctions: dialect.Grammar.CallerSQLForbiddenFunctions,
27
+ };
28
+ }
29
+ function assertLexicallyUnambiguous(tokens, dialect, subject) {
30
+ const executable = dialect.Lexical.BlockComments.ExecutableOpeners;
31
+ if (tokens.some(t => t.Kind === "comment" && executable.some(opener => t.Text.startsWith(opener)))) {
32
+ throw new Error(`${subject} rejected: a comment whose content the database runs or interprets is not allowed — refusing under uncertainty (External Data Sources are read-only).`);
16
33
  }
17
- const obj = node;
18
- const type = obj.type;
19
- if (typeof type === "string" && WRITE_NODE_TYPES.has(type.toLowerCase())) {
20
- return true;
34
+ if (dialect.Lexical.BackslashEscapesDependOnServerSettings && tokens.some(t => t.Kind === "string" && t.Text.includes("\\"))) {
35
+ throw new Error(`${subject} rejected: a string literal containing a backslash ends in a place that depends on server settings — refusing under uncertainty (External Data Sources are read-only).`);
21
36
  }
22
- return Object.values(obj).some(astContainsWriteNode);
23
37
  }
24
- function isSingleTypedStatement(ast) {
25
- const statements = Array.isArray(ast) ? ast : [ast];
26
- if (statements.length !== 1) {
27
- return false;
38
+ function grammarText(tokens, grammar) {
39
+ const limit = GRAMMAR_NAME_PART_LIMITS[grammar];
40
+ const source = limit === undefined ? tokens : shortenQualifiedNames(tokens, limit);
41
+ let out = "";
42
+ for (const token of source) {
43
+ const text = token.Kind === "comment" ? " " : token.Text;
44
+ if (text.length > 0 && COMMENT_MARKERS.has(out.slice(-1) + text[0])) {
45
+ out += " ";
46
+ }
47
+ out += text;
28
48
  }
29
- const stmt = statements[0];
30
- return !!stmt && typeof stmt === "object" && typeof stmt.type === "string";
49
+ return out;
31
50
  }
32
- export function AssertReadOnlyNativeQuery(sql, dialectKey) {
33
- const dialect = dialectFor(dialectKey);
34
- if (SQLParser.HasStackedStatements(sql, dialect)) {
35
- throw new Error("External native query rejected: multiple statements are not allowed against a read-only external data source.");
51
+ const COMMENT_MARKERS = new Set(["--", "/*", "*/", "//"]);
52
+ function isNamePart(token) {
53
+ return token !== undefined && (token.Kind === "word" || token.Kind === "identifier");
54
+ }
55
+ function dottedNameAt(tokens, start) {
56
+ let end = start + 1;
57
+ let parts = 1;
58
+ while (tokens[end]?.Kind === "dot" && isNamePart(tokens[end + 1])) {
59
+ end += 2;
60
+ parts++;
61
+ }
62
+ return { End: end, Parts: parts };
63
+ }
64
+ function shortenQualifiedNames(tokens, limit) {
65
+ const out = [];
66
+ let i = 0;
67
+ let count = 0;
68
+ while (i < tokens.length) {
69
+ const name = isNamePart(tokens[i]) && tokens[i - 1]?.Kind !== "dot" ? dottedNameAt(tokens, i) : null;
70
+ if (!name || name.Parts <= limit) {
71
+ out.push(tokens[i]);
72
+ i++;
73
+ continue;
74
+ }
75
+ const keepFrom = name.End - (limit - 1) * 2;
76
+ out.push({ ...tokens[i], Kind: "word", Text: `__mj_name_${count++}` }, ...tokens.slice(keepFrom, name.End));
77
+ i = name.End;
36
78
  }
37
- const leadingTrimmed = sql.replace(/^(?:\s+|--[^\n]*\n?|\/\*[\s\S]*?\*\/)+/, "");
38
- if (/^(grant|revoke|deny)\b/i.test(leadingTrimmed)) {
79
+ return out;
80
+ }
81
+ function assertNotPermissionStatement(significant) {
82
+ const first = significant[0];
83
+ if (first?.Kind === "word" && /^(grant|revoke|deny)$/i.test(first.Text)) {
39
84
  throw new Error("External native query rejected: permission (GRANT/REVOKE/DENY) statements are not permitted — External Data Sources are read-only.");
40
85
  }
41
- const parser = new SQLParser(sql, dialect);
42
- if (!parser.IsValid) {
86
+ }
87
+ function assertLexicalRead(significant, dialect) {
88
+ const first = significant[0];
89
+ if (first?.Kind !== "word" || !/^(select|with)$/i.test(first.Text)) {
90
+ throw new Error("External native query rejected: only a single SELECT or WITH statement is allowed for this source — refusing under uncertainty (External Data Sources are read-only).");
91
+ }
92
+ const forbidden = new Set([...dialect.Grammar.WriteStatementKeywords, ...LEXICAL_SCREEN_EXTRA_FORBIDDEN_WORDS]);
93
+ const hit = significant.find(t => t.Kind === "word" && forbidden.has(t.Text.toUpperCase()));
94
+ if (hit) {
95
+ throw new Error(`External native query rejected: "${hit.Text}" is not allowed in a read — refusing under uncertainty (External Data Sources are read-only).`);
96
+ }
97
+ }
98
+ function assertParsedRead(text, parserDialect) {
99
+ const parsed = StrictFragmentValidator.ValidateReadOnlyStatement(text, parserDialect);
100
+ if (!parsed.Parsed) {
43
101
  throw new Error("External native query rejected: SQL could not be parsed/validated as read-only — refusing under uncertainty (External Data Sources are read-only).");
44
102
  }
45
- if (parser.HasWriteStatement) {
103
+ if (parsed.HasWriteStatement) {
46
104
  throw new Error("External native query rejected: write/DDL statements are not permitted — External Data Sources are read-only.");
47
105
  }
48
- if (parser.StatementKind === "select-into") {
106
+ if (parsed.StatementKind === "select-into") {
49
107
  throw new Error("External native query rejected: SELECT ... INTO creates a table — External Data Sources are read-only.");
50
108
  }
51
- const ast = parser.AST;
52
- if (astContainsWriteNode(ast)) {
109
+ assertSingleRead(parsed.ContainsNestedWrite, parsed.IsSingleTypedStatement);
110
+ }
111
+ function assertSingleRead(containsNestedWrite, isSingleTypedStatement) {
112
+ if (containsNestedWrite) {
53
113
  throw new Error("External native query rejected: a write/DDL statement nested in a CTE or subquery is not permitted — External Data Sources are read-only.");
54
114
  }
55
- if (!isSingleTypedStatement(ast)) {
115
+ if (!isSingleTypedStatement) {
56
116
  throw new Error("External native query rejected: only a single, well-formed read statement is allowed — refusing under uncertainty (External Data Sources are read-only).");
57
117
  }
58
118
  }
119
+ export function AssertReadOnlyNativeQuery(sql, dialectKey) {
120
+ const dialect = GetScreenDialect(dialectKey);
121
+ const tokens = LexSQL(sql, dialect);
122
+ assertLexicallyUnambiguous(tokens, dialect, "External native query");
123
+ if (SQLParser.HasStackedStatements(sql, dialect)) {
124
+ throw new Error("External native query rejected: multiple statements are not allowed against a read-only external data source.");
125
+ }
126
+ const significant = SignificantTokens(tokens);
127
+ assertNotPermissionStatement(significant);
128
+ const grammar = dialect.Grammar.ParserGrammar;
129
+ if (grammar === null) {
130
+ assertLexicalRead(significant, dialect);
131
+ return;
132
+ }
133
+ assertParsedRead(grammarText(tokens, grammar), parserDialectFor(dialect, grammar));
134
+ }
59
135
  export function assertReadOnlyNativeQuery(sql, dialectKey) {
60
136
  return AssertReadOnlyNativeQuery(sql, dialectKey);
61
137
  }
62
- export function AssertReadOnlyClause(clause, dialectKey, kind) {
63
- if (/--|\/\*|\*\//.test(clause)) {
138
+ function assertClauseLexicallySafe(clause, tokens, dialect, kind) {
139
+ if (/--|\/\*|\*\//.test(clause) || tokens.some(t => t.Kind === "comment")) {
64
140
  throw new Error(`External ${kind} clause rejected: SQL comment markers are not allowed.`);
65
141
  }
66
142
  if (/;/.test(clause)) {
67
143
  throw new Error(`External ${kind} clause rejected: statement separators are not allowed.`);
68
144
  }
69
- const wrapped = kind === "where"
70
- ? `SELECT 1 FROM __mj_clause_screen WHERE (${clause})`
71
- : `SELECT 1 FROM __mj_clause_screen ORDER BY ${clause}`;
72
- const dialect = dialectFor(dialectKey);
73
- const parser = new SQLParser(wrapped, dialect);
74
- if (!parser.IsValid || parser.HasWriteStatement || parser.StatementKind !== "select") {
145
+ assertLexicallyUnambiguous(tokens, dialect, `External ${kind} clause`);
146
+ }
147
+ function assertBalancedParentheses(tokens, kind) {
148
+ let depth = 0;
149
+ for (const token of tokens) {
150
+ if (token.Kind === "open")
151
+ depth++;
152
+ if (token.Kind === "close" && --depth < 0)
153
+ break;
154
+ }
155
+ if (depth !== 0) {
156
+ throw new Error(`External ${kind} clause rejected: unbalanced parentheses — refusing under uncertainty.`);
157
+ }
158
+ }
159
+ export function AssertReadOnlyClause(clause, dialectKey, kind) {
160
+ const dialect = GetScreenDialect(dialectKey);
161
+ const tokens = LexSQL(clause, dialect);
162
+ assertClauseLexicallySafe(clause, tokens, dialect, kind);
163
+ assertBalancedParentheses(tokens, kind);
164
+ const structureDialect = dialect.Grammar.ParserGrammar === null ? GetQueryDialect(FALLBACK_CLAUSE_DIALECT) : dialect;
165
+ const grammar = structureDialect.Grammar.ParserGrammar ?? "";
166
+ const body = grammarText(tokens, grammar);
167
+ const parsed = kind === "where"
168
+ ? StrictFragmentValidator.ValidateFilter(body, parserDialectFor(structureDialect, grammar))
169
+ : StrictFragmentValidator.ValidateOrderBy(body, parserDialectFor(structureDialect, grammar));
170
+ if (!parsed.Parsed || parsed.HasWriteStatement || parsed.StatementKind !== "select") {
75
171
  throw new Error(`External ${kind} clause rejected: not a safe read-only ${kind} fragment — refusing under uncertainty.`);
76
172
  }
77
173
  }
package/dist/sqlReadOnlyScreen.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sqlReadOnlyScreen.js","sourceRoot":"","sources":["../src/sqlReadOnlyScreen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqlReadOnlyScreen.js","sourceRoot":"","sources":["../src/sqlReadOnlyScreen.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@memberjunction/external-data-sources",
3
- "version": "6.2.0-edge.6",
3
+ "version": "6.2.0-edge.7",
4
4
  "description": "MemberJunction: External Data Sources — live, runtime-proxied read access to remote data systems (Snowflake, Oracle, MongoDB, external SQL Server / PostgreSQL / MySQL) via pluggable @RegisterClass drivers.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -11,12 +11,12 @@
11
11
  "author": "MemberJunction.com",
12
12
  "license": "BUSL-1.1",
13
13
  "dependencies": {
14
- "@memberjunction/core": "6.2.0-edge.6",
15
- "@memberjunction/global": "6.2.0-edge.6",
16
- "@memberjunction/core-entities": "6.2.0-edge.6",
17
- "@memberjunction/credentials": "6.2.0-edge.6",
18
- "@memberjunction/sql-parser": "6.2.0-edge.6",
19
- "@memberjunction/sql-dialect": "6.2.0-edge.6"
14
+ "@memberjunction/core": "6.2.0-edge.7",
15
+ "@memberjunction/global": "6.2.0-edge.7",
16
+ "@memberjunction/core-entities": "6.2.0-edge.7",
17
+ "@memberjunction/credentials": "6.2.0-edge.7",
18
+ "@memberjunction/sql-parser": "6.2.0-edge.7",
19
+ "@memberjunction/sql-dialect": "6.2.0-edge.7"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@types/node": "24.10.11",