@rsdk/db.typeorm 5.14.0-next.0 → 5.14.0-next.1

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.
@@ -89,9 +89,21 @@ class TypeOrmPlugin {
89
89
  extraConnection = {};
90
90
  }
91
91
  const userOverride = (this.options.overrideConfig ?? {});
92
- const driverOverride = nativeDriver !== undefined && userOverride.driver === undefined
93
- ? { driver: nativeDriver }
94
- : {};
92
+ /**
93
+ * TypeORM PostgresDriver при установленном `pg-native` сам подменяет
94
+ * драйвер даже на одном хосте. Фиксируем JS-`pg` (без `.native`),
95
+ * чтобы применился `extra.ssl` из `DB_SSL_MODE`/`DB_TLS_*`.
96
+ * Native оставляем только если resolveDbConnection выбрал libpq-failover.
97
+ */
98
+ let driverOverride = {};
99
+ if (userOverride.driver === undefined) {
100
+ if (nativeDriver !== undefined) {
101
+ driverOverride = { driver: nativeDriver };
102
+ }
103
+ else if (isPostgresFamily) {
104
+ driverOverride = { driver: (0, db_1.loadPgJsDriver)() };
105
+ }
106
+ }
95
107
  return {
96
108
  type: this.options.type,
97
109
  ...connection,
@@ -1 +1 @@
1
- {"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":";;;;;;AAEA,6CAAgD;AAOhD,qCAAsC;AACtC,iCAKkB;AAClB,2CAA8C;AAC9C,0DAA6B;AAG7B,sDAAgE;AAChE,wDAAqD;AACrD,iFAA4E;AAC5E,6HAAqH;AACrH,2CAIqB;AACrB,6EAAuE;AAGvE,MAAa,aAAa;IAMK;IALrB,MAAM,CAAU,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAErE;;OAEG;IACH,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QACxD,yBAAW,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC;IACjC,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO;YACL,uBAAa,CAAC,YAAY,CAAC;gBACzB,OAAO,EAAE;oBACP;wBACE,MAAM,EAAE,uBAAa;wBACrB,SAAS,EAAE,CAAC,kCAAsB,EAAE,gCAAoB,CAAC;wBACzD,OAAO,EAAE,CAAC,gCAAoB,CAAC;qBAChC;iBACF;gBACD,MAAM,EAAE,CAAC,+BAAmB,EAAE,gCAAoB,EAAE,eAAQ,CAAC;gBAC7D,UAAU,EAAE,KAAK,EACf,MAA2B,EAC3B,MAA4B,EAC5B,OAAe,EACgB,EAAE;oBACjC,MAAM,GAAG,GAAG,IAAA,4BAAuB,EAAC,MAAM,CAAC,CAAC;oBAE5C;;;;uBAIG;oBACH,MAAM,gBAAgB,GACpB,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU;wBAChC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB,CAAC;oBAE1C;;;;uBAIG;oBACH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAmB,EAAC;wBACzC,GAAG,EAAE,MAAM,CAAC,GAAG;wBACf,MAAM,EAAE,aAAa,CAAC,MAAM;wBAC5B,gBAAgB;wBAChB,GAAG,CAAC,MAAM,CAAC,0BAA0B,IAAI;4BACvC,cAAc,EAAE,CAAC,SAAc,EAAiB,EAAE,CAChD,IAAA,YAAO,EAAC,SAAS,EAAE,GAAG,CAAC;yBAC1B,CAAC;qBACH,CAAC,CAAC;oBAEH,IAAI,YAAqB,CAAC;oBAC1B,IAAI,UAAmC,CAAC;oBACxC,IAAI,eAAwC,CAAC;oBAE7C,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;wBACrC,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;wBAC/B,UAAU,GAAG;4BACX,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,IAAI;4BAClC,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,IAAI;4BAClC,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;4BACzD,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;4BACzD,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;yBAC1D,CAAC;wBACF,eAAe,GAAG;4BAChB,sBAAsB,EAAE,QAAQ,CAAC,YAAY;yBAC9C,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC;wBAC9C,eAAe,GAAG,EAAE,CAAC;oBACvB,CAAC;oBAED,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAGtD,CAAC;oBAEF;;;;;uBAKG;oBACH,IAAI,cAAc,GAA4B,EAAE,CAAC;oBACjD,IAAI,YAAY,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBACtC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;4BAC/B,cAAc,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;wBAC5C,CAAC;6BAAM,IAAI,gBAAgB,EAAE,CAAC;4BAC5B,cAAc,GAAG,EAAE,MAAM,EAAE,IAAA,mBAAc,GAAE,EAAE,CAAC;wBAChD,CAAC;oBACH,CAAC;oBAED,OAAO;wBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;wBACvB,GAAG,UAAU;wBACb,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI;4BACnB,MAAM,EAAE,MAAM,CAAC,MAAM;yBACtB,CAAC;wBACF,MAAM;wBACN,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACjD,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ;wBAChC,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE;wBAC7C,aAAa,EAAE,MAAM,CAAC,iBAAiB;wBACvC,eAAe,EAAE,OAAO,GAAG,UAAU;wBACrC,KAAK,EAAE;4BACL,GAAG,EAAE,MAAM,CAAC,OAAO;4BACnB,GAAG,EAAE,MAAM,CAAC,OAAO;4BACnB,SAAS,EAAE,MAAM,CAAC,SAAS;4BAC3B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;4BACnD,GAAG;4BACH,GAAG,eAAe;yBACnB;wBACD,UAAU;wBACV,mBAAmB,EAAE,oBAAoB;wBACzC,GAAI,YAAoB;wBACxB,GAAG,cAAc;qBAClB,CAAC;gBACJ,CAAC;gBACD,iBAAiB,EAAE,CAAC,OAA2B,EAAE,EAAE;oBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,MAAM,IAAI,oCAAuB,EAAE,CAAC;oBACtC,CAAC;oBACD,OAAO,wFAAwC,CAAC,MAAM,CACpD,OAAO,CACR,CAAC,UAAU,EAAE,CAAC;gBACjB,CAAC;aACF,CAAC;YACF,iDAAsB;SACvB,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,oDAAuB,EAAE,CAAC,CAAC;IACzC,CAAC;IAEO,mBAAmB;QACzB,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,+BAA+B,CAAC,CAAC,CAAC;IACxE,CAAC;;AAvJH,sCAwJC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/db.typeorm",
3
- "version": "5.14.0-next.0",
3
+ "version": "5.14.0-next.1",
4
4
  "description": "TypeOrm module for platform",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -28,5 +28,5 @@
28
28
  "rxjs": "^7.1.0",
29
29
  "typeorm": "^0.3.12"
30
30
  },
31
- "gitHead": "c049acc6f706bc2ce1a61735ff0230cda29d3988"
31
+ "gitHead": "d659eb79bcc745bb9522ad94727806b02b091f85"
32
32
  }
