af-db-ts 2.0.19 → 2.0.73

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 (307) hide show
  1. package/dist/cjs/__tests__/db/ms/@gen-types/test-table_schema.js +3 -0
  2. package/dist/cjs/__tests__/db/ms/@gen-types/test-table_schema.js.map +1 -0
  3. package/dist/cjs/__tests__/db/ms/ddl/column-schema-for-test-table-schema-ms.json +216 -0
  4. package/dist/cjs/__tests__/db/ms/ms-get-sql.spec.js +190 -0
  5. package/dist/cjs/__tests__/db/ms/ms-get-sql.spec.js.map +1 -0
  6. package/dist/cjs/__tests__/db/ms/ms-prepare-sql-value.spec.js +584 -0
  7. package/dist/cjs/__tests__/db/ms/ms-prepare-sql-value.spec.js.map +1 -0
  8. package/dist/cjs/__tests__/db/ms/ms-table-schema.spec.js +107 -0
  9. package/dist/cjs/__tests__/db/ms/ms-table-schema.spec.js.map +1 -0
  10. package/dist/cjs/__tests__/db/pg/@gen-types/test-hard_case.js +3 -0
  11. package/dist/cjs/__tests__/db/pg/@gen-types/test-hard_case.js.map +1 -0
  12. package/dist/cjs/__tests__/db/pg/@gen-types/test-only_one_serial.js +3 -0
  13. package/dist/cjs/__tests__/db/pg/@gen-types/test-only_one_serial.js.map +1 -0
  14. package/dist/cjs/__tests__/db/pg/@gen-types/test-only_one_uniq.js +3 -0
  15. package/dist/cjs/__tests__/db/pg/@gen-types/test-only_one_uniq.js.map +1 -0
  16. package/dist/cjs/__tests__/db/pg/@gen-types/test-serial_and_uniq.js +3 -0
  17. package/dist/cjs/__tests__/db/pg/@gen-types/test-serial_and_uniq.js.map +1 -0
  18. package/dist/cjs/__tests__/db/pg/@gen-types/test-table_schema.js +3 -0
  19. package/dist/cjs/__tests__/db/pg/@gen-types/test-table_schema.js.map +1 -0
  20. package/dist/cjs/__tests__/db/pg/ddl/column-schema-for-test-table-schema-pg.json +170 -0
  21. package/dist/cjs/__tests__/db/pg/gen-table-interfaces-4-test-pg.js +36 -0
  22. package/dist/cjs/__tests__/db/pg/gen-table-interfaces-4-test-pg.js.map +1 -0
  23. package/dist/cjs/__tests__/db/pg/pg-get-sql.spec.js +261 -0
  24. package/dist/cjs/__tests__/db/pg/pg-get-sql.spec.js.map +1 -0
  25. package/dist/cjs/__tests__/db/pg/pg-insert.spec.js +294 -0
  26. package/dist/cjs/__tests__/db/pg/pg-insert.spec.js.map +1 -0
  27. package/dist/cjs/__tests__/db/pg/pg-prepare-sql-value.spec.js +575 -0
  28. package/dist/cjs/__tests__/db/pg/pg-prepare-sql-value.spec.js.map +1 -0
  29. package/dist/cjs/__tests__/db/pg/pg-table-schema.spec.js +117 -0
  30. package/dist/cjs/__tests__/db/pg/pg-table-schema.spec.js.map +1 -0
  31. package/dist/cjs/src/@types/i-data-types-ms.js +3 -0
  32. package/dist/cjs/src/@types/i-data-types-ms.js.map +1 -0
  33. package/dist/cjs/src/@types/i-data-types-pg.js +7 -0
  34. package/dist/cjs/src/@types/i-data-types-pg.js.map +1 -0
  35. package/dist/cjs/src/@types/i-pg.js +0 -21
  36. package/dist/cjs/src/@types/i-pg.js.map +1 -1
  37. package/dist/cjs/src/common.js +6 -5
  38. package/dist/cjs/src/common.js.map +1 -1
  39. package/dist/cjs/src/index.js +75 -54
  40. package/dist/cjs/src/index.js.map +1 -1
  41. package/dist/cjs/src/ms/gen-table-interfaces-ms.js +64 -0
  42. package/dist/cjs/src/ms/gen-table-interfaces-ms.js.map +1 -0
  43. package/dist/cjs/src/ms/get-sql/insert.js +37 -0
  44. package/dist/cjs/src/ms/get-sql/insert.js.map +1 -0
  45. package/dist/cjs/src/ms/get-sql/merge.js +93 -0
  46. package/dist/cjs/src/ms/get-sql/merge.js.map +1 -0
  47. package/dist/cjs/src/ms/get-sql/update.js +32 -0
  48. package/dist/cjs/src/ms/get-sql/update.js.map +1 -0
  49. package/dist/cjs/src/{mssql → ms}/pool-ms.js +6 -23
  50. package/dist/cjs/src/ms/pool-ms.js.map +1 -0
  51. package/dist/cjs/src/ms/prepare-value.js +178 -0
  52. package/dist/cjs/src/ms/prepare-value.js.map +1 -0
  53. package/dist/cjs/src/{mssql → ms}/query-ms.js +1 -1
  54. package/dist/cjs/src/ms/query-ms.js.map +1 -0
  55. package/dist/cjs/src/ms/table-schema-ms.js +241 -0
  56. package/dist/cjs/src/ms/table-schema-ms.js.map +1 -0
  57. package/dist/cjs/src/ms/utils-ms.js +92 -0
  58. package/dist/cjs/src/ms/utils-ms.js.map +1 -0
  59. package/dist/cjs/src/ms/wrap-transaction-ms.js +32 -0
  60. package/dist/cjs/src/ms/wrap-transaction-ms.js.map +1 -0
  61. package/dist/cjs/src/pg/gen-table-interfaces-pg.js +83 -0
  62. package/dist/cjs/src/pg/gen-table-interfaces-pg.js.map +1 -0
  63. package/dist/cjs/src/pg/get-sql/insert.js +38 -0
  64. package/dist/cjs/src/pg/get-sql/insert.js.map +1 -0
  65. package/dist/cjs/src/pg/get-sql/merge.js +60 -0
  66. package/dist/cjs/src/pg/get-sql/merge.js.map +1 -0
  67. package/dist/cjs/src/pg/get-sql/update.js +32 -0
  68. package/dist/cjs/src/pg/get-sql/update.js.map +1 -0
  69. package/dist/cjs/src/pg/{insert.js → insert-pg.js} +10 -10
  70. package/dist/cjs/src/pg/insert-pg.js.map +1 -0
  71. package/dist/cjs/src/pg/is-table-or-view-exists.js +1 -2
  72. package/dist/cjs/src/pg/is-table-or-view-exists.js.map +1 -1
  73. package/dist/cjs/src/pg/{pg-pool.js → pool-pg.js} +6 -7
  74. package/dist/cjs/src/pg/pool-pg.js.map +1 -0
  75. package/dist/cjs/src/pg/prepare-value.js +116 -69
  76. package/dist/cjs/src/pg/prepare-value.js.map +1 -1
  77. package/dist/cjs/src/pg/query-pg.js +2 -2
  78. package/dist/cjs/src/pg/query-pg.js.map +1 -1
  79. package/dist/cjs/src/pg/table-schema-pg.js +183 -0
  80. package/dist/cjs/src/pg/table-schema-pg.js.map +1 -0
  81. package/dist/cjs/src/pg/utils-pg.js +99 -0
  82. package/dist/cjs/src/pg/utils-pg.js.map +1 -0
  83. package/dist/cjs/src/utils/utils-array.js +152 -0
  84. package/dist/cjs/src/utils/utils-array.js.map +1 -0
  85. package/dist/cjs/src/utils/utils-dt.js +121 -0
  86. package/dist/cjs/src/utils/utils-dt.js.map +1 -0
  87. package/dist/cjs/src/utils/utils-num.js +127 -0
  88. package/dist/cjs/src/utils/utils-num.js.map +1 -0
  89. package/dist/cjs/src/utils/utils.js +66 -0
  90. package/dist/cjs/src/utils/utils.js.map +1 -0
  91. package/dist/esm/src/@types/i-data-types-ms.js +2 -0
  92. package/dist/esm/src/@types/i-data-types-ms.js.map +1 -0
  93. package/dist/esm/src/@types/i-data-types-pg.js +6 -0
  94. package/dist/esm/src/@types/i-data-types-pg.js.map +1 -0
  95. package/dist/esm/src/@types/i-pg.js +1 -20
  96. package/dist/esm/src/@types/i-pg.js.map +1 -1
  97. package/dist/esm/src/common.js +3 -2
  98. package/dist/esm/src/common.js.map +1 -1
  99. package/dist/esm/src/index.js +24 -15
  100. package/dist/esm/src/index.js.map +1 -1
  101. package/dist/esm/src/ms/gen-table-interfaces-ms.js +36 -0
  102. package/dist/esm/src/ms/gen-table-interfaces-ms.js.map +1 -0
  103. package/dist/esm/src/ms/get-sql/insert.js +33 -0
  104. package/dist/esm/src/ms/get-sql/insert.js.map +1 -0
  105. package/dist/esm/src/ms/get-sql/merge.js +89 -0
  106. package/dist/esm/src/ms/get-sql/merge.js.map +1 -0
  107. package/dist/esm/src/ms/get-sql/update.js +28 -0
  108. package/dist/esm/src/ms/get-sql/update.js.map +1 -0
  109. package/dist/esm/src/{mssql → ms}/pool-ms.js +5 -20
  110. package/dist/esm/src/ms/pool-ms.js.map +1 -0
  111. package/dist/esm/src/ms/prepare-value.js +149 -0
  112. package/dist/esm/src/ms/prepare-value.js.map +1 -0
  113. package/dist/esm/src/{mssql → ms}/query-ms.js +1 -1
  114. package/dist/esm/src/ms/query-ms.js.map +1 -0
  115. package/dist/esm/src/ms/table-schema-ms.js +213 -0
  116. package/dist/esm/src/ms/table-schema-ms.js.map +1 -0
  117. package/dist/esm/src/ms/utils-ms.js +65 -0
  118. package/dist/esm/src/ms/utils-ms.js.map +1 -0
  119. package/dist/esm/src/ms/wrap-transaction-ms.js +28 -0
  120. package/dist/esm/src/ms/wrap-transaction-ms.js.map +1 -0
  121. package/dist/esm/src/pg/gen-table-interfaces-pg.js +55 -0
  122. package/dist/esm/src/pg/gen-table-interfaces-pg.js.map +1 -0
  123. package/dist/esm/src/pg/get-sql/insert.js +34 -0
  124. package/dist/esm/src/pg/get-sql/insert.js.map +1 -0
  125. package/dist/esm/src/pg/get-sql/merge.js +56 -0
  126. package/dist/esm/src/pg/get-sql/merge.js.map +1 -0
  127. package/dist/esm/src/pg/get-sql/update.js +28 -0
  128. package/dist/esm/src/pg/get-sql/update.js.map +1 -0
  129. package/dist/esm/src/pg/{insert.js → insert-pg.js} +10 -10
  130. package/dist/esm/src/pg/insert-pg.js.map +1 -0
  131. package/dist/esm/src/pg/is-table-or-view-exists.js +1 -2
  132. package/dist/esm/src/pg/is-table-or-view-exists.js.map +1 -1
  133. package/dist/esm/src/pg/{pg-pool.js → pool-pg.js} +6 -7
  134. package/dist/esm/src/pg/pool-pg.js.map +1 -0
  135. package/dist/esm/src/pg/prepare-value.js +113 -67
  136. package/dist/esm/src/pg/prepare-value.js.map +1 -1
  137. package/dist/esm/src/pg/query-pg.js +1 -1
  138. package/dist/esm/src/pg/query-pg.js.map +1 -1
  139. package/dist/esm/src/pg/table-schema-pg.js +178 -0
  140. package/dist/esm/src/pg/table-schema-pg.js.map +1 -0
  141. package/dist/esm/src/pg/utils-pg.js +93 -0
  142. package/dist/esm/src/pg/utils-pg.js.map +1 -0
  143. package/dist/esm/src/utils/utils-array.js +125 -0
  144. package/dist/esm/src/utils/utils-array.js.map +1 -0
  145. package/dist/esm/src/utils/utils-dt.js +114 -0
  146. package/dist/esm/src/utils/utils-dt.js.map +1 -0
  147. package/dist/esm/src/utils/utils-num.js +117 -0
  148. package/dist/esm/src/utils/utils-num.js.map +1 -0
  149. package/dist/esm/src/utils/utils.js +58 -0
  150. package/dist/esm/src/utils/utils.js.map +1 -0
  151. package/dist/types/src/@types/i-common.d.ts +35 -3
  152. package/dist/types/src/@types/i-common.d.ts.map +1 -1
  153. package/dist/types/src/@types/i-data-types-ms.d.ts +3 -0
  154. package/dist/types/src/@types/i-data-types-ms.d.ts.map +1 -0
  155. package/dist/types/src/@types/i-data-types-pg.d.ts +35 -0
  156. package/dist/types/src/@types/i-data-types-pg.d.ts.map +1 -0
  157. package/dist/types/src/@types/i-ms.d.ts +26 -126
  158. package/dist/types/src/@types/i-ms.d.ts.map +1 -1
  159. package/dist/types/src/@types/i-pg.d.ts +11 -35
  160. package/dist/types/src/@types/i-pg.d.ts.map +1 -1
  161. package/dist/types/src/common.d.ts +1 -0
  162. package/dist/types/src/common.d.ts.map +1 -1
  163. package/dist/types/src/index.d.ts +28 -16
  164. package/dist/types/src/index.d.ts.map +1 -1
  165. package/dist/types/src/ms/gen-table-interfaces-ms.d.ts +3 -0
  166. package/dist/types/src/ms/gen-table-interfaces-ms.d.ts.map +1 -0
  167. package/dist/types/src/ms/get-sql/insert.d.ts +9 -0
  168. package/dist/types/src/ms/get-sql/insert.d.ts.map +1 -0
  169. package/dist/types/src/ms/get-sql/merge.d.ts +14 -0
  170. package/dist/types/src/ms/get-sql/merge.d.ts.map +1 -0
  171. package/dist/types/src/ms/get-sql/update.d.ts +9 -0
  172. package/dist/types/src/ms/get-sql/update.d.ts.map +1 -0
  173. package/dist/types/src/{mssql → ms}/pool-ms.d.ts +0 -8
  174. package/dist/types/src/ms/pool-ms.d.ts.map +1 -0
  175. package/dist/types/src/ms/prepare-value.d.ts +12 -0
  176. package/dist/types/src/ms/prepare-value.d.ts.map +1 -0
  177. package/dist/types/src/ms/query-ms.d.ts +3 -0
  178. package/dist/types/src/ms/query-ms.d.ts.map +1 -0
  179. package/dist/types/src/ms/table-schema-ms.d.ts +9 -0
  180. package/dist/types/src/ms/table-schema-ms.d.ts.map +1 -0
  181. package/dist/types/src/ms/utils-ms.d.ts +3 -0
  182. package/dist/types/src/ms/utils-ms.d.ts.map +1 -0
  183. package/dist/types/src/ms/wrap-transaction-ms.d.ts +5 -0
  184. package/dist/types/src/ms/wrap-transaction-ms.d.ts.map +1 -0
  185. package/dist/types/src/pg/gen-table-interfaces-pg.d.ts +3 -0
  186. package/dist/types/src/pg/gen-table-interfaces-pg.d.ts.map +1 -0
  187. package/dist/types/src/pg/get-sql/insert.d.ts +9 -0
  188. package/dist/types/src/pg/get-sql/insert.d.ts.map +1 -0
  189. package/dist/types/src/pg/get-sql/merge.d.ts +10 -0
  190. package/dist/types/src/pg/get-sql/merge.d.ts.map +1 -0
  191. package/dist/types/src/pg/get-sql/update.d.ts +9 -0
  192. package/dist/types/src/pg/get-sql/update.d.ts.map +1 -0
  193. package/dist/types/src/pg/{insert.d.ts → insert-pg.d.ts} +3 -3
  194. package/dist/types/src/pg/insert-pg.d.ts.map +1 -0
  195. package/dist/types/src/pg/{pg-pool.d.ts → pool-pg.d.ts} +1 -1
  196. package/dist/types/src/pg/{pg-pool.d.ts.map → pool-pg.d.ts.map} +1 -1
  197. package/dist/types/src/pg/prepare-value.d.ts +3 -1
  198. package/dist/types/src/pg/prepare-value.d.ts.map +1 -1
  199. package/dist/types/src/pg/query-pg.d.ts +3 -2
  200. package/dist/types/src/pg/query-pg.d.ts.map +1 -1
  201. package/dist/types/src/pg/table-schema-pg.d.ts +12 -0
  202. package/dist/types/src/pg/table-schema-pg.d.ts.map +1 -0
  203. package/dist/types/src/pg/utils-pg.d.ts +5 -0
  204. package/dist/types/src/pg/utils-pg.d.ts.map +1 -0
  205. package/dist/types/src/utils/utils-array.d.ts +5 -0
  206. package/dist/types/src/utils/utils-array.d.ts.map +1 -0
  207. package/dist/types/src/utils/utils-dt.d.ts +15 -0
  208. package/dist/types/src/utils/utils-dt.d.ts.map +1 -0
  209. package/dist/types/src/utils/utils-num.d.ts +9 -0
  210. package/dist/types/src/utils/utils-num.d.ts.map +1 -0
  211. package/dist/types/src/utils/utils.d.ts +18 -0
  212. package/dist/types/src/utils/utils.d.ts.map +1 -0
  213. package/package.json +13 -13
  214. package/src/@types/i-common.ts +42 -4
  215. package/src/@types/i-data-types-ms.ts +81 -0
  216. package/src/@types/i-data-types-pg.ts +120 -0
  217. package/src/@types/i-ms.ts +29 -153
  218. package/src/@types/i-pg.ts +11 -36
  219. package/src/common.ts +4 -2
  220. package/src/index.ts +101 -59
  221. package/src/ms/gen-table-interfaces-ms.ts +52 -0
  222. package/src/ms/get-sql/insert.ts +45 -0
  223. package/src/ms/get-sql/merge.ts +118 -0
  224. package/src/ms/get-sql/update.ts +46 -0
  225. package/src/{mssql → ms}/pool-ms.ts +0 -16
  226. package/src/ms/prepare-value.ts +175 -0
  227. package/src/{mssql → ms}/query-ms.ts +2 -2
  228. package/src/ms/table-schema-ms.ts +231 -0
  229. package/src/ms/utils-ms.ts +72 -0
  230. package/src/ms/wrap-transaction-ms.ts +27 -0
  231. package/src/pg/gen-table-interfaces-pg.ts +74 -0
  232. package/src/pg/get-sql/insert.ts +46 -0
  233. package/src/pg/get-sql/merge.ts +70 -0
  234. package/src/pg/get-sql/update.ts +46 -0
  235. package/src/pg/{insert.ts → insert-pg.ts} +9 -9
  236. package/src/pg/prepare-value.ts +129 -67
  237. package/src/pg/query-pg.ts +4 -3
  238. package/src/pg/table-schema-pg.ts +196 -0
  239. package/src/pg/utils-pg.ts +97 -0
  240. package/src/utils/utils-array.ts +133 -0
  241. package/src/utils/utils-dt.ts +123 -0
  242. package/src/utils/utils-num.ts +131 -0
  243. package/src/utils/utils.ts +64 -0
  244. package/dist/cjs/__tests__/02_getValueForSqlMs.spec.js +0 -50
  245. package/dist/cjs/__tests__/02_getValueForSqlMs.spec.js.map +0 -1
  246. package/dist/cjs/src/mssql/get-value-for-sql.js +0 -277
  247. package/dist/cjs/src/mssql/get-value-for-sql.js.map +0 -1
  248. package/dist/cjs/src/mssql/pool-ms.js.map +0 -1
  249. package/dist/cjs/src/mssql/query-ms.js.map +0 -1
  250. package/dist/cjs/src/mssql/sql.js +0 -427
  251. package/dist/cjs/src/mssql/sql.js.map +0 -1
  252. package/dist/cjs/src/mssql/utils.js +0 -36
  253. package/dist/cjs/src/mssql/utils.js.map +0 -1
  254. package/dist/cjs/src/pg/get-merge-sql.js +0 -52
  255. package/dist/cjs/src/pg/get-merge-sql.js.map +0 -1
  256. package/dist/cjs/src/pg/get-update-sql.js +0 -30
  257. package/dist/cjs/src/pg/get-update-sql.js.map +0 -1
  258. package/dist/cjs/src/pg/insert.js.map +0 -1
  259. package/dist/cjs/src/pg/pg-pool.js.map +0 -1
  260. package/dist/cjs/src/pg/table-schema.js +0 -179
  261. package/dist/cjs/src/pg/table-schema.js.map +0 -1
  262. package/dist/cjs/src/utils.js +0 -17
  263. package/dist/cjs/src/utils.js.map +0 -1
  264. package/dist/esm/src/mssql/get-value-for-sql.js +0 -272
  265. package/dist/esm/src/mssql/get-value-for-sql.js.map +0 -1
  266. package/dist/esm/src/mssql/pool-ms.js.map +0 -1
  267. package/dist/esm/src/mssql/query-ms.js.map +0 -1
  268. package/dist/esm/src/mssql/sql.js +0 -390
  269. package/dist/esm/src/mssql/sql.js.map +0 -1
  270. package/dist/esm/src/mssql/utils.js +0 -31
  271. package/dist/esm/src/mssql/utils.js.map +0 -1
  272. package/dist/esm/src/pg/get-merge-sql.js +0 -48
  273. package/dist/esm/src/pg/get-merge-sql.js.map +0 -1
  274. package/dist/esm/src/pg/get-update-sql.js +0 -26
  275. package/dist/esm/src/pg/get-update-sql.js.map +0 -1
  276. package/dist/esm/src/pg/insert.js.map +0 -1
  277. package/dist/esm/src/pg/pg-pool.js.map +0 -1
  278. package/dist/esm/src/pg/table-schema.js +0 -174
  279. package/dist/esm/src/pg/table-schema.js.map +0 -1
  280. package/dist/esm/src/utils.js +0 -14
  281. package/dist/esm/src/utils.js.map +0 -1
  282. package/dist/types/src/mssql/get-value-for-sql.d.ts +0 -11
  283. package/dist/types/src/mssql/get-value-for-sql.d.ts.map +0 -1
  284. package/dist/types/src/mssql/pool-ms.d.ts.map +0 -1
  285. package/dist/types/src/mssql/query-ms.d.ts +0 -3
  286. package/dist/types/src/mssql/query-ms.d.ts.map +0 -1
  287. package/dist/types/src/mssql/sql.d.ts +0 -57
  288. package/dist/types/src/mssql/sql.d.ts.map +0 -1
  289. package/dist/types/src/mssql/utils.d.ts +0 -10
  290. package/dist/types/src/mssql/utils.d.ts.map +0 -1
  291. package/dist/types/src/pg/get-merge-sql.d.ts +0 -9
  292. package/dist/types/src/pg/get-merge-sql.d.ts.map +0 -1
  293. package/dist/types/src/pg/get-update-sql.d.ts +0 -3
  294. package/dist/types/src/pg/get-update-sql.d.ts.map +0 -1
  295. package/dist/types/src/pg/insert.d.ts.map +0 -1
  296. package/dist/types/src/pg/table-schema.d.ts +0 -12
  297. package/dist/types/src/pg/table-schema.d.ts.map +0 -1
  298. package/dist/types/src/utils.d.ts +0 -9
  299. package/dist/types/src/utils.d.ts.map +0 -1
  300. package/src/mssql/get-value-for-sql.ts +0 -325
  301. package/src/mssql/sql.ts +0 -430
  302. package/src/mssql/utils.ts +0 -31
  303. package/src/pg/get-merge-sql.ts +0 -62
  304. package/src/pg/get-update-sql.ts +0 -32
  305. package/src/pg/table-schema.ts +0 -189
  306. package/src/utils.ts +0 -14
  307. /package/src/pg/{pg-pool.ts → pool-pg.ts} +0 -0
