@oino-ts/db 0.20.0 → 0.20.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/cjs/OINODbApi.js +9 -3
  2. package/dist/esm/OINODbApi.js +10 -4
  3. package/package.json +4 -4
  4. package/src/OINODbApi.ts +9 -4
package/dist/cjs/OINODbApi.js CHANGED
@@ -28,9 +28,15 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
28
28
  }
29
29
  }
30
30
  if (!this.sqlParams.filter) {
31
- const filter_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM);
32
- if (filter_param) {
33
- this.sqlParams.filter = index_js_1.OINODbSqlFilter.parse(filter_param);
31
+ const filter_params = this.url?.searchParams.getAll(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM) || [];
32
+ for (let i = 0; i < filter_params.length; i++) {
33
+ const f = index_js_1.OINODbSqlFilter.parse(filter_params[i]);
34
+ if (i > 0) {
35
+ this.sqlParams.filter = index_js_1.OINODbSqlFilter.combine(this.sqlParams.filter, index_js_1.OINODbSqlBooleanOperation.and, f);
36
+ }
37
+ else {
38
+ this.sqlParams.filter = f;
39
+ }
34
40
  }
35
41
  }
36
42
  if (init?.order) {
package/dist/esm/OINODbApi.js CHANGED
@@ -5,7 +5,7 @@
5
5
  */
6
6
  import { Buffer } from "node:buffer";
7
7
  import { OINOLog, OINOResult, OINOHttpRequest, OINOBenchmark, OINOHtmlTemplate, OINOContentType, OINO_ERROR_PREFIX } from "@oino-ts/common";
8
- import { OINODbDataModel, OINOStringDataField, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit } from "./index.js";
8
+ import { OINODbDataModel, OINOStringDataField, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlBooleanOperation } from "./index.js";
9
9
  import { OINOHashid } from "@oino-ts/hashid";
10
10
  export class OINODbApiRequest extends OINOHttpRequest {
11
11
  rowId;
@@ -25,9 +25,15 @@ export class OINODbApiRequest extends OINOHttpRequest {
25
25
  }
26
26
  }
27
27
  if (!this.sqlParams.filter) {
28
- const filter_param = this.url?.searchParams.get(OINODbConfig.OINODB_SQL_FILTER_PARAM);
29
- if (filter_param) {
30
- this.sqlParams.filter = OINODbSqlFilter.parse(filter_param);
28
+ const filter_params = this.url?.searchParams.getAll(OINODbConfig.OINODB_SQL_FILTER_PARAM) || [];
29
+ for (let i = 0; i < filter_params.length; i++) {
30
+ const f = OINODbSqlFilter.parse(filter_params[i]);
31
+ if (i > 0) {
32
+ this.sqlParams.filter = OINODbSqlFilter.combine(this.sqlParams.filter, OINODbSqlBooleanOperation.and, f);
33
+ }
34
+ else {
35
+ this.sqlParams.filter = f;
36
+ }
31
37
  }
32
38
  }
33
39
  if (init?.order) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oino-ts/db",
3
- "version": "0.20.0",
3
+ "version": "0.20.1",
4
4
  "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
5
5
  "author": "Matias Kiviniemi (pragmatta)",
6
6
  "license": "MPL-2.0",
@@ -19,13 +19,13 @@
19
19
  "module": "./dist/esm/index.js",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "dependencies": {
22
- "@oino-ts/common": "0.20.0",
22
+ "@oino-ts/common": "0.20.1",
23
23
  "oino-ts": "file:.."
24
24
  },
25
25
  "devDependencies": {
26
- "@oino-ts/types": "0.20.0",
26
+ "@oino-ts/types": "0.20.1",
27
27
  "@types/bun": "^1.1.14",
28
- "@types/node": "^20.20.00",
28
+ "@types/node": "^20.20.10",
29
29
  "typescript": "~5.9.0"
30
30
  },
31
31
  "files": [
package/src/OINODbApi.ts CHANGED
@@ -6,7 +6,7 @@
6
6
 
7
7
  import { Buffer } from "node:buffer";
8
8
  import { OINOLog, OINOResult, OINOHttpRequest, type OINOHttpRequestInit, OINOBenchmark, OINOHttpResult, OINOHtmlTemplate, OINOContentType, OINO_ERROR_PREFIX } from "@oino-ts/common";
9
- import { OINODbApiParams, OINODb, OINODbDataSet, OINODbDataModel, OINODbDataField, OINOStringDataField, OINODataRow, OINODataCell, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit } from "./index.js"
9
+ import { OINODbApiParams, OINODb, OINODbDataSet, OINODbDataModel, OINODbDataField, OINOStringDataField, OINODataRow, OINODataCell, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlBooleanOperation } from "./index.js"
10
10
  import { OINOHashid } from "@oino-ts/hashid"
11
11
 
12
12
  export type OINODbApiData = string|OINODataRow[]|Buffer|Uint8Array|object|null
@@ -41,9 +41,14 @@ export class OINODbApiRequest extends OINOHttpRequest {
41
41
  }
42
42
  }
43
43
  if (!this.sqlParams.filter) {
44
- const filter_param = this.url?.searchParams.get(OINODbConfig.OINODB_SQL_FILTER_PARAM)
45
- if (filter_param) {
46
- this.sqlParams.filter = OINODbSqlFilter.parse(filter_param)
44
+ const filter_params = this.url?.searchParams.getAll(OINODbConfig.OINODB_SQL_FILTER_PARAM) || []
45
+ for (let i=0; i<filter_params.length; i++) {
46
+ const f = OINODbSqlFilter.parse(filter_params[i])
47
+ if (i > 0) {
48
+ this.sqlParams.filter = OINODbSqlFilter.combine(this.sqlParams.filter, OINODbSqlBooleanOperation.and, f)
49
+ } else {
50
+ this.sqlParams.filter = f
51
+ }
47
52
  }
48
53
  }
49
54
  if (init?.order) {