af-db-ts 1.0.5 → 2.0.2

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 (173) hide show
  1. package/README.md +3 -3
  2. package/dist/cjs/__tests__/01_node_env.spec.js +7 -0
  3. package/dist/cjs/__tests__/01_node_env.spec.js.map +1 -0
  4. package/dist/cjs/__tests__/02_getValueForSqlMs.spec.js +50 -0
  5. package/dist/cjs/__tests__/02_getValueForSqlMs.spec.js.map +1 -0
  6. package/dist/cjs/__tests__/global-setup.js +7 -0
  7. package/dist/cjs/__tests__/global-setup.js.map +1 -0
  8. package/dist/cjs/__tests__/global-teardown.js +7 -0
  9. package/dist/cjs/__tests__/global-teardown.js.map +1 -0
  10. package/dist/cjs/{interfaces.js → src/@types/i-common.js} +1 -1
  11. package/dist/cjs/src/@types/i-common.js.map +1 -0
  12. package/dist/cjs/src/@types/i-config.js +3 -0
  13. package/dist/cjs/src/@types/i-config.js.map +1 -0
  14. package/dist/cjs/src/@types/i-ms.js +3 -0
  15. package/dist/cjs/src/@types/i-ms.js.map +1 -0
  16. package/dist/cjs/src/@types/i-pg.js +24 -0
  17. package/dist/cjs/src/@types/i-pg.js.map +1 -0
  18. package/dist/cjs/src/common.js +30 -0
  19. package/dist/cjs/src/common.js.map +1 -0
  20. package/dist/cjs/src/index.js +59 -0
  21. package/dist/cjs/src/index.js.map +1 -0
  22. package/dist/cjs/src/logger-error.js +10 -0
  23. package/dist/cjs/src/logger-error.js.map +1 -0
  24. package/dist/cjs/{get-value-for-sql.js → src/mssql/get-value-for-sql.js} +12 -8
  25. package/dist/cjs/src/mssql/get-value-for-sql.js.map +1 -0
  26. package/dist/cjs/{db.js → src/mssql/pool-ms.js} +73 -77
  27. package/dist/cjs/src/mssql/pool-ms.js.map +1 -0
  28. package/dist/cjs/src/mssql/query-ms.js +47 -0
  29. package/dist/cjs/src/mssql/query-ms.js.map +1 -0
  30. package/dist/cjs/{sql.js → src/mssql/sql.js} +72 -49
  31. package/dist/cjs/src/mssql/sql.js.map +1 -0
  32. package/dist/cjs/src/mssql/utils.js.map +1 -0
  33. package/dist/cjs/src/pg/get-merge-sql.js +50 -0
  34. package/dist/cjs/src/pg/get-merge-sql.js.map +1 -0
  35. package/dist/cjs/src/pg/get-update-sql.js +29 -0
  36. package/dist/cjs/src/pg/get-update-sql.js.map +1 -0
  37. package/dist/cjs/src/pg/insert.js +93 -0
  38. package/dist/cjs/src/pg/insert.js.map +1 -0
  39. package/dist/cjs/src/pg/is-table-or-view-exists.js +21 -0
  40. package/dist/cjs/src/pg/is-table-or-view-exists.js.map +1 -0
  41. package/dist/cjs/src/pg/pg-pool.js +52 -0
  42. package/dist/cjs/src/pg/pg-pool.js.map +1 -0
  43. package/dist/cjs/src/pg/prepare-value.js +84 -0
  44. package/dist/cjs/src/pg/prepare-value.js.map +1 -0
  45. package/dist/cjs/src/pg/query-pg.js +23 -0
  46. package/dist/cjs/src/pg/query-pg.js.map +1 -0
  47. package/dist/cjs/src/pg/table-schema.js +169 -0
  48. package/dist/cjs/src/pg/table-schema.js.map +1 -0
  49. package/dist/esm/src/@types/i-common.js +2 -0
  50. package/dist/esm/src/@types/i-common.js.map +1 -0
  51. package/dist/esm/src/@types/i-config.js +2 -0
  52. package/dist/esm/src/@types/i-config.js.map +1 -0
  53. package/dist/esm/src/@types/i-ms.js +2 -0
  54. package/dist/esm/src/@types/i-ms.js.map +1 -0
  55. package/dist/esm/src/@types/i-pg.js +21 -0
  56. package/dist/esm/src/@types/i-pg.js.map +1 -0
  57. package/dist/esm/src/common.js +25 -0
  58. package/dist/esm/src/common.js.map +1 -0
  59. package/dist/esm/src/index.js +15 -0
  60. package/dist/esm/src/index.js.map +1 -0
  61. package/dist/esm/src/logger-error.js +6 -0
  62. package/dist/esm/src/logger-error.js.map +1 -0
  63. package/dist/esm/{get-value-for-sql.js → src/mssql/get-value-for-sql.js} +11 -7
  64. package/dist/esm/src/mssql/get-value-for-sql.js.map +1 -0
  65. package/dist/esm/{db.js → src/mssql/pool-ms.js} +35 -62
  66. package/dist/esm/src/mssql/pool-ms.js.map +1 -0
  67. package/dist/esm/src/mssql/query-ms.js +20 -0
  68. package/dist/esm/src/mssql/query-ms.js.map +1 -0
  69. package/dist/esm/{sql.js → src/mssql/sql.js} +36 -36
  70. package/dist/esm/src/mssql/sql.js.map +1 -0
  71. package/dist/esm/src/mssql/utils.js.map +1 -0
  72. package/dist/esm/src/pg/get-merge-sql.js +46 -0
  73. package/dist/esm/src/pg/get-merge-sql.js.map +1 -0
  74. package/dist/esm/src/pg/get-update-sql.js +25 -0
  75. package/dist/esm/src/pg/get-update-sql.js.map +1 -0
  76. package/dist/esm/src/pg/insert.js +89 -0
  77. package/dist/esm/src/pg/insert.js.map +1 -0
  78. package/dist/esm/src/pg/is-table-or-view-exists.js +17 -0
  79. package/dist/esm/src/pg/is-table-or-view-exists.js.map +1 -0
  80. package/dist/esm/src/pg/pg-pool.js +43 -0
  81. package/dist/esm/src/pg/pg-pool.js.map +1 -0
  82. package/dist/esm/src/pg/prepare-value.js +79 -0
  83. package/dist/esm/src/pg/prepare-value.js.map +1 -0
  84. package/dist/esm/src/pg/query-pg.js +19 -0
  85. package/dist/esm/src/pg/query-pg.js.map +1 -0
  86. package/dist/esm/src/pg/table-schema.js +164 -0
  87. package/dist/esm/src/pg/table-schema.js.map +1 -0
  88. package/dist/types/src/@types/i-common.d.ts +35 -0
  89. package/dist/types/src/@types/i-common.d.ts.map +1 -0
  90. package/dist/types/src/@types/i-config.d.ts +60 -0
  91. package/dist/types/src/@types/i-config.d.ts.map +1 -0
  92. package/dist/types/{interfaces.d.ts → src/@types/i-ms.d.ts} +30 -77
  93. package/dist/types/src/@types/i-ms.d.ts.map +1 -0
  94. package/dist/types/src/@types/i-pg.d.ts +62 -0
  95. package/dist/types/src/@types/i-pg.d.ts.map +1 -0
  96. package/dist/types/src/common.d.ts +6 -0
  97. package/dist/types/src/common.d.ts.map +1 -0
  98. package/dist/types/src/index.d.ts +18 -0
  99. package/dist/types/src/index.d.ts.map +1 -0
  100. package/dist/types/src/logger-error.d.ts +7 -0
  101. package/dist/types/src/logger-error.d.ts.map +1 -0
  102. package/dist/types/src/mssql/get-value-for-sql.d.ts +11 -0
  103. package/dist/types/src/mssql/get-value-for-sql.d.ts.map +1 -0
  104. package/dist/types/{db.d.ts → src/mssql/pool-ms.d.ts} +18 -15
  105. package/dist/types/src/mssql/pool-ms.d.ts.map +1 -0
  106. package/dist/types/src/mssql/query-ms.d.ts +3 -0
  107. package/dist/types/src/mssql/query-ms.d.ts.map +1 -0
  108. package/dist/types/{sql.d.ts → src/mssql/sql.d.ts} +17 -16
  109. package/dist/types/src/mssql/sql.d.ts.map +1 -0
  110. package/dist/types/src/mssql/utils.d.ts.map +1 -0
  111. package/dist/types/src/pg/get-merge-sql.d.ts +9 -0
  112. package/dist/types/src/pg/get-merge-sql.d.ts.map +1 -0
  113. package/dist/types/src/pg/get-update-sql.d.ts +3 -0
  114. package/dist/types/src/pg/get-update-sql.d.ts.map +1 -0
  115. package/dist/types/src/pg/insert.d.ts +15 -0
  116. package/dist/types/src/pg/insert.d.ts.map +1 -0
  117. package/dist/types/src/pg/is-table-or-view-exists.d.ts +2 -0
  118. package/dist/types/src/pg/is-table-or-view-exists.d.ts.map +1 -0
  119. package/dist/types/src/pg/pg-pool.d.ts +6 -0
  120. package/dist/types/src/pg/pg-pool.d.ts.map +1 -0
  121. package/dist/types/src/pg/prepare-value.d.ts +7 -0
  122. package/dist/types/src/pg/prepare-value.d.ts.map +1 -0
  123. package/dist/types/src/pg/query-pg.d.ts +3 -0
  124. package/dist/types/src/pg/query-pg.d.ts.map +1 -0
  125. package/dist/types/src/pg/table-schema.d.ts +12 -0
  126. package/dist/types/src/pg/table-schema.d.ts.map +1 -0
  127. package/package.json +21 -24
  128. package/src/@types/i-common.ts +39 -0
  129. package/src/@types/i-config.ts +75 -0
  130. package/src/{interfaces.ts → @types/i-ms.ts} +29 -86
  131. package/src/@types/i-pg.ts +67 -0
  132. package/src/common.ts +26 -0
  133. package/src/index.ts +104 -42
  134. package/src/logger-error.ts +11 -0
  135. package/src/{get-value-for-sql.ts → mssql/get-value-for-sql.ts} +15 -9
  136. package/src/{db.ts → mssql/pool-ms.ts} +40 -71
  137. package/src/mssql/query-ms.ts +25 -0
  138. package/src/{sql.ts → mssql/sql.ts} +56 -59
  139. package/src/pg/get-merge-sql.ts +60 -0
  140. package/src/pg/get-update-sql.ts +31 -0
  141. package/src/pg/insert.ts +118 -0
  142. package/src/pg/is-table-or-view-exists.ts +21 -0
  143. package/src/pg/pg-pool.ts +49 -0
  144. package/src/pg/prepare-value.ts +90 -0
  145. package/src/pg/query-pg.ts +26 -0
  146. package/src/pg/table-schema.ts +178 -0
  147. package/dist/cjs/db.js.map +0 -1
  148. package/dist/cjs/get-value-for-sql.js.map +0 -1
  149. package/dist/cjs/index.js +0 -21
  150. package/dist/cjs/index.js.map +0 -1
  151. package/dist/cjs/interfaces.js.map +0 -1
  152. package/dist/cjs/sql.js.map +0 -1
  153. package/dist/cjs/utils.js.map +0 -1
  154. package/dist/esm/db.js.map +0 -1
  155. package/dist/esm/get-value-for-sql.js.map +0 -1
  156. package/dist/esm/index.js +0 -4
  157. package/dist/esm/index.js.map +0 -1
  158. package/dist/esm/interfaces.js +0 -2
  159. package/dist/esm/interfaces.js.map +0 -1
  160. package/dist/esm/sql.js.map +0 -1
  161. package/dist/esm/utils.js.map +0 -1
  162. package/dist/types/db.d.ts.map +0 -1
  163. package/dist/types/get-value-for-sql.d.ts +0 -7
  164. package/dist/types/get-value-for-sql.d.ts.map +0 -1
  165. package/dist/types/index.d.ts +0 -5
  166. package/dist/types/index.d.ts.map +0 -1
  167. package/dist/types/interfaces.d.ts.map +0 -1
  168. package/dist/types/sql.d.ts.map +0 -1
  169. package/dist/types/utils.d.ts.map +0 -1
  170. /package/dist/cjs/{utils.js → src/mssql/utils.js} +0 -0
  171. /package/dist/esm/{utils.js → src/mssql/utils.js} +0 -0
  172. /package/dist/types/{utils.d.ts → src/mssql/utils.d.ts} +0 -0
  173. /package/src/{utils.ts → mssql/utils.ts} +0 -0