@@ -1,4 +1,3 @@
1
- var _a, _b;
2
1
  import config from 'config';
3
2
  import { Pool } from 'pg';
4
3
  import { echo } from 'af-echo-ts';
@@ -12,7 +11,7 @@ if (cfg.database) {
12
11
  dbs = { ...cfg.database };
13
12
  dbOptions = {};
14
13
  }
15
- else if ((_b = (_a = cfg.db) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.dbs) {
14
+ else if (cfg.db?.postgres?.dbs) {
16
15
  dbs = { ...cfg.db.postgres.dbs };
17
16
  dbOptions = { ...(cfg.db.postgres.options || {}) };
18
17
  }
@@ -21,15 +20,15 @@ const defaultOptions = {
21
20
  // in addition here are the pool specific configuration parameters:
22
21
  // number of milliseconds to wait before timing out when connecting a new client
23
22
  // by default this is 0 which means no timeout
24
- connectionTimeoutMillis: 5 * 60000,
23
+ connectionTimeoutMillis: 5 * 60000, // 5 min
25
24
  // number of milliseconds a client must sit idle in the pool and not be checked out
26
25
  // before it is disconnected from the backend and discarded
27
26
  // default is 10000 (10 seconds) - set to 0 to disable auto-disconnection of idle clients
28
- idleTimeoutMillis: _3_HOURS,
27
+ idleTimeoutMillis: _3_HOURS, // 3 h
29
28
  // maximum number of clients the pool should contain
30
29
  // by default this is set to 10.
31
30
  max: 10,
32
- statement_timeout: _3_HOURS,
31
+ statement_timeout: _3_HOURS, // number of milliseconds before a statement in query will time out, default is no timeout
33
32
  query_timeout: _3_HOURS, // number of milliseconds until the request call times out, no timeout by default
34
33
  };
35
34
  dbOptions = config.util.extendDeep(defaultOptions, dbOptions);
@@ -74,10 +73,10 @@ export const closePoolPg = async (connectionId) => {
74
73
  return true;
75
74
  }
76
75
  const fns = (pool._clients || [])
77
- .filter((client) => (client === null || client === void 0 ? void 0 : client._connected) && typeof (client === null || client === void 0 ? void 0 : client.end) === 'function')
76
+ .filter((client) => client?._connected && typeof client?.end === 'function')
78
77
  .map((client) => client.end());
79
78
  await Promise.all(fns);
80
79
  return true;
81
80
  };
82
81
  export const closeAllPgConnectionsPg = async () => Promise.all(Object.keys(poolsCachePg).map((connectionId) => closePoolPg(connectionId)));
83
- //# sourceMappingURL=pg-pool.js.map
82
+ //# sourceMappingURL=pool-pg.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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"}
@@ -1,81 +1,127 @@
1
- // noinspection SqlResolve
2
- import { DateTime } from 'luxon';
3
- import { EDataTypePg } from '../@types/i-pg';
4
- const NULL = 'null';
5
- const utc$ = (millis) => DateTime.fromMillis(millis == null ? Date.now() : millis).setZone('UTC');
6
- export const prepareSqlStringPg = (s) => {
7
- s = String(s);
8
- if (/['\\]|\${2,}/.test(s)) {
9
- return `$s$${s}$s$`;
1
+ import { getBool } from 'af-tools-ts';
2
+ import { NULL } from '../common';
3
+ import { dateTimeValue, getDatetimeWithPrecisionAndOffset } from '../utils/utils-dt';
4
+ import { prepareBigIntNumber, prepareFloatNumber, prepareIntNumber, prepareNumeric } from '../utils/utils-num';
5
+ import { binToHexString, prepareJSON, prepareUUID, q } from '../utils/utils';
6
+ import { arrayToJsonList } from '../utils/utils-array';
7
+ export const quoteStringPg = (value) => {
8
+ if (value == null) {
9
+ return NULL;
10
+ }
11
+ return /['\\]|\${2,}/.test(value) ? `$s$${value}$s$` : `'${value}'`;
12
+ };
13
+ export const prepareSqlStringPg = (value, fieldDef) => {
14
+ if (value == null) {
15
+ return NULL;
16
+ }
17
+ let v = String(value);
18
+ const { length = 0, noQuotes } = fieldDef;
19
+ if (length > 0 && v.length > length) {
20
+ v = v.substring(0, length);
21
+ }
22
+ if (noQuotes) {
23
+ return v;
24
+ }
25
+ return quoteStringPg(v);
26
+ };
27
+ const prepareDateTimeOffset = (value, fieldDef) => getDatetimeWithPrecisionAndOffset({ value, fieldDef, defaultDtPrecision: 6 });
28
+ const prepareTimeOffset = (value, fieldDefOriginal) => {
29
+ const fieldDef = { ...fieldDefOriginal, noQuotes: true };
30
+ fieldDef.dateTimeOptions = fieldDef.dateTimeOptions || {};
31
+ const { includeOffset = fieldDef.dataType === 'timetz' } = fieldDef.dateTimeOptions;
32
+ fieldDef.dateTimeOptions.includeOffset = includeOffset;
33
+ const dts = getDatetimeWithPrecisionAndOffset({ value, fieldDef, defaultDtPrecision: 6, stripTrailingZeros: true });
34
+ return dts === NULL ? NULL : `'${dts.substring(11, dts.length)}'::${fieldDef.dataType}`;
35
+ };
36
+ const prepareJsonPg = (value, dataType) => {
37
+ const v = prepareJSON(value);
38
+ if (v === NULL) {
39
+ return NULL;
10
40
  }
11
- return `'${s}'`;
41
+ return `${quoteStringPg(v)}::${dataType}`;
12
42
  };
13
43
  export const prepareSqlValuePg = (arg) => {
14
44
  const { value, fieldDef } = arg;
15
- if (value == null && fieldDef.isNullable) {
45
+ if (value == null) {
16
46
  return NULL;
17
47
  }
18
- switch (fieldDef.dataType) {
19
- case EDataTypePg.boolean: {
20
- return value ? 'true' : 'false';
21
- }
22
- case EDataTypePg.bigint: {
23
- return `'${value}'`;
24
- }
25
- case EDataTypePg.numeric:
26
- case EDataTypePg.real: {
27
- const v = Number(value);
28
- return Number.isNaN(v) ? NULL : v;
29
- }
30
- case EDataTypePg.integer:
31
- case EDataTypePg.smallint: {
32
- const v = Number(value);
33
- return Number.isNaN(v) ? NULL : Math.floor(v);
34
- }
35
- case EDataTypePg.text:
36
- case EDataTypePg.character:
37
- case EDataTypePg.varchar:
38
- case EDataTypePg.uuid: {
39
- return prepareSqlStringPg(value);
48
+ const fieldDefWithNoQuotes = { ...fieldDef, noQuotes: true };
49
+ let v = value;
50
+ const { noQuotes, dataType } = fieldDef;
51
+ switch (dataType) {
52
+ case 'bit':
53
+ return getBool(value) ? '1' : '0';
54
+ case 'bool':
55
+ case 'boolean':
56
+ return getBool(value) ? 'true' : 'false';
57
+ case 'smallint':
58
+ case 'int2':
59
+ return prepareIntNumber(value, -32768, 32767);
60
+ case 'int':
61
+ case 'integer':
62
+ case 'int4':
63
+ return prepareIntNumber(value, -2147483648, 2147483647);
64
+ case 'bigint':
65
+ case 'int8':
66
+ return prepareBigIntNumber(value);
67
+ case 'numeric':
68
+ case 'decimal':
69
+ return prepareNumeric(value, fieldDef.precision, fieldDef.scale);
70
+ case 'real':
71
+ case 'float4':
72
+ case 'money':
73
+ case 'double precision':
74
+ case 'float8':
75
+ return prepareFloatNumber(value);
76
+ case 'json':
77
+ case 'jsonb':
78
+ return prepareJsonPg(value, dataType);
79
+ case 'uuid':
80
+ return prepareUUID(v, true, fieldDef.noQuotes);
81
+ case 'string':
82
+ case 'text':
83
+ case 'character':
84
+ case 'char':
85
+ case 'varchar':
86
+ case 'character varying':
87
+ return prepareSqlStringPg(value, fieldDef);
88
+ case 'timestamp':
89
+ case 'timestamp without time zone': {
90
+ // '2023-09-05T02:23:54.105+03:00'::timestamp
91
+ // '2023-09-05T02:23:54.105'::timestamp
92
+ const { includeOffset = false } = fieldDef.dateTimeOptions || {}; // По умолчанию для timestamp includeOffset = false
93
+ const str = prepareDateTimeOffset(value, { ...fieldDef, noQuotes: true, dateTimeOptions: { ...(fieldDef.dateTimeOptions || {}), includeOffset } });
94
+ return str === NULL ? NULL : `'${str}'::timestamp`;
40
95
  }
41
- case EDataTypePg.json:
42
- case EDataTypePg.jsonb: {
43
- return prepareSqlStringPg(JSON.stringify(value));
96
+ case 'timestamptz':
97
+ case 'timestamp with time zone': {
98
+ // '2023-09-05T02:23:54.105'::timestamptz
99
+ // '2023-09-05T02:23:54.105+03:00'::timestamptz
100
+ const str = prepareDateTimeOffset(value, fieldDefWithNoQuotes);
101
+ return str === NULL ? NULL : `'${str}'::timestamptz`;
44
102
  }
45
- case EDataTypePg.date:
46
- case EDataTypePg.timestamp:
47
- case EDataTypePg.timestamptz: {
48
- let v = value;
49
- if (value instanceof Date) {
50
- v = +value;
103
+ case 'date':
104
+ // '2023-09-05'::date
105
+ return dateTimeValue(value, fieldDefWithNoQuotes, (dt) => `'${dt.toISODate()}'::date`);
106
+ case 'timetz': // '02:22:17.368+03:00'::time
107
+ case 'time with time zone':
108
+ case 'time': // '02:22:17.368'::time
109
+ case 'time without time zone':
110
+ return prepareTimeOffset(value, fieldDef);
111
+ case 'bytea':
112
+ v = binToHexString(value);
113
+ return v ? q(v, noQuotes) : NULL;
114
+ case 'ARRAY': {
115
+ v = arrayToJsonList(value, fieldDef.arrayType);
116
+ if (v === NULL) {
117
+ return NULL;
51
118
  }
52
- else if (value instanceof DateTime) {
53
- v = value.toMillis();
54
- }
55
- else if (typeof value === 'string') {
56
- v = DateTime.fromISO(value).toMillis();
57
- }
58
- switch (fieldDef.dataType) {
59
- case EDataTypePg.date: {
60
- return `'${typeof v === 'number' ? utc$(v).toISODate() : v}'::date`;
61
- }
62
- case EDataTypePg.timestamp:
63
- case EDataTypePg.timestamptz: {
64
- return `'${typeof v === 'number' ? utc$(v).toISO() : v}'::timestamptz`;
65
- }
66
- default:
67
- return `'${v}'`;
68
- }
69
- }
70
- case EDataTypePg.USER_DEFINED:
71
- return prepareSqlStringPg(value);
72
- case EDataTypePg.ARRAY: {
73
- let v = JSON.stringify(value);
74
- v = v.replace(/^\[(.*?)]$/, '{$1}');
75
- return prepareSqlStringPg(v);
119
+ v = `{${v}}`;
120
+ return fieldDef.noQuotes ? v : quoteStringPg(v);
76
121
  }
122
+ // 'USER_DEFINED'
77
123
  default:
78
- return prepareSqlStringPg(value);
124
+ return prepareSqlStringPg(value, fieldDef);
79
125
  }
80
126
  };
81
127
  //# sourceMappingURL=prepare-value.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepare-value.js","sourceRoot":"","sources":["../../../../src/pg/prepare-value.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { getPoolPg } from './pg-pool';
1
+ import { getPoolPg } from './pool-pg';
2
2
  import { logSqlError } from '../common';
3
3
  export const queryPg = async (connectionId, sqlText, sqlValues, throwError, prefix) => {
4
4
  const pool = await getPoolPg(connectionId);
@@ -1 +1 @@
1
- {"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAoB,EACpB,MAAe,EAEqB,EAAE;IACtC,MAAM,IAAI,GAAY,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC;IACpD,IAAI,GAAgB,CAAC;IACrB,IAAI;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC5B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;SAC5C;aAAM;YACL,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACjC;QACD,OAAO,GAAG,CAAC;KACZ;IAAC,OAAO,GAAG,EAAE;QACZ,WAAW,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KAChD;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAIxC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,UAAoB,EACpB,MAAe,EAEqB,EAAE;IACtC,MAAM,IAAI,GAAY,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC;IACpD,IAAI,GAAgB,CAAC;IACrB,IAAI,CAAC;QACH,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,WAAW,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC"}
@@ -0,0 +1,178 @@
1
+ // noinspection SqlResolve
2
+ import { queryPg } from './query-pg';
3
+ import { logger } from '../logger-error';
4
+ import { graceExit } from '../common';
5
+ import { schemaTable } from '../utils/utils';
6
+ import { getNormalizedTypePg, getTypeByUdtNamePg } from './utils-pg';
7
+ // commonSchemaAndTable: <schema>.<table> : Staff.nnPersones-personGuid
8
+ // schemaAndTablePg: "<schema>"."<table>" : "Staff"."nnPersones-personGuid"
9
+ const tableSchemaHash = {};
10
+ const getColumnsSchemaPg_ = async (connectionId, commonSchemaAndTable) => {
11
+ const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
12
+ const sql = `SELECT column_name,
13
+ column_default,
14
+ is_nullable,
15
+ data_type,
16
+ character_maximum_length,
17
+ numeric_precision,
18
+ numeric_precision_radix,
19
+ numeric_scale,
20
+ datetime_precision,
21
+ udt_name,
22
+ is_generated
23
+ FROM information_schema.columns
24
+ WHERE table_name = '${table}'
25
+ AND table_schema = '${schema}';`;
26
+ const result = await queryPg(connectionId, sql);
27
+ const fields = result?.rows || [];
28
+ const columnsSchema = {};
29
+ fields.forEach((fieldDef) => {
30
+ const columnDefault = fieldDef.column_default != null ? fieldDef.column_default : undefined;
31
+ const name = fieldDef.column_name;
32
+ const dataType = getNormalizedTypePg(fieldDef.data_type);
33
+ const fieldSchema = {
34
+ name,
35
+ isNullable: /yes/i.test(fieldDef.is_nullable || ''),
36
+ columnDefault: fieldDef.column_default,
37
+ hasDefault: columnDefault != null,
38
+ dataType,
39
+ length: fieldDef.character_maximum_length,
40
+ precision: fieldDef.numeric_precision,
41
+ scale: fieldDef.numeric_scale,
42
+ radix: fieldDef.numeric_precision_radix,
43
+ dtPrecision: fieldDef.datetime_precision,
44
+ arrayType: dataType === 'ARRAY' ? getTypeByUdtNamePg(fieldDef.udt_name) : undefined,
45
+ readOnly: fieldDef.is_generated === 'ALWAYS', // boolean;
46
+ };
47
+ Object.entries(fieldSchema).forEach(([prop, value]) => {
48
+ if (value == null) {
49
+ delete fieldSchema[prop];
50
+ }
51
+ });
52
+ columnsSchema[name] = fieldSchema;
53
+ });
54
+ return columnsSchema;
55
+ };
56
+ const getPrimaryKey = async (connectionId, commonSchemaAndTable) => {
57
+ const schemaTablePg = schemaTable.to.pg(commonSchemaAndTable);
58
+ const sql = `
59
+ SELECT a.attname as f
60
+ FROM pg_index i
61
+ JOIN pg_attribute a
62
+ ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
63
+ WHERE i.indrelid = '${schemaTablePg}'::regclass
64
+ AND i.indisprimary;`;
65
+ const result = await queryPg(connectionId, sql);
66
+ return (result?.rows || []).map(({ f }) => f);
67
+ };
68
+ const getUniqueConstraints = async (connectionId, commonSchemaAndTable) => {
69
+ const schemaTablePg = schemaTable.to.pg(commonSchemaAndTable);
70
+ const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
71
+ const sql = `
72
+ SELECT UI.cn as cn, UI.cols as cols, CASE WHEN UC.cn IS NULL THEN 'UX' ELSE 'UC' END AS typ
73
+ FROM (SELECT c.relname as cn, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
74
+ FROM pg_index i
75
+ JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
76
+ JOIN pg_class AS c ON c.oid = i.indexrelid
77
+ WHERE i.indrelid = '${schemaTablePg}'::regclass
78
+ AND i.indisunique
79
+ AND NOT i.indisprimary
80
+ GROUP BY c.relname) AS UI
81
+ LEFT OUTER JOIN (SELECT ccu.constraint_name AS cn
82
+ FROM information_schema.table_constraints tc
83
+ JOIN information_schema.constraint_column_usage AS ccu USING (constraint_schema, constraint_name)
84
+ JOIN information_schema.columns AS c ON c.table_schema = tc.constraint_schema
85
+ AND tc.table_name = c.table_name AND ccu.column_name = c.column_name
86
+ WHERE tc.table_schema = '${schema}'
87
+ AND tc.table_name = '${table}'
88
+ AND tc.constraint_type = 'UNIQUE'
89
+ GROUP BY ccu.constraint_name) AS UC ON UC.cn = UI.cn
90
+ ORDER BY CASE WHEN UC.cn IS NULL THEN 2 ELSE 1 END
91
+ `;
92
+ const result = await queryPg(connectionId, sql);
93
+ const uc = {};
94
+ result?.rows?.forEach(({ cn, cols }) => {
95
+ uc[cn] = cols;
96
+ });
97
+ return uc;
98
+ };
99
+ const getSerials = async (connectionId, commonSchemaAndTable) => {
100
+ const fqName = schemaTable.to.common(commonSchemaAndTable);
101
+ const sql = `
102
+ WITH fq_objects AS (SELECT c.oid,
103
+ n.nspname || '.' || c.relname AS fqname,
104
+ c.relkind,
105
+ c.relname AS relation
106
+ FROM pg_class c
107
+ JOIN pg_namespace n ON n.oid = c.relnamespace),
108
+ sequences AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'S'),
109
+ tables AS (SELECT oid, fqname FROM fq_objects WHERE relkind = 'r')
110
+ SELECT t.fqname AS tbl, array_to_json(array_agg(a.attname ORDER BY a.attname)) AS cols
111
+ FROM pg_depend d
112
+ JOIN sequences s ON s.oid = d.objid
113
+ JOIN tables t ON t.oid = d.refobjid
114
+ JOIN pg_attribute a ON a.attrelid = d.refobjid and a.attnum = d.refobjsubid
115
+ WHERE d.deptype = 'a'
116
+ AND t.fqname = '${fqName}'
117
+ GROUP BY t.fqname
118
+ `;
119
+ const result = await queryPg(connectionId, sql);
120
+ return result?.rows?.[0]?.cols || [];
121
+ };
122
+ export const getTableSchemaPg = async (connectionId, commonSchemaAndTable) => {
123
+ let tableSchema = tableSchemaHash[commonSchemaAndTable];
124
+ if (tableSchema) {
125
+ return tableSchema;
126
+ }
127
+ try {
128
+ const columnsSchema = await getColumnsSchemaPg_(connectionId, commonSchemaAndTable);
129
+ const pk = await getPrimaryKey(connectionId, commonSchemaAndTable);
130
+ const uc = await getUniqueConstraints(connectionId, commonSchemaAndTable);
131
+ const serialsFields = await getSerials(connectionId, commonSchemaAndTable);
132
+ const defaults = {};
133
+ Object.values(columnsSchema).forEach((fieldDef) => {
134
+ const { name: f = '', columnDefault, hasDefault } = fieldDef;
135
+ if (hasDefault && !serialsFields.includes(f)) {
136
+ defaults[f] = `${columnDefault}`;
137
+ }
138
+ });
139
+ const fieldsArray = Object.keys(columnsSchema);
140
+ const readOnlyFields = Object.values(columnsSchema).filter((s) => s.readOnly).map((s) => s.name);
141
+ const fieldsWoSerialsAndRO = fieldsArray.filter((f) => !serialsFields.includes(f) && !readOnlyFields.includes(f));
142
+ tableSchema = {
143
+ columnsSchema, pk, uc, defaults, serialsFields, fieldsArray, fieldsWoSerialsAndRO, readOnlyFields,
144
+ };
145
+ tableSchemaHash[commonSchemaAndTable] = tableSchema;
146
+ }
147
+ catch (err) {
148
+ logger.error(`Failed to get schema for table ${commonSchemaAndTable}`);
149
+ logger.error(err);
150
+ await graceExit();
151
+ }
152
+ return tableSchema;
153
+ };
154
+ export const getFieldsAndValuesPg = (record, columnsSchema) => {
155
+ const recordNormalized = {};
156
+ Object.entries(record).forEach(([f, v]) => {
157
+ const { dataType } = columnsSchema[f] || {};
158
+ if (!dataType) {
159
+ return;
160
+ }
161
+ if ((dataType === 'jsonb' || dataType === 'json') && Array.isArray(v)) {
162
+ recordNormalized[f] = JSON.stringify(v);
163
+ }
164
+ else {
165
+ recordNormalized[f] = v;
166
+ }
167
+ });
168
+ const fields = Object.keys(recordNormalized);
169
+ const fieldsList = fields.join(', ');
170
+ const values = Object.values(recordNormalized);
171
+ const positionsList = fields.map((__, i) => `$${++i}`).join(', ');
172
+ const setFields = fields.map((f, i) => `${f} = $${++i}`).join(', ');
173
+ const upsertFields = fields.map((f) => `${f} = EXCLUDED.${f}`).join(',\n');
174
+ return {
175
+ fields, fieldsList, values, positionsList, setFields, upsertFields,
176
+ };
177
+ };
178
+ //# sourceMappingURL=table-schema-pg.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"table-schema-pg.js","sourceRoot":"","sources":["../../../../src/pg/table-schema-pg.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,93 @@
1
+ export const getJsTypeByTypePg = (dataType, arrayType) => {
2
+ switch (dataType) {
3
+ case 'boolean':
4
+ return 'boolean';
5
+ case 'bigint':
6
+ return 'string | number';
7
+ case 'integer':
8
+ case 'numeric':
9
+ case 'real':
10
+ case 'smallint':
11
+ return 'number';
12
+ case 'text':
13
+ case 'character':
14
+ case 'varchar':
15
+ case 'uuid':
16
+ return 'string';
17
+ case 'json':
18
+ case 'jsonb':
19
+ return 'any';
20
+ case 'date':
21
+ case 'timestamptz':
22
+ case 'timestamp':
23
+ return 'string | Date | number';
24
+ case 'USER_DEFINED':
25
+ return 'string';
26
+ case 'ARRAY': {
27
+ const jsType = getJsTypeByTypePg(arrayType);
28
+ return `${jsType}[]`;
29
+ }
30
+ default:
31
+ return 'string';
32
+ }
33
+ };
34
+ const udtNames2TypeMap = {
35
+ _bit: 'bit',
36
+ _bool: 'bool',
37
+ _box: 'box',
38
+ _bytea: 'bytea',
39
+ _char: 'char',
40
+ _circle: 'circle',
41
+ _date: 'date',
42
+ _float4: 'real',
43
+ _float8: 'double precision',
44
+ _inet: 'inet',
45
+ _int2: 'smallint',
46
+ _int4: 'int',
47
+ _int8: 'bigint',
48
+ _interval: 'interval',
49
+ _lseg: 'lseg',
50
+ _macaddr: 'macaddr',
51
+ _money: 'money',
52
+ _numeric: 'numeric',
53
+ _path: 'path',
54
+ _point: 'point',
55
+ _polygon: 'polygon',
56
+ _text: 'text',
57
+ _time: 'time',
58
+ _timestamp: 'timestamp',
59
+ _timestamptz: 'timestamptz',
60
+ _timetz: 'timetz',
61
+ _uuid: 'uuid',
62
+ _varchar: 'varchar',
63
+ _xml: 'xml',
64
+ // _oid: 'oid',
65
+ // _abstime: 'abstime',
66
+ // _name: 'name',
67
+ };
68
+ export const getTypeByUdtNamePg = (udtName) => {
69
+ const dataType = udtNames2TypeMap[udtName];
70
+ return dataType || 'varchar';
71
+ };
72
+ const typeNormalizationMap = {
73
+ bool: 'boolean',
74
+ int2: 'smallint',
75
+ integer: 'int',
76
+ int4: 'int',
77
+ int8: 'bigint',
78
+ serial2: 'smallserial',
79
+ serial4: 'serial',
80
+ serial8: 'bigserial',
81
+ decimal: 'numeric',
82
+ float4: 'real',
83
+ float8: 'double precision',
84
+ character: 'char',
85
+ 'character varying': 'varchar',
86
+ 'timestamp with time zone': 'timestamptz',
87
+ 'timestamp without time zone': 'timestamp',
88
+ 'time without time zone': 'time',
89
+ 'time with time zone': 'timetz',
90
+ 'bit varying': 'varbit',
91
+ };
92
+ export const getNormalizedTypePg = (pgDataType) => typeNormalizationMap[pgDataType] || pgDataType;
93
+ //# sourceMappingURL=utils-pg.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils-pg.js","sourceRoot":"","sources":["../../../../src/pg/utils-pg.ts"],"names":[],"mappings":"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"}