@asla/yoursql 0.9.0 → 0.9.2

package/dist/client/DbPoolTransaction.js

@@ -24,7 +24,7 @@ class DbPoolTransaction extends DbQuery {
                     .then((conn) => {
                     this.#conn = conn;
                     const begin = "BEGIN" + (this.mode ? " TRANSACTION ISOLATION LEVEL " + this.mode : "");
-                    const promise = conn.multipleQuery([begin, sql]);
+                    const promise = conn.multipleQuery(sql instanceof Array ? [begin, ...sql] : [begin, sql]);
                     this.#pending = promise;
                     this.#query = this.#queryAfter;
                     return promise;

package/dist/client/DbQuery.d.ts

@@ -17,16 +17,11 @@ export declare abstract class DbQuery implements DbQueryBase {
     /** 单语句查询，只返回第一行。如果查询没有返回行，则抛出异常。 */
     queryFirstRow<T = any>(sql: SqlStatementDataset<T>): Promise<T>;
     queryFirstRow<T = any>(sql: SqlLike): Promise<T>;
-    /**
-     * 查询行
-     * 不应查询单条语句，否则返回错误值
-     */
-    multipleQueryRows<T extends any[] = any[]>(sql: SqlStatementDataset<T>): Promise<T[]>;
     /**
      * 查询行
      * 不应查询单语句，否则返回错误值
      */
-    multipleQueryRows<T extends any[] = any[]>(sql: SqlLike): Promise<T[]>;
+    multipleQueryRows<T extends any[] = any[]>(sql: SqlLike | SqlLike[]): Promise<T[]>;
     /**
      * 指定某一列为key，返回 key 到 row 的映射
      * 单语句查询，不应查询多语句，否则返回错误值

package/dist/client/DbQuery.js

@@ -5,27 +5,31 @@
 class DbQuery {
     /** 单语句查询受影响的行 */
     queryCount(sql) {
-        return this.query(sql.toString()).then((res) => {
+        return this.query(sql).then((res) => {
             if (res.rowCount === null)
                 return 0;
             return res.rowCount;
         });
     }
     queryRows(sql) {
-        return this.query(sql.toString()).then((res) => res.rows);
+        return this.query(sql).then((res) => res.rows);
     }
     queryFirstRow(sql) {
-        return this.query(sql.toString()).then(({ rows, rowCount }) => {
+        return this.query(sql).then(({ rows, rowCount }) => {
             if (rows.length === 0)
                 throw new Error("Query did not return any rows");
             return rows[0];
         });
     }
+    /**
+     * 查询行
+     * 不应查询单语句，否则返回错误值
+     */
     multipleQueryRows(sql) {
-        return this.multipleQuery(sql.toString()).then((res) => res.map((item) => item.rows ?? []));
+        return this.multipleQuery(sql).then((res) => res.map((item) => item.rows ?? []));
     }
     async queryMap(sql, key) {
-        const { rows } = await this.query(sql.toString());
+        const { rows } = await this.query(sql);
         let map = new Map();
         for (let i = 0; i < rows.length; i++) {
             map.set(rows[i][key], rows[i]);

package/dist/sql_gen/select/chain_base.js

@@ -13,7 +13,7 @@ class SqlStatementDataset extends SqlStatement {
      * 如果是 选择语句，则是 (xxx)
      */
     toSelect() {
-        return "(" + this.toString() + ")";
+        return "(" + this.genSql() + ")";
     }
 }
 /** @public */

package/dist/sql_gen/select/query_chain_insert.js

@@ -18,7 +18,7 @@ class SqlChainModify extends SqlStatement {
         else {
             columnsStr = selectColumns(returns);
         }
-        let sql = this.toString() + "\nRETURNING " + columnsStr;
+        let sql = this.genSql() + "\nRETURNING " + columnsStr;
         return new SqlTextStatementDataset(sql);
     }
     onConflict(onConflict) {
@@ -26,12 +26,12 @@ class SqlChainModify extends SqlStatement {
             onConflict = onConflict();
         if (typeof onConflict !== "string")
             onConflict = onConflict.join(",");
-        let sql = this.toString() + `\nON CONFLICT (${onConflict})`;
+        let sql = this.genSql() + `\nON CONFLICT (${onConflict})`;
         return new SqlInsertConflictBranch(sql);
     }
     where(where$1) {
         const sql = where(where$1);
-        return new SqlChainModify(this.toString() + sql);
+        return new SqlChainModify(this.genSql() + sql);
     }
     genSql() {
         return this.sql;

package/dist/sql_gen/select/query_chain_select.js

@@ -8,10 +8,10 @@ var _a;
  */
 class SqlSelectChain extends SqlTextStatementDataset {
     where(param) {
-        return new SqlSelectChain(this.toString() + where(param));
+        return new SqlSelectChain(this.genSql() + where(param));
     }
     groupBy(columns) {
-        let sql = this.toString();
+        let sql = this.genSql();
         if (typeof columns === "string")
             sql += " GROUP BY " + columns;
         else
@@ -19,13 +19,13 @@ class SqlSelectChain extends SqlTextStatementDataset {
         return new SqlSelectChain(sql);
     }
     having(param) {
-        return new SqlSelectChain(this.toString() + having(param));
+        return new SqlSelectChain(this.genSql() + having(param));
     }
     orderBy(param) {
-        return new SqlSelectChain(this.toString() + orderBy(param));
+        return new SqlSelectChain(this.genSql() + orderBy(param));
     }
     limit(limit, offset) {
-        let sql = this.toString();
+        let sql = this.genSql();
         let type;
         if (limit) {
             type = typeof limit;

package/package.json

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