@stamhoofd/sql 2.119.0 → 2.120.0

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 (272) hide show
  1. package/dist/{src/ModelCache.d.ts → ModelCache.d.ts} +1 -1
  2. package/dist/ModelCache.d.ts.map +1 -0
  3. package/{src/ModelCache.ts → dist/ModelCache.js} +8 -16
  4. package/dist/ModelCache.js.map +1 -0
  5. package/dist/{src/QueryableModel.d.ts → QueryableModel.d.ts} +7 -6
  6. package/dist/QueryableModel.d.ts.map +1 -0
  7. package/dist/{src/QueryableModel.js → QueryableModel.js} +9 -13
  8. package/dist/QueryableModel.js.map +1 -0
  9. package/dist/{src/SQL.d.ts → SQL.d.ts} +7 -5
  10. package/dist/SQL.d.ts.map +1 -0
  11. package/dist/SQL.js +100 -0
  12. package/dist/SQL.js.map +1 -0
  13. package/dist/{src/SQLDelete.d.ts → SQLDelete.d.ts} +2 -2
  14. package/dist/SQLDelete.d.ts.map +1 -0
  15. package/dist/{src/SQLDelete.js → SQLDelete.js} +8 -12
  16. package/dist/SQLDelete.js.map +1 -0
  17. package/dist/SQLExpression.d.ts.map +1 -0
  18. package/dist/{src/SQLExpression.js → SQLExpression.js} +3 -8
  19. package/dist/SQLExpression.js.map +1 -0
  20. package/dist/{src/SQLExpressions.d.ts → SQLExpressions.d.ts} +2 -2
  21. package/dist/SQLExpressions.d.ts.map +1 -0
  22. package/dist/{src/SQLExpressions.js → SQLExpressions.js} +78 -115
  23. package/dist/SQLExpressions.js.map +1 -0
  24. package/dist/{src/SQLInsert.d.ts → SQLInsert.d.ts} +3 -2
  25. package/dist/SQLInsert.d.ts.map +1 -0
  26. package/dist/{src/SQLInsert.js → SQLInsert.js} +17 -21
  27. package/dist/SQLInsert.js.map +1 -0
  28. package/dist/{src/SQLJoin.d.ts → SQLJoin.d.ts} +1 -1
  29. package/dist/SQLJoin.d.ts.map +1 -0
  30. package/{src/SQLJoin.ts → dist/SQLJoin.js} +15 -18
  31. package/dist/SQLJoin.js.map +1 -0
  32. package/dist/{src/SQLJsonExpressions.d.ts → SQLJsonExpressions.d.ts} +2 -2
  33. package/dist/SQLJsonExpressions.d.ts.map +1 -0
  34. package/dist/{src/SQLJsonExpressions.js → SQLJsonExpressions.js} +31 -44
  35. package/dist/SQLJsonExpressions.js.map +1 -0
  36. package/dist/SQLLogger.d.ts.map +1 -0
  37. package/dist/{src/SQLLogger.js → SQLLogger.js} +5 -8
  38. package/dist/SQLLogger.js.map +1 -0
  39. package/dist/{src/SQLOrderBy.d.ts → SQLOrderBy.d.ts} +1 -1
  40. package/dist/SQLOrderBy.d.ts.map +1 -0
  41. package/dist/{src/SQLOrderBy.js → SQLOrderBy.js} +8 -13
  42. package/dist/SQLOrderBy.js.map +1 -0
  43. package/dist/{src/SQLSelect.d.ts → SQLSelect.d.ts} +3 -3
  44. package/dist/SQLSelect.d.ts.map +1 -0
  45. package/dist/{src/SQLSelect.js → SQLSelect.js} +24 -29
  46. package/dist/SQLSelect.js.map +1 -0
  47. package/dist/{src/SQLTranslatedStringHelper.d.ts → SQLTranslatedStringHelper.d.ts} +3 -2
  48. package/dist/SQLTranslatedStringHelper.d.ts.map +1 -0
  49. package/dist/SQLTranslatedStringHelper.js +33 -0
  50. package/dist/SQLTranslatedStringHelper.js.map +1 -0
  51. package/dist/{src/SQLUpdate.d.ts → SQLUpdate.d.ts} +3 -2
  52. package/dist/SQLUpdate.d.ts.map +1 -0
  53. package/{src/SQLUpdate.ts → dist/SQLUpdate.js} +18 -35
  54. package/dist/SQLUpdate.js.map +1 -0
  55. package/dist/{src/SQLWhere.d.ts → SQLWhere.d.ts} +3 -3
  56. package/dist/SQLWhere.d.ts.map +1 -0
  57. package/dist/{src/SQLWhere.js → SQLWhere.js} +42 -56
  58. package/dist/SQLWhere.js.map +1 -0
  59. package/dist/{src/filters → filters}/SQLFilter.d.ts +5 -5
  60. package/dist/filters/SQLFilter.d.ts.map +1 -0
  61. package/{src/filters/SQLFilter.ts → dist/filters/SQLFilter.js} +55 -121
  62. package/dist/filters/SQLFilter.js.map +1 -0
  63. package/dist/{src/filters → filters}/SQLSorter.d.ts +6 -6
  64. package/dist/filters/SQLSorter.d.ts.map +1 -0
  65. package/dist/{src/filters → filters}/SQLSorter.js +4 -7
  66. package/dist/filters/SQLSorter.js.map +1 -0
  67. package/dist/filters/compilers/contains.d.ts +4 -0
  68. package/dist/filters/compilers/contains.d.ts.map +1 -0
  69. package/{src/filters/compilers/contains.ts → dist/filters/compilers/contains.js} +7 -25
  70. package/dist/filters/compilers/contains.js.map +1 -0
  71. package/dist/filters/compilers/equals.d.ts +4 -0
  72. package/dist/filters/compilers/equals.d.ts.map +1 -0
  73. package/dist/filters/compilers/equals.js +44 -0
  74. package/dist/filters/compilers/equals.js.map +1 -0
  75. package/dist/filters/compilers/greater.d.ts +4 -0
  76. package/dist/filters/compilers/greater.d.ts.map +1 -0
  77. package/dist/filters/compilers/greater.js +15 -0
  78. package/dist/filters/compilers/greater.js.map +1 -0
  79. package/dist/filters/compilers/in.d.ts +4 -0
  80. package/dist/filters/compilers/in.d.ts.map +1 -0
  81. package/{src/filters/compilers/in.ts → dist/filters/compilers/in.js} +7 -21
  82. package/dist/filters/compilers/in.js.map +1 -0
  83. package/dist/filters/compilers/index.d.ts.map +1 -0
  84. package/{src/filters/compilers/index.ts → dist/filters/compilers/index.js} +1 -0
  85. package/dist/filters/compilers/index.js.map +1 -0
  86. package/dist/filters/compilers/less.d.ts +4 -0
  87. package/dist/filters/compilers/less.d.ts.map +1 -0
  88. package/dist/filters/compilers/less.js +15 -0
  89. package/dist/filters/compilers/less.js.map +1 -0
  90. package/dist/filters/helpers/isJSONColumn.d.ts +5 -0
  91. package/dist/filters/helpers/isJSONColumn.d.ts.map +1 -0
  92. package/{src/filters/helpers/isJSONColumn.ts → dist/filters/helpers/isJSONColumn.js} +4 -5
  93. package/dist/filters/helpers/isJSONColumn.js.map +1 -0
  94. package/dist/{src/filters → filters}/helpers/normalizeCompareValue.d.ts +1 -1
  95. package/dist/filters/helpers/normalizeCompareValue.d.ts.map +1 -0
  96. package/{src/filters/helpers/normalizeCompareValue.ts → dist/filters/helpers/normalizeCompareValue.js} +2 -20
  97. package/dist/filters/helpers/normalizeCompareValue.js.map +1 -0
  98. package/dist/index.d.ts +14 -14
  99. package/dist/index.d.ts.map +1 -1
  100. package/dist/index.js +14 -25
  101. package/dist/index.js.map +1 -1
  102. package/package.json +6 -6
  103. package/dist/src/ModelCache.d.ts.map +0 -1
  104. package/dist/src/ModelCache.js +0 -57
  105. package/dist/src/ModelCache.js.map +0 -1
  106. package/dist/src/QueryableModel.d.ts.map +0 -1
  107. package/dist/src/QueryableModel.js.map +0 -1
  108. package/dist/src/SQL.d.ts.map +0 -1
  109. package/dist/src/SQL.js +0 -103
  110. package/dist/src/SQL.js.map +0 -1
  111. package/dist/src/SQLDelete.d.ts.map +0 -1
  112. package/dist/src/SQLDelete.js.map +0 -1
  113. package/dist/src/SQLExpression.d.ts.map +0 -1
  114. package/dist/src/SQLExpression.js.map +0 -1
  115. package/dist/src/SQLExpressions.d.ts.map +0 -1
  116. package/dist/src/SQLExpressions.js.map +0 -1
  117. package/dist/src/SQLInsert.d.ts.map +0 -1
  118. package/dist/src/SQLInsert.js.map +0 -1
  119. package/dist/src/SQLJoin.d.ts.map +0 -1
  120. package/dist/src/SQLJoin.js +0 -61
  121. package/dist/src/SQLJoin.js.map +0 -1
  122. package/dist/src/SQLJsonExpressions.d.ts.map +0 -1
  123. package/dist/src/SQLJsonExpressions.js.map +0 -1
  124. package/dist/src/SQLLogger.d.ts.map +0 -1
  125. package/dist/src/SQLLogger.js.map +0 -1
  126. package/dist/src/SQLOrderBy.d.ts.map +0 -1
  127. package/dist/src/SQLOrderBy.js.map +0 -1
  128. package/dist/src/SQLSelect.d.ts.map +0 -1
  129. package/dist/src/SQLSelect.js.map +0 -1
  130. package/dist/src/SQLTranslatedStringHelper.d.ts.map +0 -1
  131. package/dist/src/SQLTranslatedStringHelper.js +0 -37
  132. package/dist/src/SQLTranslatedStringHelper.js.map +0 -1
  133. package/dist/src/SQLUpdate.d.ts.map +0 -1
  134. package/dist/src/SQLUpdate.js +0 -60
  135. package/dist/src/SQLUpdate.js.map +0 -1
  136. package/dist/src/SQLWhere.d.ts.map +0 -1
  137. package/dist/src/SQLWhere.js.map +0 -1
  138. package/dist/src/filters/SQLFilter.d.ts.map +0 -1
  139. package/dist/src/filters/SQLFilter.js +0 -220
  140. package/dist/src/filters/SQLFilter.js.map +0 -1
  141. package/dist/src/filters/SQLSorter.d.ts.map +0 -1
  142. package/dist/src/filters/SQLSorter.js.map +0 -1
  143. package/dist/src/filters/compilers/contains.d.ts +0 -4
  144. package/dist/src/filters/compilers/contains.d.ts.map +0 -1
  145. package/dist/src/filters/compilers/contains.js +0 -29
  146. package/dist/src/filters/compilers/contains.js.map +0 -1
  147. package/dist/src/filters/compilers/equals.d.ts +0 -4
  148. package/dist/src/filters/compilers/equals.d.ts.map +0 -1
  149. package/dist/src/filters/compilers/equals.js +0 -47
  150. package/dist/src/filters/compilers/equals.js.map +0 -1
  151. package/dist/src/filters/compilers/greater.d.ts +0 -4
  152. package/dist/src/filters/compilers/greater.d.ts.map +0 -1
  153. package/dist/src/filters/compilers/greater.js +0 -18
  154. package/dist/src/filters/compilers/greater.js.map +0 -1
  155. package/dist/src/filters/compilers/in.d.ts +0 -4
  156. package/dist/src/filters/compilers/in.d.ts.map +0 -1
  157. package/dist/src/filters/compilers/in.js +0 -51
  158. package/dist/src/filters/compilers/in.js.map +0 -1
  159. package/dist/src/filters/compilers/index.d.ts.map +0 -1
  160. package/dist/src/filters/compilers/index.js +0 -8
  161. package/dist/src/filters/compilers/index.js.map +0 -1
  162. package/dist/src/filters/compilers/less.d.ts +0 -4
  163. package/dist/src/filters/compilers/less.d.ts.map +0 -1
  164. package/dist/src/filters/compilers/less.js +0 -18
  165. package/dist/src/filters/compilers/less.js.map +0 -1
  166. package/dist/src/filters/helpers/isJSONColumn.d.ts +0 -4
  167. package/dist/src/filters/helpers/isJSONColumn.d.ts.map +0 -1
  168. package/dist/src/filters/helpers/isJSONColumn.js +0 -17
  169. package/dist/src/filters/helpers/isJSONColumn.js.map +0 -1
  170. package/dist/src/filters/helpers/normalizeCompareValue.d.ts.map +0 -1
  171. package/dist/src/filters/helpers/normalizeCompareValue.js +0 -87
  172. package/dist/src/filters/helpers/normalizeCompareValue.js.map +0 -1
  173. package/dist/tests/filters/$and.test.d.ts +0 -2
  174. package/dist/tests/filters/$and.test.d.ts.map +0 -1
  175. package/dist/tests/filters/$and.test.js +0 -216
  176. package/dist/tests/filters/$and.test.js.map +0 -1
  177. package/dist/tests/filters/$contains.test.d.ts +0 -2
  178. package/dist/tests/filters/$contains.test.d.ts.map +0 -1
  179. package/dist/tests/filters/$contains.test.js +0 -917
  180. package/dist/tests/filters/$contains.test.js.map +0 -1
  181. package/dist/tests/filters/$eq.test.d.ts +0 -2
  182. package/dist/tests/filters/$eq.test.d.ts.map +0 -1
  183. package/dist/tests/filters/$eq.test.js +0 -1464
  184. package/dist/tests/filters/$eq.test.js.map +0 -1
  185. package/dist/tests/filters/$gt.test.d.ts +0 -2
  186. package/dist/tests/filters/$gt.test.d.ts.map +0 -1
  187. package/dist/tests/filters/$gt.test.js +0 -641
  188. package/dist/tests/filters/$gt.test.js.map +0 -1
  189. package/dist/tests/filters/$gte.test.d.ts +0 -2
  190. package/dist/tests/filters/$gte.test.d.ts.map +0 -1
  191. package/dist/tests/filters/$gte.test.js +0 -433
  192. package/dist/tests/filters/$gte.test.js.map +0 -1
  193. package/dist/tests/filters/$in.test.d.ts +0 -2
  194. package/dist/tests/filters/$in.test.d.ts.map +0 -1
  195. package/dist/tests/filters/$in.test.js +0 -773
  196. package/dist/tests/filters/$in.test.js.map +0 -1
  197. package/dist/tests/filters/$lt.test.d.ts +0 -2
  198. package/dist/tests/filters/$lt.test.d.ts.map +0 -1
  199. package/dist/tests/filters/$lt.test.js +0 -433
  200. package/dist/tests/filters/$lt.test.js.map +0 -1
  201. package/dist/tests/filters/$lte.test.d.ts +0 -2
  202. package/dist/tests/filters/$lte.test.d.ts.map +0 -1
  203. package/dist/tests/filters/$lte.test.js +0 -472
  204. package/dist/tests/filters/$lte.test.js.map +0 -1
  205. package/dist/tests/filters/$neq.test.d.ts +0 -2
  206. package/dist/tests/filters/$neq.test.d.ts.map +0 -1
  207. package/dist/tests/filters/$neq.test.js +0 -32
  208. package/dist/tests/filters/$neq.test.js.map +0 -1
  209. package/dist/tests/filters/$not.test.d.ts +0 -2
  210. package/dist/tests/filters/$not.test.d.ts.map +0 -1
  211. package/dist/tests/filters/$not.test.js +0 -50
  212. package/dist/tests/filters/$not.test.js.map +0 -1
  213. package/dist/tests/filters/$or.test.d.ts +0 -2
  214. package/dist/tests/filters/$or.test.d.ts.map +0 -1
  215. package/dist/tests/filters/$or.test.js +0 -185
  216. package/dist/tests/filters/$or.test.js.map +0 -1
  217. package/dist/tests/filters/SQLTranslatedStringHelper.test.d.ts +0 -2
  218. package/dist/tests/filters/SQLTranslatedStringHelper.test.d.ts.map +0 -1
  219. package/dist/tests/filters/SQLTranslatedStringHelper.test.js +0 -491
  220. package/dist/tests/filters/SQLTranslatedStringHelper.test.js.map +0 -1
  221. package/dist/tests/filters/dot-syntax.test.d.ts +0 -2
  222. package/dist/tests/filters/dot-syntax.test.d.ts.map +0 -1
  223. package/dist/tests/filters/dot-syntax.test.js +0 -210
  224. package/dist/tests/filters/dot-syntax.test.js.map +0 -1
  225. package/dist/tests/filters/exists.test.d.ts +0 -2
  226. package/dist/tests/filters/exists.test.d.ts.map +0 -1
  227. package/dist/tests/filters/exists.test.js +0 -96
  228. package/dist/tests/filters/exists.test.js.map +0 -1
  229. package/dist/tests/filters/joined-relations.test.d.ts +0 -2
  230. package/dist/tests/filters/joined-relations.test.d.ts.map +0 -1
  231. package/dist/tests/filters/joined-relations.test.js +0 -167
  232. package/dist/tests/filters/joined-relations.test.js.map +0 -1
  233. package/dist/tests/filters/special-cases.test.d.ts +0 -2
  234. package/dist/tests/filters/special-cases.test.d.ts.map +0 -1
  235. package/dist/tests/filters/special-cases.test.js +0 -114
  236. package/dist/tests/filters/special-cases.test.js.map +0 -1
  237. package/dist/tests/filters/wildcard.test.d.ts +0 -2
  238. package/dist/tests/filters/wildcard.test.d.ts.map +0 -1
  239. package/dist/tests/filters/wildcard.test.js +0 -67
  240. package/dist/tests/filters/wildcard.test.js.map +0 -1
  241. package/dist/tests/jest.global.setup.d.ts +0 -3
  242. package/dist/tests/jest.global.setup.d.ts.map +0 -1
  243. package/dist/tests/jest.global.setup.js +0 -7
  244. package/dist/tests/jest.global.setup.js.map +0 -1
  245. package/dist/tests/jest.setup.d.ts +0 -2
  246. package/dist/tests/jest.setup.d.ts.map +0 -1
  247. package/dist/tests/jest.setup.js +0 -5
  248. package/dist/tests/jest.setup.js.map +0 -1
  249. package/dist/tests/utils/index.d.ts +0 -57
  250. package/dist/tests/utils/index.d.ts.map +0 -1
  251. package/dist/tests/utils/index.js +0 -206
  252. package/dist/tests/utils/index.js.map +0 -1
  253. package/dist/tsconfig.tsbuildinfo +0 -1
  254. package/src/QueryableModel.ts +0 -134
  255. package/src/SQL.ts +0 -128
  256. package/src/SQLDelete.ts +0 -73
  257. package/src/SQLExpression.ts +0 -34
  258. package/src/SQLExpressions.ts +0 -587
  259. package/src/SQLInsert.ts +0 -113
  260. package/src/SQLJsonExpressions.ts +0 -283
  261. package/src/SQLLogger.ts +0 -82
  262. package/src/SQLOrderBy.ts +0 -69
  263. package/src/SQLSelect.ts +0 -520
  264. package/src/SQLTranslatedStringHelper.ts +0 -40
  265. package/src/SQLWhere.ts +0 -744
  266. package/src/filters/SQLSorter.ts +0 -60
  267. package/src/filters/compilers/equals.ts +0 -73
  268. package/src/filters/compilers/greater.ts +0 -21
  269. package/src/filters/compilers/less.ts +0 -20
  270. /package/dist/{src/SQLExpression.d.ts → SQLExpression.d.ts} +0 -0
  271. /package/dist/{src/SQLLogger.d.ts → SQLLogger.d.ts} +0 -0
  272. /package/dist/{src/filters → filters}/compilers/index.d.ts +0 -0
