@sprucelabs/postgres-data-store 3.1.0 → 3.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/build/QueryBuilder.js
CHANGED
|
@@ -36,13 +36,14 @@ class QueryBuilder {
|
|
|
36
36
|
return { values, sql };
|
|
37
37
|
}
|
|
38
38
|
buildSetClause(options) {
|
|
39
|
-
const { query, startingCount = 0, placeholderTemplate = '${{count}}', isBuildingWhere = false, } = options;
|
|
39
|
+
const { query, startingCount = 0, placeholderTemplate = '${{count}}', isBuildingWhere = false, useIsNull = true, } = options;
|
|
40
40
|
let placeholderCount = startingCount;
|
|
41
41
|
const queryKeys = Object.keys(query);
|
|
42
42
|
const values = [];
|
|
43
43
|
const set = [];
|
|
44
44
|
queryKeys.forEach((k) => {
|
|
45
45
|
let value = query[k];
|
|
46
|
+
const isNull = value === null && useIsNull;
|
|
46
47
|
if (value === null || value === void 0 ? void 0 : value.$in) {
|
|
47
48
|
values.push(...value.$in.map((v) => this.normalizeValue(v)));
|
|
48
49
|
set.push(`"${k}" IN (${value.$in
|
|
@@ -88,7 +89,7 @@ class QueryBuilder {
|
|
|
88
89
|
values.push(...sub.values.map((v) => JSON.stringify(v)));
|
|
89
90
|
set.push(...sub.set);
|
|
90
91
|
}
|
|
91
|
-
else if (
|
|
92
|
+
else if (isNull || value === undefined) {
|
|
92
93
|
set.push(`"${k}" IS NULL`);
|
|
93
94
|
}
|
|
94
95
|
else {
|
|
@@ -207,6 +208,7 @@ class QueryBuilder {
|
|
|
207
208
|
const { set: set, values } = this.buildSetClause({
|
|
208
209
|
query: updates,
|
|
209
210
|
startingCount: 0,
|
|
211
|
+
useIsNull: false,
|
|
210
212
|
});
|
|
211
213
|
let sql = `UPDATE ${this.buildTableName(tableName)} SET ${set.join(', ')}`;
|
|
212
214
|
const { sql: where, values: whereValues } = this.optionallyBuildWhere(query, values.length);
|
|
@@ -33,13 +33,14 @@ export default class QueryBuilder {
|
|
|
33
33
|
return { values, sql };
|
|
34
34
|
}
|
|
35
35
|
buildSetClause(options) {
|
|
36
|
-
const { query, startingCount = 0, placeholderTemplate = '${{count}}', isBuildingWhere = false, } = options;
|
|
36
|
+
const { query, startingCount = 0, placeholderTemplate = '${{count}}', isBuildingWhere = false, useIsNull = true, } = options;
|
|
37
37
|
let placeholderCount = startingCount;
|
|
38
38
|
const queryKeys = Object.keys(query);
|
|
39
39
|
const values = [];
|
|
40
40
|
const set = [];
|
|
41
41
|
queryKeys.forEach((k) => {
|
|
42
42
|
let value = query[k];
|
|
43
|
+
const isNull = value === null && useIsNull;
|
|
43
44
|
if (value === null || value === void 0 ? void 0 : value.$in) {
|
|
44
45
|
values.push(...value.$in.map((v) => this.normalizeValue(v)));
|
|
45
46
|
set.push(`"${k}" IN (${value.$in
|
|
@@ -85,7 +86,7 @@ export default class QueryBuilder {
|
|
|
85
86
|
values.push(...sub.values.map((v) => JSON.stringify(v)));
|
|
86
87
|
set.push(...sub.set);
|
|
87
88
|
}
|
|
88
|
-
else if (
|
|
89
|
+
else if (isNull || value === undefined) {
|
|
89
90
|
set.push(`"${k}" IS NULL`);
|
|
90
91
|
}
|
|
91
92
|
else {
|
|
@@ -204,6 +205,7 @@ export default class QueryBuilder {
|
|
|
204
205
|
const { set: set, values } = this.buildSetClause({
|
|
205
206
|
query: updates,
|
|
206
207
|
startingCount: 0,
|
|
208
|
+
useIsNull: false,
|
|
207
209
|
});
|
|
208
210
|
let sql = `UPDATE ${this.buildTableName(tableName)} SET ${set.join(', ')}`;
|
|
209
211
|
const { sql: where, values: whereValues } = this.optionallyBuildWhere(query, values.length);
|
package/package.json
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"sprucebot",
|
|
23
23
|
"sprucelabs"
|
|
24
24
|
],
|
|
25
|
-
"version": "3.1.
|
|
25
|
+
"version": "3.1.2",
|
|
26
26
|
"scripts": {
|
|
27
27
|
"build.ci": "yarn build.tsc && yarn build.resolve-paths && yarn lint",
|
|
28
28
|
"build.dev": "yarn build.tsc --sourceMap ; yarn resolve-paths.lint",
|
|
@@ -51,18 +51,18 @@
|
|
|
51
51
|
"watch.tsc": "tsc -w"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@sprucelabs/data-stores": "^23.0.
|
|
55
|
-
"@sprucelabs/schema": "^28.6.
|
|
54
|
+
"@sprucelabs/data-stores": "^23.0.6",
|
|
55
|
+
"@sprucelabs/schema": "^28.6.4",
|
|
56
56
|
"pg": "^8.10.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@sprucelabs/esm-postbuild": "^4.0.
|
|
60
|
-
"@sprucelabs/jest-json-reporter": "^7.0.
|
|
61
|
-
"@sprucelabs/resolve-path-aliases": "^1.1.
|
|
59
|
+
"@sprucelabs/esm-postbuild": "^4.0.5",
|
|
60
|
+
"@sprucelabs/jest-json-reporter": "^7.0.21",
|
|
61
|
+
"@sprucelabs/resolve-path-aliases": "^1.1.206",
|
|
62
62
|
"@sprucelabs/semantic-release": "^4.0.8",
|
|
63
63
|
"@sprucelabs/spruce-test-fixtures": "^52.8.0",
|
|
64
|
-
"@sprucelabs/test": "^7.7.
|
|
65
|
-
"@sprucelabs/test-utils": "^3.4.
|
|
64
|
+
"@sprucelabs/test": "^7.7.436",
|
|
65
|
+
"@sprucelabs/test-utils": "^3.4.33",
|
|
66
66
|
"@types/node": "^18.14.0",
|
|
67
67
|
"@types/pg": "^8.6.6",
|
|
68
68
|
"chokidar-cli": "^3.0.0",
|