package/README.md CHANGED
@@ -1,3 +1,3 @@
1
- ### Not of interest to third party users
2
-
3
-
1
+ ### Not of interest to third party users
2
+
3
+
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ describe('Testing environment should be set properly', () => {
3
+ it('NODE_ENV should be "testing"', () => {
4
+ expect(process.env.NODE_ENV).toBe('test');
5
+ });
6
+ });
7
+ //# sourceMappingURL=01_node_env.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"01_node_env.spec.js","sourceRoot":"","sources":["../../../__tests__/01_node_env.spec.ts"],"names":[],"mappings":";AAAA,QAAQ,CAAC,4CAA4C,EAAE,GAAG,EAAE;IAC1D,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -0,0 +1,50 @@
1
+ "use strict";
2
+ /* eslint-disable max-len */
3
+ /* eslint-disable no-console */
4
+ Object.defineProperty(exports, "__esModule", { value: true });
5
+ // "America/Toronto" -05:00
6
+ // "Europe/Berlin" +01:00
7
+ // "Europe/Moscow" +03:00
8
+ const src_1 = require("../src");
9
+ describe('sql.getValueForSqlMs() should work properly', () => {
10
+ describe('should parse date properly', () => {
11
+ const testArr = [
12
+ ['2000-01-22T11:59:59.123', '2000-01-22T11:59:59.123'],
13
+ ['2000-01-22T11:59:59.12', '2000-01-22T11:59:59.120'],
14
+ ['2000-01-22T11:59:59', '2000-01-22T11:59:59.000'],
15
+ ['2000-01-22T11:59', '2000-01-22T11:59:00.000'],
16
+ ['2000-01-22 11:59:59.123', '2000-01-22T11:59:59.123'],
17
+ ['2000-01-22 11:59:59.12', '2000-01-22T11:59:59.120'],
18
+ ['2000-01-22 11:59:59.1', '2000-01-22T11:59:59.100'],
19
+ ['2000-01-22 11:59:59', '2000-01-22T11:59:59.000'],
20
+ ['2000-01-22 11:59', '2000-01-22T11:59:00.000'],
21
+ ['2000-01-22 11:2', '2000-01-22T11:02:00.000'],
22
+ ['2000-01-22 2:2', '2000-01-22T02:02:00.000'],
23
+ ['2000-1-2 02:02', '2000-01-02T02:02:00.000'],
24
+ ['2019-8-9 5:16:14 AM', '2019-08-09T05:16:14.000'],
25
+ ['2019-8-9 5:16:14 PM', '2019-08-09T17:16:14.000'],
26
+ ];
27
+ testArr.forEach((pair) => {
28
+ test(`- like '${pair[0]}'`, () => {
29
+ const dateStrOut = (0, src_1.getValueForSqlMs)({ value: pair[0], fieldSchema: 'datetime' });
30
+ expect(dateStrOut).toBe(`'${pair[1]}'`);
31
+ });
32
+ });
33
+ });
34
+ describe('should work with timezone properly', () => {
35
+ describe('should parse date properly', () => {
36
+ const testArr = [
37
+ ['2000-01-22T11:59:59.123Z', '2000-01-22T14:59:59.123'],
38
+ ['2000-01-22T11:59:59.123+0300', '2000-01-22T11:59:59.123'],
39
+ ['Thu Aug 08 2019 05:16:14 GMT+0300 (GMT+03:00)', '2019-08-08T05:16:14.000'],
40
+ ];
41
+ testArr.forEach((pair) => {
42
+ test(`- like '${pair[0]}'`, () => {
43
+ const dateStrOut = (0, src_1.getValueForSqlMs)({ value: pair[0], fieldSchema: 'datetime' });
44
+ expect(dateStrOut).toBe(`'${pair[1]}'`);
45
+ });
46
+ });
47
+ });
48
+ });
49
+ });
50
+ //# sourceMappingURL=02_getValueForSqlMs.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"02_getValueForSqlMs.spec.js","sourceRoot":"","sources":["../../../__tests__/02_getValueForSqlMs.spec.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,+BAA+B;;AAE/B,4BAA4B;AAC5B,4BAA4B;AAC5B,4BAA4B;AAE5B,gCAA0C;AAE1C,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;IAC3D,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG;YACd,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;YACtD,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;YACrD,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;YAClD,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;YAC/C,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;YACtD,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;YACrD,CAAC,uBAAuB,EAAE,yBAAyB,CAAC;YACpD,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;YAClD,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;YAC/C,CAAC,iBAAiB,EAAE,yBAAyB,CAAC;YAC9C,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;YAC7C,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;YAC7C,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;YAClD,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;SACnD,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACvB,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE;gBAC/B,MAAM,UAAU,GAAG,IAAA,sBAAgB,EAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;gBACjF,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAClD,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;YAC1C,MAAM,OAAO,GAAG;gBACd,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;gBACvD,CAAC,8BAA8B,EAAE,yBAAyB,CAAC;gBAC3D,CAAC,+CAA+C,EAAE,yBAAyB,CAAC;aAC7E,CAAC;YACF,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvB,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC/B,MAAM,UAAU,GAAG,IAAA,sBAAgB,EAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;oBACjF,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const setup = async () => {
4
+ process.env.NODE_ENV = 'test';
5
+ };
6
+ exports.default = setup;
7
+ //# sourceMappingURL=global-setup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"global-setup.js","sourceRoot":"","sources":["../../../__tests__/global-setup.ts"],"names":[],"mappings":";;AAAA,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;AAChC,CAAC,CAAC;AAEF,kBAAe,KAAK,CAAC"}
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const teardown = async () => {
4
+ //
5
+ };
6
+ exports.default = teardown;
7
+ //# sourceMappingURL=global-teardown.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"global-teardown.js","sourceRoot":"","sources":["../../../__tests__/global-teardown.ts"],"names":[],"mappings":";;AAAA,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;IAC1B,EAAE;AACJ,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=interfaces.js.map
3
+ //# sourceMappingURL=i-common.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"i-common.js","sourceRoot":"","sources":["../../../../src/@types/i-common.ts"],"names":[],"mappings":""}
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=i-config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"i-config.js","sourceRoot":"","sources":["../../../../src/@types/i-config.ts"],"names":[],"mappings":""}
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=i-ms.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"i-ms.js","sourceRoot":"","sources":["../../../../src/@types/i-ms.ts"],"names":[],"mappings":""}
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EDataTypePg = void 0;
4
+ var EDataTypePg;
5
+ (function (EDataTypePg) {
6
+ EDataTypePg["USER_DEFINED"] = "USER-DEFINED";
7
+ EDataTypePg["bigint"] = "bigint";
8
+ EDataTypePg["boolean"] = "boolean";
9
+ EDataTypePg["character"] = "character";
10
+ EDataTypePg["varchar"] = "character varying";
11
+ EDataTypePg["date"] = "date";
12
+ EDataTypePg["integer"] = "integer";
13
+ EDataTypePg["json"] = "json";
14
+ EDataTypePg["jsonb"] = "jsonb";
15
+ EDataTypePg["numeric"] = "numeric";
16
+ EDataTypePg["real"] = "real";
17
+ EDataTypePg["smallint"] = "smallint";
18
+ EDataTypePg["text"] = "text";
19
+ EDataTypePg["timestamptz"] = "timestamp with time zone";
20
+ EDataTypePg["timestamp"] = "timestamp without time zone";
21
+ EDataTypePg["uuid"] = "uuid";
22
+ EDataTypePg["ARRAY"] = "ARRAY";
23
+ })(EDataTypePg || (exports.EDataTypePg = EDataTypePg = {}));
24
+ //# sourceMappingURL=i-pg.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"i-pg.js","sourceRoot":"","sources":["../../../../src/@types/i-pg.ts"],"names":[],"mappings":";;;AAEA,IAAY,WAkBX;AAlBD,WAAY,WAAW;IACrB,4CAA+B,CAAA;IAC/B,gCAAmB,CAAA;IACnB,kCAAqB,CAAA;IACrB,sCAAyB,CAAA;IACzB,4CAA+B,CAAA;IAC/B,4BAAe,CAAA;IACf,kCAAqB,CAAA;IACrB,4BAAe,CAAA;IACf,8BAAiB,CAAA;IACjB,kCAAqB,CAAA;IACrB,4BAAe,CAAA;IACf,oCAAuB,CAAA;IACvB,4BAAe,CAAA;IACf,uDAA0C,CAAA;IAC1C,wDAA2C,CAAA;IAC3C,4BAAe,CAAA;IACf,8BAAiB,CAAA;AACnB,CAAC,EAlBW,WAAW,2BAAX,WAAW,QAkBtB"}
@@ -0,0 +1,30 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.graceExit = exports.logSqlError = void 0;
4
+ const af_color_1 = require("af-color");
5
+ const pg_pool_1 = require("./pg/pg-pool");
6
+ const pool_ms_1 = require("./mssql/pool-ms");
7
+ const logger_error_1 = require("./logger-error");
8
+ const logSqlError = (err, throwError, textSQL, prefix) => {
9
+ if (prefix) {
10
+ logger_error_1.logger.error(prefix);
11
+ }
12
+ if (textSQL) {
13
+ logger_error_1.logger.error(`SQL Error:\n${af_color_1.magenta}${textSQL}`);
14
+ }
15
+ logger_error_1.logger.error(err);
16
+ if (throwError) {
17
+ throw err;
18
+ }
19
+ };
20
+ exports.logSqlError = logSqlError;
21
+ /**
22
+ * Закрывает все соединения с БД и завершает работу скрипта
23
+ */
24
+ const graceExit = async () => {
25
+ await (0, pg_pool_1.closeAllPgConnectionsPg)();
26
+ await (0, pool_ms_1.closeAllDbConnectionsMs)();
27
+ process.exit(0);
28
+ };
29
+ exports.graceExit = graceExit;
30
+ //# sourceMappingURL=common.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/common.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,0CAAuD;AACvD,6CAA0D;AAC1D,iDAAwC;AAEjC,MAAM,WAAW,GAAG,CAAC,GAAgB,EAAE,UAAoB,EAAE,OAAgB,EAAE,MAAe,EAAE,EAAE;IACvG,IAAI,MAAM,EAAE;QACV,qBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACtB;IACD,IAAI,OAAO,EAAE;QACX,qBAAM,CAAC,KAAK,CAAC,eAAe,kBAAO,GAAG,OAAO,EAAE,CAAC,CAAC;KAClD;IACD,qBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,IAAI,UAAU,EAAE;QACd,MAAM,GAAG,CAAC;KACX;AACH,CAAC,CAAC;AAXW,QAAA,WAAW,eAWtB;AAEF;;GAEG;AACI,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAClC,MAAM,IAAA,iCAAuB,GAAE,CAAC;IAChC,MAAM,IAAA,iCAAuB,GAAE,CAAC;IAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB"}
@@ -0,0 +1,59 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getTableSchemaPg = exports.getFieldsAndValuesPg = exports.queryPg = exports.prepareSqlValuePg = exports.prepareSqlStringPg = exports.closeAllPgConnectionsPg = exports.closePoolPg = exports.getPoolPg = exports.poolsCachePg = exports.isTableOrViewExistsPg = exports.EUpdateLevel = exports.insertPg = exports.getUpdateSqlPg = exports.getMergeSqlPg = exports.mssqlEscape = exports.sql = exports.getRowsAffectedMs = exports.prepareDataForSqlMs = exports.prepareRecordForSqlMs = exports.getSqlValuesExpressionMs = exports.getSqlSetExpressionMs = exports.getRecordValuesForSqlMs = exports.serializeMs = exports.wrapTransactionMs = exports.getRecordSchemaMs = exports.correctRecordSchemaMs = exports.prepareSqlStringMs = exports.queryMs = exports.closeDbConnectionsAndExit = exports.closeAllDbConnections = exports.poolsCacheMs = exports.getPoolMs = exports.getDbConfigMs = exports.closeDbConnectionsMs = exports.closeDbConnectionsAndExitMs = exports.closeAllDbConnectionsMs = exports.getPoolConnectionMs = exports.getValueForSQL = exports.binToHexString = exports.getValueForSqlMs = exports.EDataTypePg = void 0;
4
+ var i_pg_1 = require("./@types/i-pg");
5
+ Object.defineProperty(exports, "EDataTypePg", { enumerable: true, get: function () { return i_pg_1.EDataTypePg; } });
6
+ var get_value_for_sql_1 = require("./mssql/get-value-for-sql");
7
+ Object.defineProperty(exports, "getValueForSqlMs", { enumerable: true, get: function () { return get_value_for_sql_1.getValueForSqlMs; } });
8
+ Object.defineProperty(exports, "binToHexString", { enumerable: true, get: function () { return get_value_for_sql_1.binToHexString; } });
9
+ Object.defineProperty(exports, "getValueForSQL", { enumerable: true, get: function () { return get_value_for_sql_1.getValueForSQL; } });
10
+ var pool_ms_1 = require("./mssql/pool-ms");
11
+ Object.defineProperty(exports, "getPoolConnectionMs", { enumerable: true, get: function () { return pool_ms_1.getPoolConnectionMs; } });
12
+ Object.defineProperty(exports, "closeAllDbConnectionsMs", { enumerable: true, get: function () { return pool_ms_1.closeAllDbConnectionsMs; } });
13
+ Object.defineProperty(exports, "closeDbConnectionsAndExitMs", { enumerable: true, get: function () { return pool_ms_1.closeDbConnectionsAndExitMs; } });
14
+ Object.defineProperty(exports, "closeDbConnectionsMs", { enumerable: true, get: function () { return pool_ms_1.closeDbConnectionsMs; } });
15
+ Object.defineProperty(exports, "getDbConfigMs", { enumerable: true, get: function () { return pool_ms_1.getDbConfigMs; } });
16
+ Object.defineProperty(exports, "getPoolMs", { enumerable: true, get: function () { return pool_ms_1.getPoolMs; } });
17
+ Object.defineProperty(exports, "poolsCacheMs", { enumerable: true, get: function () { return pool_ms_1.poolsCacheMs; } });
18
+ Object.defineProperty(exports, "closeAllDbConnections", { enumerable: true, get: function () { return pool_ms_1.closeAllDbConnections; } });
19
+ Object.defineProperty(exports, "closeDbConnectionsAndExit", { enumerable: true, get: function () { return pool_ms_1.closeDbConnectionsAndExit; } });
20
+ var query_ms_1 = require("./mssql/query-ms");
21
+ Object.defineProperty(exports, "queryMs", { enumerable: true, get: function () { return query_ms_1.queryMs; } });
22
+ var sql_1 = require("./mssql/sql");
23
+ Object.defineProperty(exports, "prepareSqlStringMs", { enumerable: true, get: function () { return sql_1.prepareSqlStringMs; } });
24
+ Object.defineProperty(exports, "correctRecordSchemaMs", { enumerable: true, get: function () { return sql_1.correctRecordSchemaMs; } });
25
+ Object.defineProperty(exports, "getRecordSchemaMs", { enumerable: true, get: function () { return sql_1.getRecordSchemaMs; } });
26
+ Object.defineProperty(exports, "wrapTransactionMs", { enumerable: true, get: function () { return sql_1.wrapTransactionMs; } });
27
+ Object.defineProperty(exports, "serializeMs", { enumerable: true, get: function () { return sql_1.serializeMs; } });
28
+ Object.defineProperty(exports, "getRecordValuesForSqlMs", { enumerable: true, get: function () { return sql_1.getRecordValuesForSqlMs; } });
29
+ Object.defineProperty(exports, "getSqlSetExpressionMs", { enumerable: true, get: function () { return sql_1.getSqlSetExpressionMs; } });
30
+ Object.defineProperty(exports, "getSqlValuesExpressionMs", { enumerable: true, get: function () { return sql_1.getSqlValuesExpressionMs; } });
31
+ Object.defineProperty(exports, "prepareRecordForSqlMs", { enumerable: true, get: function () { return sql_1.prepareRecordForSqlMs; } });
32
+ Object.defineProperty(exports, "prepareDataForSqlMs", { enumerable: true, get: function () { return sql_1.prepareDataForSqlMs; } });
33
+ Object.defineProperty(exports, "getRowsAffectedMs", { enumerable: true, get: function () { return sql_1.getRowsAffectedMs; } });
34
+ Object.defineProperty(exports, "sql", { enumerable: true, get: function () { return sql_1.sql; } });
35
+ var utils_1 = require("./mssql/utils");
36
+ Object.defineProperty(exports, "mssqlEscape", { enumerable: true, get: function () { return utils_1.mssqlEscape; } });
37
+ var get_merge_sql_1 = require("./pg/get-merge-sql");
38
+ Object.defineProperty(exports, "getMergeSqlPg", { enumerable: true, get: function () { return get_merge_sql_1.getMergeSqlPg; } });
39
+ var get_update_sql_1 = require("./pg/get-update-sql");
40
+ Object.defineProperty(exports, "getUpdateSqlPg", { enumerable: true, get: function () { return get_update_sql_1.getUpdateSqlPg; } });
41
+ var insert_1 = require("./pg/insert");
42
+ Object.defineProperty(exports, "insertPg", { enumerable: true, get: function () { return insert_1.insertPg; } });
43
+ Object.defineProperty(exports, "EUpdateLevel", { enumerable: true, get: function () { return insert_1.EUpdateLevel; } });
44
+ var is_table_or_view_exists_1 = require("./pg/is-table-or-view-exists");
45
+ Object.defineProperty(exports, "isTableOrViewExistsPg", { enumerable: true, get: function () { return is_table_or_view_exists_1.isTableOrViewExistsPg; } });
46
+ var pg_pool_1 = require("./pg/pg-pool");
47
+ Object.defineProperty(exports, "poolsCachePg", { enumerable: true, get: function () { return pg_pool_1.poolsCachePg; } });
48
+ Object.defineProperty(exports, "getPoolPg", { enumerable: true, get: function () { return pg_pool_1.getPoolPg; } });
49
+ Object.defineProperty(exports, "closePoolPg", { enumerable: true, get: function () { return pg_pool_1.closePoolPg; } });
50
+ Object.defineProperty(exports, "closeAllPgConnectionsPg", { enumerable: true, get: function () { return pg_pool_1.closeAllPgConnectionsPg; } });
51
+ var prepare_value_1 = require("./pg/prepare-value");
52
+ Object.defineProperty(exports, "prepareSqlStringPg", { enumerable: true, get: function () { return prepare_value_1.prepareSqlStringPg; } });
53
+ Object.defineProperty(exports, "prepareSqlValuePg", { enumerable: true, get: function () { return prepare_value_1.prepareSqlValuePg; } });
54
+ var query_pg_1 = require("./pg/query-pg");
55
+ Object.defineProperty(exports, "queryPg", { enumerable: true, get: function () { return query_pg_1.queryPg; } });
56
+ var table_schema_1 = require("./pg/table-schema");
57
+ Object.defineProperty(exports, "getFieldsAndValuesPg", { enumerable: true, get: function () { return table_schema_1.getFieldsAndValuesPg; } });
58
+ Object.defineProperty(exports, "getTableSchemaPg", { enumerable: true, get: function () { return table_schema_1.getTableSchemaPg; } });
59
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;AA0CA,sCASuB;AALrB,mGAAA,WAAW,OAAA;AAOb,+DAImC;AAHjC,qHAAA,gBAAgB,OAAA;AAChB,mHAAA,cAAc,OAAA;AACd,mHAAA,cAAc,OAAA;AAGhB,2CAUyB;AATvB,8GAAA,mBAAmB,OAAA;AACnB,kHAAA,uBAAuB,OAAA;AACvB,sHAAA,2BAA2B,OAAA;AAC3B,+GAAA,oBAAoB,OAAA;AACpB,wGAAA,aAAa,OAAA;AACb,oGAAA,SAAS,OAAA;AACT,uGAAA,YAAY,OAAA;AACZ,gHAAA,qBAAqB,OAAA;AACrB,oHAAA,yBAAyB,OAAA;AAG3B,6CAA2C;AAAlC,mGAAA,OAAO,OAAA;AAEhB,mCAaqB;AAZnB,yGAAA,kBAAkB,OAAA;AAClB,4GAAA,qBAAqB,OAAA;AACrB,wGAAA,iBAAiB,OAAA;AACjB,wGAAA,iBAAiB,OAAA;AACjB,kGAAA,WAAW,OAAA;AACX,8GAAA,uBAAuB,OAAA;AACvB,4GAAA,qBAAqB,OAAA;AACrB,+GAAA,wBAAwB,OAAA;AACxB,4GAAA,qBAAqB,OAAA;AACrB,0GAAA,mBAAmB,OAAA;AACnB,wGAAA,iBAAiB,OAAA;AACjB,0FAAA,GAAG,OAAA;AAGL,uCAA4C;AAAnC,oGAAA,WAAW,OAAA;AAEpB,oDAAmD;AAA1C,8GAAA,aAAa,OAAA;AAEtB,sDAAqD;AAA5C,gHAAA,cAAc,OAAA;AAEvB,sCAAqD;AAA5C,kGAAA,QAAQ,OAAA;AAAE,sGAAA,YAAY,OAAA;AAE/B,wEAAqE;AAA5D,gIAAA,qBAAqB,OAAA;AAE9B,wCAKsB;AAJpB,uGAAA,YAAY,OAAA;AACZ,oGAAA,SAAS,OAAA;AACT,sGAAA,WAAW,OAAA;AACX,kHAAA,uBAAuB,OAAA;AAGzB,oDAA2E;AAAlE,mHAAA,kBAAkB,OAAA;AAAE,kHAAA,iBAAiB,OAAA;AAE9C,0CAAwC;AAA/B,mGAAA,OAAO,OAAA;AAEhB,kDAA2E;AAAlE,oHAAA,oBAAoB,OAAA;AAAE,gHAAA,gBAAgB,OAAA"}
@@ -0,0 +1,10 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.setLogger = exports.logger = void 0;
4
+ const af_echo_ts_1 = require("af-echo-ts");
5
+ exports.logger = af_echo_ts_1.echo;
6
+ const setLogger = (logger_) => {
7
+ exports.logger.error = logger_.error.bind(logger_);
8
+ };
9
+ exports.setLogger = setLogger;
10
+ //# sourceMappingURL=logger-error.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger-error.js","sourceRoot":"","sources":["../../../src/logger-error.ts"],"names":[],"mappings":";;;AAAA,2CAAkC;AAMrB,QAAA,MAAM,GAAc,iBAAiB,CAAC;AAE5C,MAAM,SAAS,GAAG,CAAC,OAAY,EAAE,EAAE;IACxC,cAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getValueForSQL = exports.binToHexString = void 0;
3
+ exports.getValueForSQL = exports.getValueForSqlMs = exports.binToHexString = void 0;
4
4
  const luxon_1 = require("luxon");
