@oino-ts/db 0.0.17 → 0.1.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 (44) hide show
  1. package/README.md +4 -7
  2. package/dist/cjs/OINODb.js +132 -1
  3. package/dist/cjs/OINODbApi.js +15 -12
  4. package/dist/cjs/OINODbDataField.js +7 -1
  5. package/dist/cjs/OINODbDataModel.js +1 -1
  6. package/dist/cjs/OINODbFactory.js +0 -356
  7. package/dist/cjs/OINODbModelSet.js +1 -1
  8. package/dist/cjs/OINODbParser.js +466 -0
  9. package/dist/cjs/OINODbRequestParams.js +24 -18
  10. package/dist/cjs/OINODbSqlParams.js +336 -0
  11. package/dist/cjs/index.js +26 -25
  12. package/dist/esm/OINODb.js +129 -0
  13. package/dist/esm/OINODbApi.js +15 -12
  14. package/dist/esm/OINODbDataField.js +7 -1
  15. package/dist/esm/OINODbDataModel.js +2 -2
  16. package/dist/esm/OINODbFactory.js +1 -357
  17. package/dist/esm/OINODbModelSet.js +1 -1
  18. package/dist/esm/OINODbParser.js +462 -0
  19. package/dist/esm/OINODbRequestParams.js +24 -18
  20. package/dist/esm/OINODbSqlParams.js +330 -0
  21. package/dist/esm/index.js +5 -5
  22. package/package.json +4 -3
  23. package/src/OINODb.ts +163 -1
  24. package/src/OINODbApi.test.ts +182 -44
  25. package/src/OINODbApi.ts +16 -14
  26. package/src/OINODbDataField.ts +7 -2
  27. package/src/OINODbDataModel.ts +1 -1
  28. package/src/OINODbFactory.ts +1 -358
  29. package/src/OINODbModelSet.ts +1 -1
  30. package/src/OINODbParser.ts +458 -0
  31. package/src/{OINODbRequestParams.ts → OINODbSqlParams.ts} +24 -16
  32. package/src/index.ts +6 -6
  33. package/dist/types/OINODb.d.ts +0 -86
  34. package/dist/types/OINODbApi.d.ts +0 -82
  35. package/dist/types/OINODbConfig.d.ts +0 -52
  36. package/dist/types/OINODbDataField.d.ts +0 -202
  37. package/dist/types/OINODbDataModel.d.ts +0 -108
  38. package/dist/types/OINODbDataSet.d.ts +0 -95
  39. package/dist/types/OINODbFactory.d.ts +0 -63
  40. package/dist/types/OINODbModelSet.d.ts +0 -51
  41. package/dist/types/OINODbRequestParams.d.ts +0 -146
  42. package/dist/types/OINODbSwagger.d.ts +0 -25
  43. package/dist/types/index.d.ts +0 -111
  44. package/src/OINODbDataSet.ts +0 -167