@@ -10,6 +10,7 @@ import type {
10
10
  import { APP_NAME } from '@rsdk/core';
11
11
  import {
12
12
  getSecureContextOptions,
13
+ loadPgJsDriver,
13
14
  pgProbe,
14
15
  resolveDbConnection,
15
16
  } from '@rsdk/db';
@@ -119,10 +120,21 @@ export class TypeOrmPlugin implements PlatformAppPlugin {
119
120
  string,
120
121
  unknown
121
122
  >;
122
- const driverOverride =
123
- nativeDriver !== undefined && userOverride.driver === undefined
124
- ? { driver: nativeDriver }
125
- : {};
123
+
124
+ /**
125
+ * TypeORM PostgresDriver при установленном `pg-native` сам подменяет
126
+ * драйвер даже на одном хосте. Фиксируем JS-`pg` (без `.native`),
127
+ * чтобы применился `extra.ssl` из `DB_SSL_MODE`/`DB_TLS_*`.
128
+ * Native оставляем только если resolveDbConnection выбрал libpq-failover.
129
+ */
130
+ let driverOverride: Record<string, unknown> = {};
131
+ if (userOverride.driver === undefined) {
132
+ if (nativeDriver !== undefined) {
133
+ driverOverride = { driver: nativeDriver };
134
+ } else if (isPostgresFamily) {
135
+ driverOverride = { driver: loadPgJsDriver() };
136
+ }
137
+ }
126
138
 
127
139
  return {
128
140
  type: this.options.type,