@asla/yoursql 0.6.3 → 0.6.4
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/dist/mod.js +11 -8
- package/package.json +1 -1
package/dist/mod.js
CHANGED
|
@@ -406,12 +406,14 @@ class SqlValuesCreator {
|
|
|
406
406
|
if (objectList.length <= 0)
|
|
407
407
|
throw new Error("objectList 不能是空数组");
|
|
408
408
|
let keys;
|
|
409
|
-
let asserts
|
|
409
|
+
let asserts;
|
|
410
410
|
if (!keys_types) {
|
|
411
411
|
keys = Array.from(getObjectListKeys(objectList, keepUndefinedKey));
|
|
412
|
+
asserts = [];
|
|
412
413
|
}
|
|
413
414
|
else if (keys_types instanceof Array) {
|
|
414
415
|
keys = keys_types;
|
|
416
|
+
asserts = [];
|
|
415
417
|
}
|
|
416
418
|
else {
|
|
417
419
|
keys = Object.keys(keys_types);
|
|
@@ -429,7 +431,7 @@ class SqlValuesCreator {
|
|
|
429
431
|
j = 0;
|
|
430
432
|
for (; j < keys.length; j++) {
|
|
431
433
|
value = object[keys[j]];
|
|
432
|
-
rows[j] = this.toSqlStr(value);
|
|
434
|
+
rows[j] = this.toSqlStr(value, asserts[j]?.assertJsType);
|
|
433
435
|
}
|
|
434
436
|
str += ",\n(" + rows.join(",") + ")";
|
|
435
437
|
}
|
|
@@ -441,11 +443,11 @@ class SqlValuesCreator {
|
|
|
441
443
|
return str;
|
|
442
444
|
}
|
|
443
445
|
objectToValues(object, keys_types) {
|
|
444
|
-
let type
|
|
446
|
+
let type;
|
|
445
447
|
let keys;
|
|
446
448
|
if (keys_types instanceof Array) {
|
|
447
449
|
keys = keys_types;
|
|
448
|
-
type =
|
|
450
|
+
type = [];
|
|
449
451
|
}
|
|
450
452
|
else if (keys_types) {
|
|
451
453
|
keys = Object.keys(keys_types);
|
|
@@ -453,6 +455,7 @@ class SqlValuesCreator {
|
|
|
453
455
|
}
|
|
454
456
|
else {
|
|
455
457
|
keys = Object.keys(object);
|
|
458
|
+
type = [];
|
|
456
459
|
}
|
|
457
460
|
return this._internalObjectToValues(object, keys, type);
|
|
458
461
|
}
|
|
@@ -466,7 +469,7 @@ class SqlValuesCreator {
|
|
|
466
469
|
for (; i < keys.length; i++) {
|
|
467
470
|
key = keys[i];
|
|
468
471
|
value = object[key];
|
|
469
|
-
assertType = type[
|
|
472
|
+
assertType = type[i];
|
|
470
473
|
if (assertType) {
|
|
471
474
|
values[i] = this.toSqlStr(value, assertType.assertJsType);
|
|
472
475
|
if (assertType.sqlType)
|
|
@@ -558,15 +561,15 @@ _YourValuesAs_asName = new WeakMap(), _YourValuesAs_valuesStr = new WeakMap(), _
|
|
|
558
561
|
function initColumnAssert(keys, keys_types) {
|
|
559
562
|
let key;
|
|
560
563
|
let value;
|
|
561
|
-
let type =
|
|
564
|
+
let type = new Array(keys.length);
|
|
562
565
|
for (let i = 0; i < keys.length; i++) {
|
|
563
566
|
key = keys[i];
|
|
564
567
|
value = keys_types[key];
|
|
565
568
|
if (typeof value === "string") {
|
|
566
|
-
type[
|
|
569
|
+
type[i] = { sqlType: value };
|
|
567
570
|
}
|
|
568
571
|
else {
|
|
569
|
-
type[
|
|
572
|
+
type[i] = value;
|
|
570
573
|
}
|
|
571
574
|
}
|
|
572
575
|
return type;
|