@@ -1,114 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const SQLFilter_js_1 = require("../../src/filters/SQLFilter.js");
4
- const SQL_js_1 = require("../../src/SQL.js");
5
- const index_js_1 = require("../utils/index.js");
6
- describe('Special filter cases', () => {
7
- it('Can combine $and with $or', async () => {
8
- const filters = {
9
- ...SQLFilter_js_1.baseSQLFilterCompilers,
10
- name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('name'), type: SQLFilter_js_1.SQLValueType.String, nullable: false }),
11
- age: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('age'), type: SQLFilter_js_1.SQLValueType.Number, nullable: false }),
12
- };
13
- await (0, index_js_1.test)({
14
- filter: [
15
- {
16
- $or: {
17
- name: 'John Doe',
18
- age: 11,
19
- },
20
- },
21
- {
22
- $and: [
23
- {
24
- age: 12,
25
- },
26
- {
27
- name: 'Jane Doe',
28
- },
29
- ],
30
- },
31
- ],
32
- filters,
33
- query: {
34
- query: '(`default`.`name` = ? OR `default`.`age` = ?) AND `default`.`age` = ? AND `default`.`name` = ?',
35
- params: [
36
- 'john doe',
37
- 11,
38
- 12,
39
- 'jane doe',
40
- ],
41
- },
42
- });
43
- });
44
- it('Cannot filter on unknown columns', async () => {
45
- const filters = {
46
- ...SQLFilter_js_1.baseSQLFilterCompilers,
47
- };
48
- await (0, index_js_1.testError)({
49
- filter: {
50
- name: 'John Doe',
51
- },
52
- filters,
53
- error: 'Unknown filter name',
54
- });
55
- });
56
- it('Cannot stack column filters', async () => {
57
- const filters = {
58
- ...SQLFilter_js_1.baseSQLFilterCompilers,
59
- name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('name'), type: SQLFilter_js_1.SQLValueType.String, nullable: false }),
60
- age: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('age'), type: SQLFilter_js_1.SQLValueType.Number, nullable: false }),
61
- };
62
- await (0, index_js_1.testError)({
63
- filter: {
64
- name: {
65
- age: 12,
66
- },
67
- },
68
- filters,
69
- error: 'Unknown filter age',
70
- });
71
- });
72
- describe('Empty filters', () => {
73
- it('an empty object filter is always true', async () => {
74
- const filters = {
75
- ...SQLFilter_js_1.baseSQLFilterCompilers,
76
- };
77
- await (0, index_js_1.test)({
78
- filter: {},
79
- filters,
80
- query: {
81
- query: 'true',
82
- params: [],
83
- },
84
- });
85
- });
86
- it('an empty array filter is always true', async () => {
87
- const filters = {
88
- ...SQLFilter_js_1.baseSQLFilterCompilers,
89
- };
90
- await (0, index_js_1.test)({
91
- filter: [],
92
- filters,
93
- query: {
94
- query: 'true',
95
- params: [],
96
- },
97
- });
98
- });
99
- it('a null filter is always true', async () => {
100
- const filters = {
101
- ...SQLFilter_js_1.baseSQLFilterCompilers,
102
- };
103
- await (0, index_js_1.test)({
104
- filter: null,
105
- filters,
106
- query: {
107
- query: 'true',
108
- params: [],
109
- },
110
- });
111
- });
112
- });
113
- });
114
- //# sourceMappingURL=special-cases.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"special-cases.test.js","sourceRoot":"","sources":["../../../tests/filters/special-cases.test.ts"],"names":[],"mappings":"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"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=wildcard.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"wildcard.test.d.ts","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":""}
@@ -1,67 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const SQLFilter_js_1 = require("../../src/filters/SQLFilter.js");
4
- const SQL_js_1 = require("../../src/SQL.js");
5
- const index_js_1 = require("../utils/index.js");
6
- describe('Wildcards', () => {
7
- const filters = {
8
- ...SQLFilter_js_1.baseSQLFilterCompilers,
9
- name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('name'), type: SQLFilter_js_1.SQLValueType.String, nullable: true }),
10
- age: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.column('age'), type: SQLFilter_js_1.SQLValueType.Number, nullable: false }),
11
- settings: {
12
- ...SQLFilter_js_1.baseSQLFilterCompilers,
13
- records: (0, SQLFilter_js_1.createWildcardColumnFilter)((key) => ({ expression: SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.column('settings'), '$.records'), '$.' + key, true), type: SQLFilter_js_1.SQLValueType.JSONObject, nullable: true }), (key) => ({
14
- ...SQLFilter_js_1.baseSQLFilterCompilers,
15
- name: (0, SQLFilter_js_1.createColumnFilter)({ expression: SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.jsonExtract(SQL_js_1.SQL.column('settings'), '$.records'), '$.' + key, true), '$.name'), type: SQLFilter_js_1.SQLValueType.JSONString, nullable: true }),
16
- })),
17
- },
18
- };
19
- it('Correctly finds the right filter when using object syntax', async () => {
20
- await (0, index_js_1.test)({
21
- filter: [
22
- {
23
- settings: {
24
- records: {
25
- a: {
26
- name: {
27
- $eq: 'Rex',
28
- },
29
- },
30
- },
31
- },
32
- },
33
- ],
34
- filters,
35
- query: {
36
- query: 'JSON_VALUE(JSON_EXTRACT(JSON_EXTRACT(`default`.`settings`,"$.records"),?),"$.name" RETURNING CHAR CHARACTER SET utf8mb4 NULL ON ERROR) <=> ?',
37
- params: [
38
- '$.a',
39
- 'rex',
40
- ],
41
- },
42
- });
43
- });
44
- it('Can support this', async () => {
45
- await (0, index_js_1.test)({
46
- filter: [
47
- {
48
- settings: {
49
- records: {
50
- a: {
51
- $neq: null,
52
- },
53
- },
54
- },
55
- },
56
- ],
57
- filters,
58
- query: {
59
- query: 'JSON_VALUE(JSON_EXTRACT(`default`.`settings`,"$.records"),? NULL ON ERROR) IS NOT NULL',
60
- params: [
61
- '$.a',
62
- ],
63
- },
64
- });
65
- });
66
- });
67
- //# sourceMappingURL=wildcard.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"wildcard.test.js","sourceRoot":"","sources":["../../../tests/filters/wildcard.test.ts"],"names":[],"mappings":";;AAAA,iEAA4J;AAC5J,6CAAuC;AACvC,gDAAyC;AAEzC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,MAAM,OAAO,GAAyB;QAClC,GAAG,qCAAsB;QACzB,IAAI,EAAE,IAAA,iCAAkB,EAAC,EAAE,UAAU,EAAE,YAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACvG,GAAG,EAAE,IAAA,iCAAkB,EAAC,EAAE,UAAU,EAAE,YAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACtG,QAAQ,EAAE;YACN,GAAG,qCAAsB;YACzB,OAAO,EAAE,IAAA,yCAA0B,EAC/B,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EACzK,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC;gBACd,GAAG,qCAAsB;gBACzB,IAAI,EAAE,IAAA,iCAAkB,EAAC,EAAE,UAAU,EAAE,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,WAAW,CAAC,YAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,2BAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC9M,CAAC,CACL;SACJ;KACJ,CAAC;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACvE,MAAM,IAAA,eAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE;oCACF,GAAG,EAAE,KAAK;iCACb;6BACJ;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,8IAA8I;gBACrJ,MAAM,EAAE;oBACJ,KAAK;oBACL,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,IAAA,eAAI,EAAC;YACP,MAAM,EAAE;gBACJ;oBACI,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL,CAAC,EAAE;gCACC,IAAI,EAAE,IAAI;6BACb;yBACJ;qBACJ;iBACJ;aACJ;YACD,OAAO;YACP,KAAK,EAAE;gBACH,KAAK,EAAE,wFAAwF;gBAC/F,MAAM,EAAE;oBACJ,KAAK;iBACR;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
@@ -1,3 +0,0 @@
1
- declare const _default: () => Promise<void>;
2
- export default _default;
3
- //# sourceMappingURL=jest.global.setup.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"jest.global.setup.d.ts","sourceRoot":"","sources":["../../tests/jest.global.setup.ts"],"names":[],"mappings":";AAEA,wBAEE"}
@@ -1,7 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const test_utils_1 = require("@stamhoofd/test-utils");
4
- exports.default = async () => {
5
- await test_utils_1.TestUtils.globalSetup();
6
- };
7
- //# sourceMappingURL=jest.global.setup.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"jest.global.setup.js","sourceRoot":"","sources":["../../tests/jest.global.setup.ts"],"names":[],"mappings":";;AAAA,sDAAkD;AAElD,kBAAe,KAAK,IAAI,EAAE;IACtB,MAAM,sBAAS,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=jest.setup.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../tests/jest.setup.ts"],"names":[],"mappings":""}
@@ -1,5 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const test_utils_1 = require("@stamhoofd/test-utils");
4
- test_utils_1.TestUtils.setup();
5
- //# sourceMappingURL=jest.setup.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"jest.setup.js","sourceRoot":"","sources":["../../tests/jest.setup.ts"],"names":[],"mappings":";;AAAA,sDAAkD;AAElD,sBAAS,CAAC,KAAK,EAAE,CAAC"}
@@ -1,57 +0,0 @@
1
- import { PlainObject } from '@simonbackx/simple-encoding';
2
- import { StamhoofdFilter } from '@stamhoofd/structures';
3
- import { SQLFilterDefinitions } from '../../src/filters/SQLFilter.js';
4
- import { SQLQuery } from '../../src/SQLExpression.js';
5
- import { SQLScalarValue } from '../../src/SQLExpressions.js';
6
- export declare function testError({ filter, filters, error }: {
7
- filter: StamhoofdFilter;
8
- filters: SQLFilterDefinitions;
9
- error: string;
10
- }): Promise<void>;
11
- /**
12
- * Only compares the WHERE clause of the query.
13
- */
14
- export declare function test({ filter, filters, query }: {
15
- filter: StamhoofdFilter;
16
- filters: SQLFilterDefinitions;
17
- query: SQLQuery;
18
- }): Promise<void>;
19
- /**
20
- * Use to also test joins. This will use `test_table` as the table name in your query.
21
- */
22
- export declare function testSelect({ filter, filters, query }: {
23
- filter: StamhoofdFilter;
24
- filters: SQLFilterDefinitions;
25
- query: SQLQuery;
26
- }): Promise<void>;
27
- export declare function testMultiple({ testFilters, filters, query }: {
28
- testFilters: StamhoofdFilter[];
29
- filters: SQLFilterDefinitions;
30
- query: SQLQuery;
31
- }): Promise<void>;
32
- export declare function testMultipleErrors({ testFilters, filters, error }: {
33
- testFilters: StamhoofdFilter[];
34
- filters: SQLFilterDefinitions;
35
- error: string;
36
- }): Promise<void>;
37
- export declare function doesQueryMatch(query: SQLQuery, withQuery: SQLQuery): void;
38
- export type TableDefinition = Record<string, {
39
- type: 'varchar' | 'test' | 'json' | 'datetime' | 'int' | 'int unsigned';
40
- nullable?: boolean;
41
- }>;
42
- export declare function createTableDefinition(tableName: string, definition: TableDefinition): string;
43
- /**
44
- * Tests actual MySQL behaviour, for complex queries that depend on MySQL behaviour.
45
- *
46
- * Creates a table, inserts a row with provided data. Then runs a query with the provided filter and checks if the row matches the expected query.
47
- *
48
- * Snapshots the query.
49
- */
50
- export declare function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }: {
51
- doMatch?: StamhoofdFilter[];
52
- doNotMatch?: StamhoofdFilter[];
53
- tableDefinition: TableDefinition;
54
- rows: Record<string, SQLScalarValue | null | PlainObject>[];
55
- filters: SQLFilterDefinitions;
56
- }): Promise<void>;
57
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAE1F,OAAO,EAAsB,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,wBAAsB,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAIpI;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAiBjI;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAqBvI;AAED,wBAAsB,YAAY,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,iBAQrJ;AAED,wBAAsB,kBAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,iBAQzJ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,QASlE;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,KAAK,GAAG,cAAc,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE9I,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,GAAG,MAAM,CAM5F;AAmBD;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,iBAoGrR"}
@@ -1,206 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.testError = testError;
4
- exports.test = test;
5
- exports.testSelect = testSelect;
6
- exports.testMultiple = testMultiple;
7
- exports.testMultipleErrors = testMultipleErrors;
8
- exports.doesQueryMatch = doesQueryMatch;
9
- exports.createTableDefinition = createTableDefinition;
10
- exports.testMatch = testMatch;
11
- const simple_database_1 = require("@simonbackx/simple-database");
12
- const test_utils_1 = require("@stamhoofd/test-utils");
13
- const SQLFilter_js_1 = require("../../src/filters/SQLFilter.js");
14
- const SQL_js_1 = require("../../src/SQL.js");
15
- const SQLWhere_js_1 = require("../../src/SQLWhere.js");
16
- async function testError({ filter, filters, error }) {
17
- await expect((0, SQLFilter_js_1.compileToSQLFilter)(filter, filters)).rejects.toThrow(error);
18
- }
19
- /**
20
- * Only compares the WHERE clause of the query.
21
- */
22
- async function test({ filter, filters, query }) {
23
- const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
24
- if (where.isAlways === false) {
25
- doesQueryMatch('', query);
26
- return;
27
- }
28
- if (where.isAlways === true) {
29
- doesQueryMatch('true', query);
30
- return;
31
- }
32
- const sql = where.getSQL({
33
- defaultNamespace: 'default',
34
- parentNamespace: 'parent',
35
- });
36
- doesQueryMatch(sql, query);
37
- }
38
- /**
39
- * Use to also test joins. This will use `test_table` as the table name in your query.
40
- */
41
- async function testSelect({ filter, filters, query }) {
42
- const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
43
- if (where.isAlways === false) {
44
- doesQueryMatch('', query);
45
- return;
46
- }
47
- const select = SQL_js_1.SQL.select().from('test_table').where(where);
48
- let sql;
49
- try {
50
- sql = select.getSQL();
51
- }
52
- catch (e) {
53
- console.error('Error in testSelect:', e);
54
- console.error('testSelect', select, where, (where instanceof SQLWhere_js_1.SQLWhereAnd ? where.children : where));
55
- throw e;
56
- }
57
- doesQueryMatch(sql, query);
58
- }
59
- async function testMultiple({ testFilters, filters, query }) {
60
- for (const filter of testFilters) {
61
- await test({
62
- filter,
63
- filters,
64
- query,
65
- });
66
- }
67
- }
68
- async function testMultipleErrors({ testFilters, filters, error }) {
69
- for (const filter of testFilters) {
70
- await testError({
71
- filter,
72
- filters,
73
- error,
74
- });
75
- }
76
- }
77
- function doesQueryMatch(query, withQuery) {
78
- const str1 = typeof query === 'string' ? query : query.query;
79
- const str2 = typeof withQuery === 'string' ? withQuery : withQuery.query;
80
- const params1 = typeof query === 'string' ? [] : query.params;
81
- const params2 = typeof withQuery === 'string' ? [] : withQuery.params;
82
- expect(str1).toBe(str2);
83
- expect(params1).toEqual(params2);
84
- }
85
- function createTableDefinition(tableName, definition) {
86
- const columns = Object.entries(definition).map(([name, { type, nullable }]) => {
87
- const stringType = type === 'varchar' ? 'VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci' : type;
88
- return `\`${name}\` ${stringType}${nullable ? '' : ' NOT NULL'}`;
89
- }).join(',\n');
90
- return `CREATE TABLE \`${tableName}\` (\n${columns}\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;`;
91
- }
92
- let didAdd = false;
93
- function closeDatabaseAfterTests() {
94
- if (didAdd) {
95
- return;
96
- }
97
- didAdd = true;
98
- test_utils_1.TestUtils.addAfterAll(async () => {
99
- try {
100
- await simple_database_1.Database.end();
101
- }
102
- catch (error) {
103
- console.error('Failed to close database connection after tests:', error);
104
- }
105
- });
106
- }
107
- /**
108
- * Tests actual MySQL behaviour, for complex queries that depend on MySQL behaviour.
109
- *
110
- * Creates a table, inserts a row with provided data. Then runs a query with the provided filter and checks if the row matches the expected query.
111
- *
112
- * Snapshots the query.
113
- */
114
- async function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }) {
115
- const tableName = 'test_table_' + Math.random().toString(36).substring(2, 15);
116
- const createTableSQL = createTableDefinition(tableName, tableDefinition);
117
- closeDatabaseAfterTests();
118
- try {
119
- await simple_database_1.Database.statement(createTableSQL);
120
- }
121
- catch (error) {
122
- console.error('Failed to create test table:', error);
123
- throw error;
124
- }
125
- // Insert test rows
126
- for (const row of rows) {
127
- const mappedValues = {};
128
- for (const [key, value] of Object.entries(row)) {
129
- if (value === null) {
130
- mappedValues[key] = null;
131
- }
132
- else if (typeof value === 'object' && !(value instanceof Date)) {
133
- mappedValues[key] = JSON.stringify(value);
134
- }
135
- else {
136
- mappedValues[key] = value;
137
- }
138
- }
139
- try {
140
- await simple_database_1.Database.insert('INSERT INTO `' + tableName + '` SET ?', [mappedValues]);
141
- }
142
- catch (insertError) {
143
- console.error('Failed to insert row:', insertError, row);
144
- throw insertError;
145
- }
146
- }
147
- // Run queries
148
- try {
149
- for (const filter of doMatch ?? []) {
150
- const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
151
- const select = SQL_js_1.SQL.select().from(tableName).where(where);
152
- let results;
153
- try {
154
- results = await select.fetch();
155
- }
156
- catch (e) {
157
- console.error('SQL error for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), e);
158
- throw e;
159
- }
160
- if (results.length !== rows.length) {
161
- console.error('Unexpected results for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), results);
162
- }
163
- expect(results).toHaveLength(rows.length);
164
- const query = select.getSQL();
165
- expect({
166
- query: query.query.replaceAll('`' + tableName + '`', '`test_table`'),
167
- params: query.params,
168
- }).toMatchSnapshot('SQL Query for filter: ' + JSON.stringify(filter));
169
- }
170
- for (const filter of doNotMatch ?? []) {
171
- const where = await (0, SQLFilter_js_1.compileToSQLFilter)(filter, filters);
172
- const select = SQL_js_1.SQL.select().from(tableName).where(where);
173
- let results;
174
- try {
175
- results = await select.fetch();
176
- }
177
- catch (e) {
178
- console.error('SQL error for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), e);
179
- throw e;
180
- }
181
- if (results.length > 0) {
182
- console.error('Unexpected results for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), results);
183
- }
184
- expect(results).toHaveLength(0);
185
- if (!select._where || !select._where.isAlwaysFalse) {
186
- const query = select.getSQL();
187
- expect({
188
- query: query.query.replaceAll('`' + tableName + '`', '`test_table`'),
189
- params: query.params,
190
- }).toMatchSnapshot('SQL Query for not match filter: ' + JSON.stringify(filter));
191
- }
192
- else {
193
- expect('always false').toMatchSnapshot('SQL Query for not match filter: ' + JSON.stringify(filter));
194
- }
195
- }
196
- }
197
- finally {
198
- try {
199
- await simple_database_1.Database.statement(`DROP TABLE IF EXISTS \`${tableName}\``);
200
- }
201
- catch (dropError) {
202
- console.error('Failed to drop table after error:', dropError);
203
- }
204
- }
205
- }
206
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"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"}
@@ -1 +0,0 @@
1
- {"root":["../src/modelcache.ts","../src/queryablemodel.ts","../src/sql.ts","../src/sqldelete.ts","../src/sqlexpression.ts","../src/sqlexpressions.ts","../src/sqlinsert.ts","../src/sqljoin.ts","../src/sqljsonexpressions.ts","../src/sqllogger.ts","../src/sqlorderby.ts","../src/sqlselect.ts","../src/sqltranslatedstringhelper.ts","../src/sqlupdate.ts","../src/sqlwhere.ts","../src/filters/sqlfilter.ts","../src/filters/sqlsorter.ts","../src/filters/compilers/contains.ts","../src/filters/compilers/equals.ts","../src/filters/compilers/greater.ts","../src/filters/compilers/in.ts","../src/filters/compilers/index.ts","../src/filters/compilers/less.ts","../src/filters/helpers/isjsoncolumn.ts","../src/filters/helpers/normalizecomparevalue.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../tests/filters/$and.test.ts","../tests/filters/$contains.test.ts","../tests/filters/$eq.test.ts","../tests/filters/$gt.test.ts","../tests/filters/$gte.test.ts","../tests/filters/$in.test.ts","../tests/filters/$lt.test.ts","../tests/filters/$lte.test.ts","../tests/filters/$neq.test.ts","../tests/filters/$not.test.ts","../tests/filters/$or.test.ts","../tests/filters/sqltranslatedstringhelper.test.ts","../tests/filters/dot-syntax.test.ts","../tests/filters/exists.test.ts","../tests/filters/joined-relations.test.ts","../tests/filters/special-cases.test.ts","../tests/filters/wildcard.test.ts","../tests/utils/index.ts","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.8.3"}