@@ -0,0 +1,466 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ */
7
+ Object.defineProperty(exports, "__esModule", { value: true });
8
+ exports.OINODbParser = void 0;
9
+ const index_js_1 = require("./index.js");
10
+ /**
11
+ * Static factory class for easily creating things based on data
12
+ *
13
+ */
14
+ class OINODbParser {
15
+ /**
16
+ * Create data rows from request body based on the datamodel.
17
+ *
18
+ * @param datamodel datamodel of the api
19
+ * @param data data as a string or Buffer or object
20
+ * @param requestParams parameters
21
+ *
22
+ */
23
+ static createRows(datamodel, data, requestParams) {
24
+ let result = [];
25
+ if (typeof data == "string") {
26
+ result = this.createRowsFromText(datamodel, data, requestParams);
27
+ }
28
+ else if (data instanceof Buffer) {
29
+ result = this.createRowsFromBlob(datamodel, data, requestParams);
30
+ }
31
+ else if (typeof data == "object") {
32
+ result = [this.createRowFromObject(datamodel, data)];
33
+ }
34
+ return result;
35
+ }
36
+ /**
37
+ * Create data rows from request body based on the datamodel.
38
+ *
39
+ * @param datamodel datamodel of the api
40
+ * @param data data as a string
41
+ * @param requestParams parameters
42
+ *
43
+ */
44
+ static createRowsFromText(datamodel, data, requestParams) {
45
+ if ((requestParams.requestType == index_js_1.OINOContentType.json) || (requestParams.requestType == undefined)) {
46
+ return this._createRowFromJson(datamodel, data);
47
+ }
48
+ else if (requestParams.requestType == index_js_1.OINOContentType.csv) {
49
+ return this._createRowFromCsv(datamodel, data);
50
+ }
51
+ else if (requestParams.requestType == index_js_1.OINOContentType.formdata) {
52
+ return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), requestParams.multipartBoundary || "");
53
+ }
54
+ else if (requestParams.requestType == index_js_1.OINOContentType.urlencode) {
55
+ return this._createRowFromUrlencoded(datamodel, data);
56
+ }
57
+ else if (requestParams.requestType == index_js_1.OINOContentType.html) {
58
+ index_js_1.OINOLog.error("HTML can't be used as an input content type!", { contentType: index_js_1.OINOContentType.html });
59
+ return [];
60
+ }
61
+ else {
62
+ index_js_1.OINOLog.error("Unrecognized input content type!", { contentType: requestParams.requestType });
63
+ return [];
64
+ }
65
+ }
66
+ /**
67
+ * Create data rows from request body based on the datamodel.
68
+ *
69
+ * @param datamodel datamodel of the api
70
+ * @param data data as an Buffer
71
+ * @param requestParams parameters
72
+ *
73
+ */
74
+ static createRowsFromBlob(datamodel, data, requestParams) {
75
+ if ((requestParams.requestType == index_js_1.OINOContentType.json) || (requestParams.requestType == undefined)) {
76
+ return this._createRowFromJson(datamodel, data.toString()); // JSON is always a string
77
+ }
78
+ else if (requestParams.requestType == index_js_1.OINOContentType.csv) {
79
+ return this._createRowFromCsv(datamodel, data.toString()); // binary data has to be base64 encoded so it's a string
80
+ }
81
+ else if (requestParams.requestType == index_js_1.OINOContentType.formdata) {
82
+ return this._createRowFromFormdata(datamodel, data, requestParams.multipartBoundary || "");
83
+ }
84
+ else if (requestParams.requestType == index_js_1.OINOContentType.urlencode) {
85
+ return this._createRowFromUrlencoded(datamodel, data.toString()); // data is urlencoded so it's a string
86
+ }
87
+ else if (requestParams.requestType == index_js_1.OINOContentType.html) {
88
+ index_js_1.OINOLog.error("HTML can't be used as an input content type!", { contentType: index_js_1.OINOContentType.html });
89
+ return [];
90
+ }
91
+ else {
92
+ index_js_1.OINOLog.error("Unrecognized input content type!", { contentType: requestParams.requestType });
93
+ return [];
94
+ }
95
+ }
96
+ /**
97
+ * Create one data row from javascript object based on the datamodel.
98
+ * NOTE! Data assumed to be unserialized i.e. of the native type (string, number, boolean, Buffer)
99
+ *
100
+ * @param datamodel datamodel of the api
101
+ * @param data data as javascript object
102
+ *
103
+ */
104
+ static createRowFromObject(datamodel, data) {
105
+ const fields = datamodel.fields;
106
+ let result = new Array(fields.length);
107
+ for (let i = 0; i < fields.length; i++) {
108
+ result[i] = data[fields[i].name];
109
+ }
110
+ return result;
111
+ }
112
+ static _findCsvLineEnd(csvData, start) {
113
+ const n = csvData.length;
114
+ if (start >= n) {
115
+ return start;
116
+ }
117
+ let end = start;
118
+ let quote_open = false;
119
+ while (end < n) {
120
+ if (csvData[end] == "\"") {
121
+ if (!quote_open) {
122
+ quote_open = true;
123
+ }
124
+ else if ((end < n - 1) && (csvData[end + 1] == "\"")) {
125
+ end++;
126
+ }
127
+ else {
128
+ quote_open = false;
129
+ }
130
+ }
131
+ else if ((!quote_open) && (csvData[end] == "\r")) {
132
+ return end;
133
+ }
134
+ end++;
135
+ }
136
+ return n;
137
+ }
138
+ static _parseCsvLine(csvLine) {
139
+ let result = [];
140
+ const n = csvLine.length;
141
+ let start = 0;
142
+ let end = 0;
143
+ let quote_open = false;
144
+ let has_quotes = false;
145
+ let has_escaped_quotes = false;
146
+ let found_field = false;
147
+ while (end < n) {
148
+ if (csvLine[end] == "\"") {
149
+ if (!quote_open) {
150
+ quote_open = true;
151
+ }
152
+ else if ((end < n - 1) && (csvLine[end + 1] == "\"")) {
153
+ end++;
154
+ has_escaped_quotes = true;
155
+ }
156
+ else {
157
+ has_quotes = true;
158
+ quote_open = false;
159
+ }
160
+ }
161
+ if ((!quote_open) && ((end == n - 1) || (csvLine[end] == ","))) {
162
+ found_field = true;
163
+ if (end == n - 1) {
164
+ end++;
165
+ }
166
+ }
167
+ if (found_field) {
168
+ // console.log("OINODB_csvParseLine: next field=" + csvLine.substring(start,end) + ", start="+start+", end="+end)
169
+ let field_str;
170
+ if (has_quotes) {
171
+ field_str = csvLine.substring(start + 1, end - 1);
172
+ }
173
+ else if (start == end) {
174
+ field_str = undefined;
175
+ }
176
+ else {
177
+ field_str = csvLine.substring(start, end);
178
+ if (field_str == "null") {
179
+ field_str = null;
180
+ }
181
+ }
182
+ result.push(field_str);
183
+ has_quotes = false;
184
+ has_escaped_quotes = true;
185
+ found_field = false;
186
+ start = end + 1;
187
+ }
188
+ end++;
189
+ }
190
+ return result;
191
+ }
192
+ static _createRowFromCsv(datamodel, data) {
193
+ let result = [];
194
+ const n = data.length;
195
+ let start = 0;
196
+ let end = this._findCsvLineEnd(data, start);
197
+ const header_str = data.substring(start, end);
198
+ const headers = this._parseCsvLine(header_str);
199
+ let field_to_header_mapping = new Array(datamodel.fields.length);
200
+ let headers_found = false;
201
+ for (let i = 0; i < field_to_header_mapping.length; i++) {
202
+ field_to_header_mapping[i] = headers.indexOf(datamodel.fields[i].name);
203
+ headers_found = headers_found || (field_to_header_mapping[i] >= 0);
204
+ }
205
+ // OINOLog.debug("createRowFromCsv", {headers:headers, field_to_header_mapping:field_to_header_mapping})
206
+ if (!headers_found) {
207
+ return result;
208
+ }
209
+ start = end + 1;
210
+ end = start;
211
+ while (end < n) {
212
+ while ((start < n) && ((data[start] == "\r") || (data[start] == "\n"))) {
213
+ start++;
214
+ }
215
+ if (start >= n) {
216
+ return result;
217
+ }
218
+ end = this._findCsvLineEnd(data, start);
219
+ const row_data = this._parseCsvLine(data.substring(start, end));
220
+ const row = new Array(field_to_header_mapping.length);
221
+ let has_data = false;
222
+ for (let i = 0; i < datamodel.fields.length; i++) {
223
+ const field = datamodel.fields[i];
224
+ let j = field_to_header_mapping[i];
225
+ let value = row_data[j];
226
+ if ((value === undefined) || (value === null)) { // null/undefined-decoding built into the parser
227
+ row[i] = value;
228
+ }
229
+ else if ((j >= 0) && (j < row_data.length)) {
230
+ value = index_js_1.OINOStr.decode(value, index_js_1.OINOContentType.csv);
231
+ if (value && (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
232
+ value = datamodel.api.hashid.decode(value);
233
+ }
234
+ row[i] = field.deserializeCell(value);
235
+ }
236
+ else {
237
+ row[i] = undefined;
238
+ }
239
+ has_data = has_data || (row[i] !== undefined);
240
+ }
241
+ // console.log("createRowFromCsv: next row=" + row)
242
+ if (has_data) {
243
+ result.push(row);
244
+ }
245
+ else {
246
+ index_js_1.OINOLog.warning("createRowFromCsv: empty row skipped");
247
+ }
248
+ start = end;
249
+ end = start;
250
+ }
251
+ return result;
252
+ }
253
+ static _createRowFromJsonObj(obj, datamodel) {
254
+ // console.log("createRowFromJsonObj: obj=" + JSON.stringify(obj))
255
+ const fields = datamodel.fields;
256
+ let result = new Array(fields.length);
257
+ let has_data = false;
258
+ // console.log("createRowFromJsonObj: " + result)
259
+ for (let i = 0; i < fields.length; i++) {
260
+ const field = fields[i];
261
+ let value = obj[field.name];
262
+ // console.log("createRowFromJsonObj: key=" + field.name + ", val=" + val)
263
+ if ((value === null) || (value === undefined)) { // must be checed first as null is an object
264
+ result[i] = value;
265
+ }
266
+ else if (Array.isArray(value) || typeof value === "object") {
267
+ result[i] = JSON.stringify(value).replaceAll("\"", "\\\""); // only single level deep objects, rest is handled as JSON-strings
268
+ }
269
+ else if (typeof value === "string") {
270
+ value = index_js_1.OINOStr.decode(value, index_js_1.OINOContentType.json);
271
+ if (value && (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
272
+ value = datamodel.api.hashid.decode(value);
273
+ }
274
+ result[i] = field.deserializeCell(value);
275
+ }
276
+ else {
277
+ result[i] = value; // value types are passed as-is
278
+ }
279
+ has_data = has_data || (result[i] !== undefined);
280
+ // console.log("createRowFromJsonObj: result["+i+"]=" + result[i])
281
+ }
282
+ // console.log("createRowFromJsonObj: " + result)
283
+ if (has_data) {
284
+ return result;
285
+ }
286
+ else {
287
+ index_js_1.OINOLog.warning("createRowFromJsonObj: empty row skipped");
288
+ return undefined;
289
+ }
290
+ }
291
+ static _createRowFromJson(datamodel, data) {
292
+ let result = [];
293
+ // console.log("OINORowFactoryJson: data=" + data)
294
+ const obj = JSON.parse(data);
295
+ if (Array.isArray(obj)) {
296
+ obj.forEach(row => {
297
+ const data_row = this._createRowFromJsonObj(row, datamodel);
298
+ if (data_row !== undefined) {
299
+ result.push(data_row);
300
+ }
301
+ });
302
+ }
303
+ else {
304
+ const data_row = this._createRowFromJsonObj(obj, datamodel);
305
+ if (data_row !== undefined) {
306
+ result.push(data_row);
307
+ }
308
+ }
309
+ return result;
310
+ }
311
+ static _findMultipartBoundary(formData, multipartBoundary, start) {
312
+ let n = formData.indexOf(multipartBoundary, start);
313
+ if (n >= 0) {
314
+ n += multipartBoundary.length + 2;
315
+ }
316
+ else {
317
+ n = formData.length;
318
+ }
319
+ return n;
320
+ }
321
+ static _parseMultipartLine(data, start) {
322
+ let line_end = data.indexOf('\r\n', start);
323
+ if (line_end >= start) {
324
+ return data.subarray(start, line_end).toString();
325
+ }
326
+ else {
327
+ return '';
328
+ }
329
+ }
330
+ static _multipartHeaderRegex = /Content-Disposition\: (form-data|file); name=\"([^\"]+)\"(; filename=.*)?/i;
331
+ static _createRowFromFormdata(datamodel, data, multipartBoundary) {
332
+ let result = [];
333
+ try {
334
+ const n = data.length;
335
+ let start = this._findMultipartBoundary(data, multipartBoundary, 0);
336
+ let end = this._findMultipartBoundary(data, multipartBoundary, start);
337
+ // OINOLog.debug("createRowFromFormdata: enter", {start:start, end:end, multipartBoundary:multipartBoundary})
338
+ const row = new Array(datamodel.fields.length);
339
+ let has_data = false;
340
+ while (end < n) {
341
+ // OINOLog.debug("createRowFromFormdata: next block", {start:start, end:end, block:data.substring(start, end)})
342
+ let block_ok = true;
343
+ let l = this._parseMultipartLine(data, start);
344
+ // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
345
+ start += l.length + 2;
346
+ const header_matches = OINODbParser._multipartHeaderRegex.exec(l);
347
+ if (!header_matches) {
348
+ index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: unsupported block skipped!", { header_line: l });
349
+ block_ok = false;
350
+ }
351
+ else {
352
+ const field_name = header_matches[2];
353
+ const is_file = header_matches[3] != null;
354
+ let is_base64 = false;
355
+ const field_index = datamodel.findFieldIndexByName(field_name);
356
+ // OINOLog.debug("createRowFromFormdata: header", {field_name:field_name, field_index:field_index, is_file:is_file, is_base64:is_base64})
357
+ if (field_index < 0) {
358
+ index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: form field not found and skipped!", { field_name: field_name });
359
+ block_ok = false;
360
+ }
361
+ else {
362
+ const field = datamodel.fields[field_index];
363
+ l = this._parseMultipartLine(data, start);
364
+ // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
365
+ while (block_ok && (l != '')) {
366
+ if (l.startsWith('Content-Type:') && (l.indexOf('multipart/mixed') >= 0)) {
367
+ index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: mixed multipart files not supported and skipped!", { header_line: l });
368
+ block_ok = false;
369
+ }
370
+ else if (l.startsWith('Content-Transfer-Encoding:') && (l.indexOf('BASE64') >= 0)) {
371
+ is_base64 = true;
372
+ }
373
+ start += l.length + 2;
374
+ l = this._parseMultipartLine(data, start);
375
+ // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
376
+ }
377
+ start += 2;
378
+ if (!block_ok) {
379
+ index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: invalid block skipped", { field_name: field_name });
380
+ }
381
+ else if (start + multipartBoundary.length + 2 >= end) {
382
+ // OINOLog.debug("OINODbFactory.createRowFromFormdata: null value", {field_name:field_name})
383
+ row[field_index] = null;
384
+ }
385
+ else if (is_file) {
386
+ if (is_base64) {
387
+ const value = this._parseMultipartLine(data, start).trim();
388
+ row[field_index] = field.deserializeCell(index_js_1.OINOStr.decode(value, index_js_1.OINOContentType.formdata));
389
+ }
390
+ else {
391
+ const e = this._findMultipartBoundary(data, multipartBoundary, start);
392
+ const value = data.subarray(start, e - 2);
393
+ row[field_index] = value;
394
+ }
395
+ // console.log("OINODbFactory.createRowFromFormdata: file field", {field_name:field_name, value:row[field_index]})
396
+ }
397
+ else {
398
+ let value = index_js_1.OINOStr.decode(this._parseMultipartLine(data, start).trim(), index_js_1.OINOContentType.formdata);
399
+ // OINOLog.debug("OINODbFactory.createRowFromFormdata: parse form field", {field_name:field_name, value:value})
400
+ if (value && (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
401
+ value = datamodel.api.hashid.decode(value);
402
+ }
403
+ row[field_index] = field.deserializeCell(value);
404
+ }
405
+ has_data = has_data || (row[field_index] !== undefined);
406
+ }
407
+ }
408
+ start = end;
409
+ end = this._findMultipartBoundary(data, multipartBoundary, start);
410
+ }
411
+ // OINOLog.debug("createRowFromFormdata: next row", {row:row})
412
+ if (has_data) {
413
+ result.push(row);
414
+ }
415
+ else {
416
+ index_js_1.OINOLog.warning("createRowFromFormdata: empty row skipped");
417
+ }
418
+ }
419
+ catch (e) {
420
+ index_js_1.OINOLog.error("createRowFromFormdata: error parsing formdata", { exception: e.message });
421
+ }
422
+ return result;
423
+ }
424
+ static _createRowFromUrlencoded(datamodel, data) {
425
+ // OINOLog.debug("createRowFromUrlencoded: enter", {data:data})
426
+ let result = [];
427
+ const row = new Array(datamodel.fields.length);
428
+ let has_data = false;
429
+ const data_parts = data.trim().split('&');
430
+ try {
431
+ for (let i = 0; i < data_parts.length; i++) {
432
+ const param_parts = data_parts[i].split('=');
433
+ // OINOLog.debug("createRowFromUrlencoded: next param", {param_parts:param_parts})
434
+ if (param_parts.length == 2) {
435
+ const key = index_js_1.OINOStr.decodeUrlencode(param_parts[0]) || "";
436
+ const field_index = datamodel.findFieldIndexByName(key);
437
+ if (field_index < 0) {
438
+ index_js_1.OINOLog.info("createRowFromUrlencoded: param field not found", { field: key });
439
+ }
440
+ else {
441
+ const field = datamodel.fields[field_index];
442
+ let value = index_js_1.OINOStr.decode(param_parts[1], index_js_1.OINOContentType.urlencode);
443
+ if (value && (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
444
+ value = datamodel.api.hashid.decode(value);
445
+ }
446
+ row[field_index] = field.deserializeCell(value);
447
+ has_data = has_data || (row[field_index] !== undefined);
448
+ }
449
+ }
450
+ // const value = requestParams[]
451
+ }
452
+ if (has_data) {
453
+ result.push(row);
454
+ }
455
+ else {
456
+ index_js_1.OINOLog.warning("createRowFromUrlencoded: empty row skipped");
457
+ }
458
+ }
459
+ catch (e) {
460
+ index_js_1.OINOLog.error("createRowFromUrlencoded: error parsing urlencoded data", { exception: e.message });
461
+ }
462
+ // console.log("createRowFromUrlencoded: next row=" + row)
463
+ return result;
464
+ }
465
+ }
466
+ exports.OINODbParser = OINODbParser;
@@ -92,7 +92,7 @@ class OINODbSqlFilter {
92
92
  return new OINODbSqlFilter(OINODbSqlFilter.parse(boolean_parts[0]), boolean_parts[1].trim().toLowerCase().substring(1), OINODbSqlFilter.parse(boolean_parts[2]));
93
93
  }
94
94
  else {
95
- throw new Error(index_js_1.OINO_ERROR_PREFIX + ": Invalid filter '" + filterString + "'");
95
+ throw new Error(index_js_1.OINO_ERROR_PREFIX + ": Invalid filter '" + filterString + "'"); // invalid filter could be a security risk, stop processing
96
96
  }
97
97
  }
98
98
  }
@@ -158,20 +158,24 @@ class OINODbSqlFilter {
158
158
  result += this._leftSide.toSql(dataModel);
159
159
  }
160
160
  else {
161
- result += dataModel.api.db.printSqlColumnname(this._leftSide);
162
161
  field = dataModel.findFieldByName(this._leftSide);
162
+ if (!field) {
163
+ index_js_1.OINOLog.error("OINODbSqlFilter.toSql: Invalid field!", { field: this._leftSide });
164
+ throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid field '" + this._leftSide + "'"); // invalid field name could be a security risk, stop processing
165
+ }
166
+ result += dataModel.api.db.printSqlColumnname(field?.name || this._leftSide);
163
167
  }
164
168
  result += this._operatorToSql();
165
169
  if (this._rightSide instanceof OINODbSqlFilter) {
166
170
  result += this._rightSide.toSql(dataModel);
167
171
  }
168
172
  else {
169
- if (field) {
170
- result += field.printCellAsSqlValue(this._rightSide);
171
- }
172
- else {
173
- result += this._rightSide;
173
+ const value = field.deserializeCell(this._rightSide);
174
+ if (!value) {
175
+ index_js_1.OINOLog.error("OINODbSqlFilter.toSql: Invalid value!", { value: value });
176
+ throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid value '" + value + "'"); // invalid value could be a security risk, stop processing
174
177
  }
178
+ result += field.printCellAsSqlValue(value);
175
179
  }
176
180
  // OINOLog.debug("OINOFilter.toSql", {result:result})
177
181
  return "(" + result + ")";
@@ -248,17 +252,19 @@ class OINODbSqlOrder {
248
252
  let result = "";
249
253
  for (let i = 0; i < this._columns.length; i++) {
250
254
  const field = dataModel.findFieldByName(this._columns[i]);
251
- if (field) {
252
- if (result) {
253
- result += ",";
254
- }
255
- result += dataModel.api.db.printSqlColumnname(field.name) + " ";
256
- if (this._descending[i]) {
257
- result += "DESC";
258
- }
259
- else {
260
- result += "ASC";
261
- }
255
+ if (!field) {
256
+ index_js_1.OINOLog.error("OINODbSqlOrder.toSql: Invalid field!", { field: this._columns[i] });
257
+ throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINODbSqlOrder.toSql - Invalid field '" + this._columns[i] + "'"); // invalid field name could be a security risk, stop processing
258
+ }
259
+ if (result) {
260
+ result += ",";
261
+ }
262
+ result += dataModel.api.db.printSqlColumnname(field.name) + " ";
263
+ if (this._descending[i]) {
264
+ result += "DESC";
265
+ }
266
+ else {
267
+ result += "ASC";
262
268
  }
263
269
  }
264
270
  // OINOLog.debug("OINODbSqlOrder.toSql", {result:result})