5
5
  const af_tools_ts_1 = require("af-tools-ts");
6
6
  const sql_1 = require("./sql");
@@ -151,7 +151,7 @@ const array = (args) => {
151
151
  /**
152
152
  * Возвращает значение, готовое для использования в строке SQL запроса
153
153
  */
154
- const getValueForSQL = (args) => {
154
+ const getValueForSqlMs = (args) => {
155
155
  let { value, fieldSchema, escapeOnlySingleQuotes } = args;
156
156
  const { dateTimeOptions, needValidate } = args;
157
157
  if (typeof fieldSchema === 'string') {
@@ -177,7 +177,7 @@ const getValueForSQL = (args) => {
177
177
  if (Array.isArray(value) || typeof value === 'object') {
178
178
  value = JSON.stringify(value);
179
179
  }
180
- return (0, sql_1.prepareSqlString)({ ...prepareSqlStringArgs, value });
180
+ return (0, sql_1.prepareSqlStringMs)({ ...prepareSqlStringArgs, value });
181
181
  case 'string':
182
182
  case sql_1.sql.Char:
183
183
  case sql_1.sql.NChar:
@@ -186,7 +186,7 @@ const getValueForSQL = (args) => {
186
186
  case sql_1.sql.VarChar:
187
187
  case sql_1.sql.NVarChar:
188
188
  case sql_1.sql.Xml:
189
- return (0, sql_1.prepareSqlString)(prepareSqlStringArgs);
189
+ return (0, sql_1.prepareSqlStringMs)(prepareSqlStringArgs);
190
190
  case 'uid':
191
191
  case 'uuid':
192
192
  case 'uniqueIdentifier':
@@ -197,7 +197,7 @@ const getValueForSQL = (args) => {
197
197
  else {
198
198
  value = value.substring(0, 36).toUpperCase();
199
199
  }
200
- return (0, sql_1.prepareSqlString)({ ...prepareSqlStringArgs, value, length: 0 });
200
+ return (0, sql_1.prepareSqlStringMs)({ ...prepareSqlStringArgs, value, length: 0 });
201
201
  case 'datetime':
202
202
  case 'date':
203
203
  case 'time':
@@ -259,15 +259,19 @@ const getValueForSQL = (args) => {
259
259
  case sql_1.sql.Geography:
260
260
  case sql_1.sql.Geometry:
261
261
  case sql_1.sql.Variant:
262
- return (0, sql_1.prepareSqlString)(prepareSqlStringArgs);
262
+ return (0, sql_1.prepareSqlStringMs)(prepareSqlStringArgs);
263
263
  case 'array': {
264
264
  return array({
265
265
  value, defaultValue, type, arrayType, fieldName, nullable, needValidate,
266
266
  });
267
267
  }
268
268
  default:
269
- return (0, sql_1.prepareSqlString)(prepareSqlStringArgs);
269
+ return (0, sql_1.prepareSqlStringMs)(prepareSqlStringArgs);
270
270
  }
271
271
  };
272
- exports.getValueForSQL = getValueForSQL;
272
+ exports.getValueForSqlMs = getValueForSqlMs;
273
+ /**
274
+ * @deprecated since version 2.0.0
275
+ */
276
+ exports.getValueForSQL = exports.getValueForSqlMs;
273
277
  //# sourceMappingURL=get-value-for-sql.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-value-for-sql.js","sourceRoot":"","sources":["../../../../src/mssql/get-value-for-sql.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,6CAA0C;AAC1C,+BAAgD;AAChD,mCAAyC;AAIlC,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAA1F,QAAA,cAAc,kBAA4E;AAEvG,MAAM,kBAAkB,GAAG,CAAC,CAAM,EAAsE,EAAE;IACxG,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC;IACtB,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,EAAE;QAC5B,OAAO,MAAM,CAAC;KACf;IACD,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,eAAe,EAAE;YACzD,OAAO,MAAM,CAAC;SACf;QACD,IAAI,CAAC,CAAC,eAAe,EAAE;YACrB,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,CAAC,CAAC,gBAAgB,EAAE;YACtB,OAAO,QAAQ,CAAC;SACjB;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAStB,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IACrC,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC5D,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,MAAM,CAAC;SACf;QACD,OAAO,CAAC,YAAY,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACxE;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE;QAC3D,uBAAuB;QACvB,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,4BAA4B,GAAG,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;KACjG;IACD,OAAO,GAAG,GAAG,EAAE,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CACf,IAQC,EACc,EAAE;IACjB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAChF,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;IAErB,IAAI,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,qEAAqE;IAEhH,IAAI,SAAS,KAAK,MAAM,EAAE;QACxB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,MAAM,CAAC;SACf;QACD,SAAS,GAAG,QAAQ,CAAC;QACrB,GAAG,GAAG,CAAC,CAAC;KACT;SAAM,IAAI,SAAS,KAAK,KAAK,EAAE;QAC9B,SAAS,GAAG,QAAQ,CAAC;QACrB,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;KACrB;IACD,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,MAAM,GAAG,GAAG,CAAC;YACb,MAAM;QACR,KAAK,MAAM;YACT,MAAM,GAAG,CAAC,GAAG,CAAC;YACd,MAAM;QACR,KAAK,OAAO;YACV,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM;QACR,KAAK,QAAQ;YACX,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM;QACR,mBAAmB;QACnB,OAAO,CAAC,CAAC;YACP,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,GAAG,CAAC,eAAe;gBACvB,CAAC,CAAC,gBAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,eAAe,EAAE,eAAe,CAAC;gBAC5D,CAAC,CAAC,gBAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACvD,MAAM;SACP;KACF;IACD,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,KAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,gBAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAElH,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,SAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,SAAG,CAAC,SAAS;YAChB,OAAO,IAAA,SAAC,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,0BAA0B;QACjG,KAAK,MAAM,CAAC;QACZ,KAAK,SAAG,CAAC,IAAI;YACX,OAAO,IAAA,SAAC,EAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe;QACrF,KAAK,MAAM,CAAC;QACZ,KAAK,SAAG,CAAC,IAAI;YACX,OAAO,IAAA,SAAC,EAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa;QAChE,KAAK,SAAG,CAAC,aAAa;YACpB,OAAO,IAAA,SAAC,EAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,sBAAsB;QAC/F,KAAK,SAAG,CAAC,cAAc,CAAC,CAAC,EAAE,YAAY;YACrC,MAAM,QAAQ,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC3C,MAAM,EAAE,GAAG,mBAAmB,CAAC;YAC/B,IAAI,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;YAC1D,IAAI,CAAC,QAAQ,EAAE;gBACb,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;aAC/B;iBAAM;gBACL,GAAG,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC3C,IAAI,CAAC,EAAE,WAAW,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC/C,IAAI,YAAY,GAAG,UAAU,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC;gBACpD,YAAY,GAAG,IAAA,gBAAE,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;gBAC1C,WAAW,GAAG,CAAC,GAAG,YAAY,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC;gBACpE,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC;aAC1C;YACD,OAAO,IAAA,SAAC,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACzB;QACD;YACE,OAAO,IAAA,SAAC,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,0BAA0B;KAClG;AACH,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,CACZ,IAQC,EACc,EAAE;IACjB,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IACzF,IAAI,GAAG,GAAU,EAAE,CAAC;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE;QACxC,QAAQ,SAAS,EAAE;YACjB,KAAK,KAAK,CAAC;YACX,KAAK,SAAS;gBACZ,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC;oBACnC,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS;iBACpG,CAAC,CAAC,CAAC;gBACJ,MAAM;YACR,SAAS,kBAAkB;gBACzB,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACpB,IAAI,CAAC,KAAK,EAAE,EAAE;wBACZ,OAAO,CAAC,CAAC;qBACV;oBACD,IAAI,CAAC,IAAI,IAAI,EAAE;wBACb,OAAO,IAAI,CAAC;qBACb;oBACD,OAAO,IAAA,mBAAW,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpC,CAAC,CAAC;qBACC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;qBACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxB,MAAM;SACT;KACF;IACD,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC5B;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAA2B,EAA0B,EAAE;IACtF,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;IAC1D,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC/C,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACnC,WAAW,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;KACrC;IACD,MAAM,EACJ,IAAI,EACJ,SAAS,EACT,MAAM,GAAG,CAAC,EACV,KAAK,EACL,QAAQ,GAAG,IAAI,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,GAAG,KAAK,EAChB,IAAI,EAAE,SAAS,GAAG,SAAS,GAC5B,GAAG,WAAW,CAAC;IAChB,IAAI,GAAG,CAAC;IACR,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IAE1C,IAAI,sBAAsB,IAAI,IAAI,EAAE;QAClC,CAAC,EAAE,sBAAsB,EAAE,GAAG,WAAW,CAAC,CAAC;KAC5C;IACD,IAAI,sBAAsB,IAAI,IAAI,EAAE;QAClC,sBAAsB,GAAG,KAAK,CAAC;KAChC;IAED,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,MAAM,GAAG,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC;QACjF,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS;KAC/E,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAA4B;QACpD,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,sBAAsB;KACxE,CAAC;IACF,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM;YACT,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACrD,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aAC/B;YACD,OAAO,IAAA,wBAAkB,EAAC,EAAE,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEhE,KAAK,QAAQ,CAAC;QACd,KAAK,SAAG,CAAC,IAAI,CAAC;QACd,KAAK,SAAG,CAAC,KAAK,CAAC;QACf,KAAK,SAAG,CAAC,IAAI,CAAC;QACd,KAAK,SAAG,CAAC,KAAK,CAAC;QACf,KAAK,SAAG,CAAC,OAAO,CAAC;QACjB,KAAK,SAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,SAAG,CAAC,GAAG;YACV,OAAO,IAAA,wBAAkB,EAAC,oBAAoB,CAAC,CAAC;QAElD,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,kBAAkB,CAAC;QACxB,KAAK,SAAG,CAAC,gBAAgB;YACvB,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAChG,KAAK,GAAG,IAAI,CAAC;aACd;iBAAM;gBACL,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;aAC9C;YACD,OAAO,IAAA,wBAAkB,EAAC,EAAE,GAAG,oBAAoB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE3E,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,SAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,SAAG,CAAC,SAAS,CAAC;QACnB,KAAK,SAAG,CAAC,IAAI,CAAC;QACd,KAAK,SAAG,CAAC,IAAI,CAAC;QACd,KAAK,SAAG,CAAC,aAAa,CAAC;QACvB,KAAK,SAAG,CAAC,cAAc;YACrB,OAAO,QAAQ,CAAC;gBACd,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,KAAK;aACzE,CAAC,CAAC;QACL,KAAK,SAAS,CAAC;QACf,KAAK,SAAG,CAAC,GAAG,CAAC,CAAC;YACZ,GAAG,GAAG,IAAA,qBAAO,EAAC,KAAK,CAAC,CAAC;YACrB,IAAI,WAAW,EAAE;gBACf,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;aAC/B;YACD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;SACxB;QAED,KAAK,SAAG,CAAC,OAAO;YACd,OAAO,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAChC,KAAK,UAAU,CAAC;QAChB,KAAK,SAAG,CAAC,QAAQ;YACf,OAAO,cAAc,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACvC,KAAK,KAAK,CAAC;QACX,KAAK,SAAG,CAAC,GAAG,CAAC;QACb,KAAK,SAAS;YACZ,OAAO,cAAc,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACjD,KAAK,SAAG,CAAC,MAAM;YACb,gDAAgD;YAChD,OAAO,cAAc,CAAC,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;QACnE,KAAK,QAAQ,CAAC;QACd,KAAK,SAAG,CAAC,OAAO,CAAC;QACjB,KAAK,SAAG,CAAC,KAAK,CAAC;QACf,KAAK,SAAG,CAAC,KAAK,CAAC;QACf,KAAK,SAAG,CAAC,OAAO,CAAC;QACjB,KAAK,SAAG,CAAC,UAAU,CAAC;QACpB,KAAK,SAAG,CAAC,IAAI;YACX,IAAI,KAAK,IAAI,IAAI,EAAE;gBACjB,IAAI,QAAQ,EAAE;oBACZ,OAAO,MAAM,CAAC;iBACf;gBACD,OAAO,CAAC,YAAY,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aACxE;YACD,OAAO,GAAG,KAAK,EAAE,CAAC;QACpB,KAAK,SAAG,CAAC,MAAM,CAAC;QAChB,KAAK,SAAG,CAAC,SAAS,CAAC;QACnB,KAAK,SAAG,CAAC,KAAK;YACZ,IAAI,KAAK,IAAI,IAAI,EAAE;gBACjB,IAAI,QAAQ,EAAE;oBACZ,OAAO,MAAM,CAAC;iBACf;gBACD,IAAI,CAAC,YAAY;oBAAE,OAAO,IAAI,CAAC;aAChC;YACD,OAAO,IAAA,sBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,KAAK,SAAG,CAAC,GAAG,CAAC;QACb,KAAK,SAAG,CAAC,SAAS,CAAC;QACnB,KAAK,SAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,SAAG,CAAC,OAAO;YACd,OAAO,IAAA,wBAAkB,EAAC,oBAAoB,CAAC,CAAC;QAClD,KAAK,OAAO,CAAC,CAAC;YACZ,OAAO,KAAK,CAAC;gBACX,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY;aACxE,CAAC,CAAC;SACJ;QACD;YACE,OAAO,IAAA,wBAAkB,EAAC,oBAAoB,CAAC,CAAC;KACnD;AACH,CAAC,CAAC;AApIW,QAAA,gBAAgB,oBAoI3B;AAEF;;GAEG;AACU,QAAA,cAAc,GAAG,wBAAgB,CAAC"}
@@ -1,24 +1,48 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __importDefault = (this && this.__importDefault) || function (mod) {
26
+ return (mod && mod.__esModule) ? mod : { "default": mod };
27
+ };
2
28
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.query = exports.getPool = exports.logSqlError = exports.setLogger = exports.Request = exports.closeDbConnectionsAndExit = exports.closeAllDbConnections = exports.closeDbConnections = exports.getPoolConnection = exports.pools = exports.getDbConfig = exports.getFirstConfigId = void 0;
4
- const config = require("config");
5
- const af_color_1 = require("af-color");
29
+ exports.getPoolMs = exports.closeDbConnectionsAndExitMs = exports.closeDbConnectionsAndExit = exports.closeAllDbConnectionsMs = exports.closeAllDbConnections = exports.closeDbConnectionsMs = exports.getPoolConnectionMs = exports.poolsCacheMs = exports.getDbConfigMs = void 0;
30
+ const config_1 = __importDefault(require("config"));
6
31
  const af_echo_ts_1 = require("af-echo-ts");
7
- const sql = require("mssql");
8
- const _ = require("lodash");
32
+ const sql = __importStar(require("mssql"));
9
33
  const af_tools_ts_1 = require("af-tools-ts");
10
- const getFirstConfigId = () => Object.keys(config.get('database') || {}).filter((v) => !['dialect', '_common_'].includes(v))[0];
11
- exports.getFirstConfigId = getFirstConfigId;
12
- const getDbConfig = (connectionId) => config.get(`database.${connectionId}`);
13
- exports.getDbConfig = getDbConfig;
14
- exports.pools = {};
34
+ const common_1 = require("../common");
35
+ const mssqlConfigs = config_1.default.get('db.postgres');
36
+ const getDbConfigMs = (connectionId) => mssqlConfigs.dbs[connectionId];
37
+ exports.getDbConfigMs = getDbConfigMs;
38
+ exports.poolsCacheMs = {};
15
39
  /**
16
40
  * Возвращает пул соединений для БД, соответствующей преданному ID соединения (borf|cep|hr|global)
17
41
  * В случае, если не удается создать пул или открыть соединение, прерывает работу скрипта
18
42
  */
19
- const getPoolConnection = async (connectionId, options = {}) => {
43
+ const getPoolConnectionMs = async (connectionId, options = {}) => {
20
44
  const { prefix = '', errorCode = 0 } = options;
21
- let pool = exports.pools[connectionId];
45
+ let pool = exports.poolsCacheMs[connectionId];
22
46
  if (pool === null || pool === void 0 ? void 0 : pool.connected) {
23
47
  return pool;
24
48
  }
@@ -32,12 +56,12 @@ const getPoolConnection = async (connectionId, options = {}) => {
32
56
  }
33
57
  };
34
58
  try {
35
- const cfg = config.get('database');
59
+ const cfg = config_1.default.get('database');
36
60
  const namedDbConfig = cfg[connectionId];
37
61
  if (!namedDbConfig) {
38
62
  resume(`Missing configuration for DB id "${connectionId}"`);
39
63
  }
40
- const dbConfig = config.util.extendDeep({}, cfg._common_ || {}, cfg[connectionId]);
64
+ const dbConfig = config_1.default.util.extendDeep({}, cfg._common_ || {}, cfg[connectionId]);
41
65
  if (pool === null || pool === void 0 ? void 0 : pool.connecting) {
42
66
  const startTs = Date.now();
43
67
  while ((pool === null || pool === void 0 ? void 0 : pool.connecting) && (Date.now() - startTs < dbConfig.connectionTimeout)) {
@@ -53,11 +77,11 @@ const getPoolConnection = async (connectionId, options = {}) => {
53
77
  if (typeof pool !== 'object') {
54
78
  resume(`Can't create connection pool "${connectionId}"`);
55
79
  }
56
- exports.pools[connectionId] = pool;
80
+ exports.poolsCacheMs[connectionId] = pool;
57
81
  // @ts-ignore
58
82
  pool._connectionId = connectionId;
59
83
  pool.on('close', () => {
60
- delete exports.pools[connectionId];
84
+ delete exports.poolsCacheMs[connectionId];
61
85
  });
62
86
  pool.on('error', (err) => {
63
87
  af_echo_ts_1.echo.error('POOL-ERROR', err);
@@ -70,7 +94,7 @@ const getPoolConnection = async (connectionId, options = {}) => {
70
94
  resume(`Cant connect to "${connectionId}" db`);
71
95
  }
72
96
  };
73
- exports.getPoolConnection = getPoolConnection;
97
+ exports.getPoolConnectionMs = getPoolConnectionMs;
74
98
  /**
75
99
  * Закрывает указанные соединения с БД
76
100
  *
@@ -78,7 +102,7 @@ exports.getPoolConnection = getPoolConnection;
78
102
  * prefix - Префикс в сообщении о закрытии пула (название синхронизации)
79
103
  * noEcho - подавление сообщений о закрытии соединения
80
104
  */
81
- const closeDbConnections = async (poolsToClose, prefix, noEcho) => {
105
+ const closeDbConnectionsMs = async (poolsToClose, prefix, noEcho) => {
82
106
  if (!Array.isArray(poolsToClose)) {
83
107
  // @ts-ignore
84
108
  poolsToClose = [poolsToClose];
@@ -90,14 +114,14 @@ const closeDbConnections = async (poolsToClose, prefix, noEcho) => {
90
114
  if (pool) {
91
115
  if (typeof pool === 'string') {
92
116
  connectionId = pool;
93
- pool = exports.pools[connectionId];
117
+ pool = exports.poolsCacheMs[connectionId];
94
118
  }
95
119
  else if (typeof pool === 'object') {
96
120
  // @ts-ignore
97
121
  connectionId = pool._connectionId;
98
122
  }
99
123
  if (connectionId) {
100
- delete exports.pools[connectionId];
124
+ delete exports.poolsCacheMs[connectionId];
101
125
  }
102
126
  if (pool && pool.close) {
103
127
  try {
@@ -120,80 +144,52 @@ const closeDbConnections = async (poolsToClose, prefix, noEcho) => {
120
144
  }
121
145
  }
122
146
  };
123
- exports.closeDbConnections = closeDbConnections;
147
+ exports.closeDbConnectionsMs = closeDbConnectionsMs;
148
+ /**
149
+ * @deprecated since version 2.0.0
150
+ */
151
+ const closeAllDbConnections = async (prefix, noEcho) => {
152
+ const poolsToClose = Object.values(exports.poolsCacheMs);
153
+ await (0, exports.closeDbConnectionsMs)(poolsToClose, prefix, noEcho);
154
+ };
155
+ exports.closeAllDbConnections = closeAllDbConnections;
124
156
  /**
125
157
  * Закрывает все соединения с БД
126
158
  *
127
159
  * prefix - Префикс в сообщении о закрытии пула (название синхронизации)
128
160
  * noEcho - подавление сообщений о закрытии соединения
129
161
  */
130
- const closeAllDbConnections = async (prefix, noEcho) => {
131
- const poolsToClose = _.map(exports.pools, (p) => p);
132
- await (0, exports.closeDbConnections)(poolsToClose, prefix, noEcho);
162
+ const closeAllDbConnectionsMs = async (prefix, noEcho) => {
163
+ const poolsToClose = Object.values(exports.poolsCacheMs);
164
+ await (0, exports.closeDbConnectionsMs)(poolsToClose, prefix, noEcho);
133
165
  };
134
- exports.closeAllDbConnections = closeAllDbConnections;
166
+ exports.closeAllDbConnectionsMs = closeAllDbConnectionsMs;
167
+ /**
168
+ * @deprecated since version 2.0.0
169
+ */
170
+ const closeDbConnectionsAndExit = async (poolsToClose, prefix) => {
171
+ await (0, exports.closeDbConnectionsMs)(poolsToClose, prefix);
172
+ process.exit(0);
173
+ };
174
+ exports.closeDbConnectionsAndExit = closeDbConnectionsAndExit;
135
175
  /**
136
176
  * Закрывает указанные соединения с БД и прерывает работу скрипта
137
177
  *
138
178
  * poolsToClose - пул или массив пулов
139
179
  * prefix - Префикс в сообщении о закрытии пула (название синхронизации)
140
180
  */
141
- const closeDbConnectionsAndExit = async (poolsToClose, prefix) => {
142
- await (0, exports.closeDbConnections)(poolsToClose, prefix);
181
+ const closeDbConnectionsAndExitMs = async (poolsToClose, prefix) => {
182
+ await (0, exports.closeDbConnectionsMs)(poolsToClose, prefix);
143
183
  process.exit(0);
144
184
  };
145
- exports.closeDbConnectionsAndExit = closeDbConnectionsAndExit;
146
- const Request = async (connectionId, strSQL) => {
147
- const pool = await (0, exports.getPoolConnection)(connectionId, { onError: 'throw' });
148
- const request = new sql.Request(pool);
149
- if (strSQL) {
150
- return request.query(strSQL);
151
- }
152
- return request;
153
- };
154
- exports.Request = Request;
155
- let logger = af_echo_ts_1.echo;
156
- const setLogger = (logger_) => {
157
- logger = logger_;
158
- };
159
- exports.setLogger = setLogger;
160
- const logSqlError = (err, noThrow, textSQL, prefix) => {
161
- if (prefix) {
162
- logger.error(prefix);
163
- }
164
- if (textSQL) {
165
- logger.error(`SQL Error:\n${af_color_1.magenta}${textSQL}`);
166
- }
167
- logger.error(err);
168
- if (!noThrow) {
169
- throw err;
170
- }
171
- };
172
- exports.logSqlError = logSqlError;
173
- const getPool = async (dbId, noThrow = false) => {
174
- try {
175
- return (0, exports.getPoolConnection)(dbId);
176
- }
177
- catch (err) {
178
- (0, exports.logSqlError)(err, noThrow, `Error while open connection to DB ${dbId}`);
179
- }
180
- };
181
- exports.getPool = getPool;
182
- const query = async (dbId, textSQL, noThrow, prefix) => {
183
- const pool = await (0, exports.getPool)(dbId, noThrow);
184
- if (!(pool === null || pool === void 0 ? void 0 : pool.connected) && !(pool === null || pool === void 0 ? void 0 : pool.connecting)) {
185
- await (0, exports.closeDbConnections)(dbId);
186
- return;
187
- }
188
- const request = new sql.Request(pool);
189
- let res;
185
+ exports.closeDbConnectionsAndExitMs = closeDbConnectionsAndExitMs;
186
+ const getPoolMs = async (connectionId, throwError) => {
190
187
  try {
191
- res = await request.query(textSQL);
192
- return res;
188
+ return (0, exports.getPoolConnectionMs)(connectionId);
193
189
  }
194
190
  catch (err) {
195
- (0, exports.logSqlError)(err, noThrow, textSQL, prefix);
191
+ (0, common_1.logSqlError)(err, throwError, `Error while open connection to DB ${connectionId}`);
196
192
  }
197
193
  };
198
- exports.query = query;
199
- //# sourceMappingURL=db.js.map
194
+ exports.getPoolMs = getPoolMs;
195
+ //# sourceMappingURL=pool-ms.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pool-ms.js","sourceRoot":"","sources":["../../../../src/mssql/pool-ms.ts"],"names":[],"mappings":"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"}