@asla/yoursql 0.6.3 → 0.6.5

package/dist/mod.js

@@ -406,12 +406,14 @@ class SqlValuesCreator {
         if (objectList.length <= 0)
             throw new Error("objectList 不能是空数组");
         let keys;
-        let asserts = {};
+        let asserts;
         if (!keys_types) {
             keys = Array.from(getObjectListKeys(objectList, keepUndefinedKey));
+            asserts = [];
         }
         else if (keys_types instanceof Array) {
             keys = keys_types;
+            asserts = [];
         }
         else {
             keys = Object.keys(keys_types);
@@ -429,7 +431,7 @@ class SqlValuesCreator {
                 j = 0;
                 for (; j < keys.length; j++) {
                     value = object[keys[j]];
-                    rows[j] = this.toSqlStr(value);
+                    rows[j] = this.toSqlStr(value, asserts[j]?.assertJsType);
                 }
                 str += ",\n(" + rows.join(",") + ")";
             }
@@ -441,11 +443,11 @@ class SqlValuesCreator {
         return str;
     }
     objectToValues(object, keys_types) {
-        let type = {};
+        let type;
         let keys;
         if (keys_types instanceof Array) {
             keys = keys_types;
-            type = {};
+            type = [];
         }
         else if (keys_types) {
             keys = Object.keys(keys_types);
@@ -453,6 +455,7 @@ class SqlValuesCreator {
         }
         else {
             keys = Object.keys(object);
+            type = [];
         }
         return this._internalObjectToValues(object, keys, type);
     }
@@ -466,7 +469,7 @@ class SqlValuesCreator {
             for (; i < keys.length; i++) {
                 key = keys[i];
                 value = object[key];
-                assertType = type[key];
+                assertType = type[i];
                 if (assertType) {
                     values[i] = this.toSqlStr(value, assertType.assertJsType);
                     if (assertType.sqlType)
@@ -494,6 +497,7 @@ class SqlValuesCreator {
             throw new Error("values 不能为空");
         const insertKeys = Object.keys(valuesTypes);
         const defaultValues = [];
+        const asserts = new Array(insertKeys.length);
         const valuesStr = new Array(values.length);
         {
             const column0 = new Array(insertKeys.length);
@@ -512,6 +516,7 @@ class SqlValuesCreator {
                 else {
                     sqlType = item.sqlType;
                     assertJsType = item.assertJsType;
+                    asserts[i] = assertJsType;
                     defaultValues[i] = item.sqlDefault ?? "NULL";
                 }
                 value = values[0][columnName];
@@ -530,7 +535,7 @@ class SqlValuesCreator {
                 if (value === undefined)
                     items[j] = defaultValues[j];
                 else
-                    items[j] = this.toSqlStr(value);
+                    items[j] = this.toSqlStr(value, asserts[j]);
             }
             valuesStr[i] = "(" + items.join(",") + ")";
         }
@@ -558,15 +563,15 @@ _YourValuesAs_asName = new WeakMap(), _YourValuesAs_valuesStr = new WeakMap(), _
 function initColumnAssert(keys, keys_types) {
     let key;
     let value;
-    let type = {};
+    let type = new Array(keys.length);
     for (let i = 0; i < keys.length; i++) {
         key = keys[i];
         value = keys_types[key];
         if (typeof value === "string") {
-            type[key] = { sqlType: value };
+            type[i] = { sqlType: value };
         }
         else {
-            type[key] = value;
+            type[i] = value;
         }
     }
     return type;

package/dist/select/TableQuery.d.ts

@@ -1,4 +1,4 @@
-import { SqlValuesCreator, SqlRaw } from "../sql_value/sql_value.ts";
+import { SqlValuesCreator } from "../sql_value/sql_value.ts";
 import { ColumnsSelected, SelectColumns, UpdateRowValue, TableType } from "./type.ts";
 import { CurrentWhere, Selection } from "./select.ts";
 import { DbTable, SqlQueryStatement } from "./selectable.ts";
@@ -56,7 +56,7 @@ export declare class DbTableQuery<T extends TableType = Record<string, any>, C e
 export interface InsertOption<T extends object> {
     conflict?: (keyof T)[] | string;
     updateValues?: Constructable<{
-        [key in keyof T]?: undefined | SqlRaw | T[key];
+        [key in keyof T]?: undefined | String | T[key];
     } | string | void>;
     where?: Constructable<ConditionParam | void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asla/yoursql",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "",
   "type": "module",
   "types": "./dist/mod.d.ts",