tspace-mysql 1.9.3 → 1.9.4-beta.2

package/dist/lib/core/Builder.js

@@ -2036,10 +2036,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             columns[key] = `( ${updateColumns[key].join(" ")} )`;
         }
         const keyValue = Object.entries(columns).map(([column, value]) => {
-            if (typeof value === "string" &&
-                !value.includes(this.$constants("RAW"))) {
-                value = this.$utils.escapeActions(value);
-            }
+            value = this.$utils.escapePayload(value);
             return `${this.bindColumn(column)} = ${value == null || value === this.$constants("NULL")
                 ? this.$constants("NULL")
                 : typeof value === "string" && value.includes(this.$constants("RAW"))
@@ -3127,18 +3124,20 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @returns {promise<any[]>}
      */
     async get(cb) {
-        if (this.$state.get("EXCEPTS")?.length)
+        if (this.$state.get("VOID"))
+            return [];
+        if (this.$state.get("EXCEPTS")?.length) {
             this.select(...(await this.exceptColumns()));
+        }
         let sql = this._queryBuilder().select();
         if (cb) {
             const callbackSql = cb(sql);
-            if (callbackSql == null || callbackSql === "")
+            if (callbackSql == null || callbackSql === "") {
                 throw new Error("Please provide a callback for execution");
+            }
             sql = callbackSql;
         }
         const result = await this._queryStatement(sql);
-        if (this.$state.get("VOID"))
-            return [];
         await this.$utils.hookHandle(this.$state.get("HOOKS"), result || []);
         return this._resultHandler(result || []);
     }
@@ -3153,18 +3152,19 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         return await this.get(cb);
     }
     /**
-     *
-     * The 'toJSON' method is used to execute a database query and retrieve the result set that matches the query conditions.
+     * The 'toAsyncIterable' method is used to execute a database query and return the result set as an asynchronous iterable.
      *
      * It retrieves multiple records from a database table based on the criteria specified in the query.
+     * The optional callback function can be used to modify the generated SQL query before execution.
      *
-     * It returns a JSON formatted
-     * @returns {promise<string>}
+     * @param {Function?} cb callback function return query sql
+     * @returns {AsyncIterable<any>}
      */
-    async toJSON() {
-        const sql = this._queryBuilder().select();
-        const result = await this._queryStatement(sql);
-        return this._resultHandler(JSON.stringify(result));
+    async *toAsyncIterable(cb) {
+        if (this.$state.get("VOID"))
+            return yield* [];
+        const results = await this.get(cb);
+        return yield* results;
     }
     /**
      * The 'toArray' method is used to execute a database query and retrieve the result set that matches the query conditions.
@@ -4043,10 +4043,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     _queryUpdate(data) {
         this.$utils.transfromDateToDateString(data);
         const values = Object.entries(data).map(([column, value]) => {
-            if (typeof value === "string" &&
-                !value.includes(this.$constants("RAW"))) {
-                value = this.$utils.escapeActions(value);
-            }
+            value = this.$utils.escapePayload(value);
             return `${this.bindColumn(column)} = ${value == null || value === this.$constants("NULL")
                 ? this.$constants("NULL")
                 : this.$utils.transfromValueHasRaw(value)}`;
@@ -4058,10 +4055,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         data = this.$utils.transfromDateToDateString(data);
         const columns = Object.keys(data).map((c) => `\`${c.replace(/\`/g, "")}\``);
         const values = Object.values(data).map((value) => {
-            if (typeof value === "string" &&
-                !value.includes(this.$constants("RAW"))) {
-                value = this.$utils.escapeActions(value);
-            }
+            value = this.$utils.escapePayload(value);
             if (this.$utils.typeOf(value) === "object" ||
                 this.$utils.typeOf(value) === "array") {
                 value = JSON.stringify(value);
@@ -4081,10 +4075,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         for (let objects of data) {
             this.$utils.transfromDateToDateString(objects);
             const vals = Object.values(objects).map((value) => {
-                if (typeof value === "string" &&
-                    !value.includes(this.$constants("RAW"))) {
-                    value = this.$utils.escapeActions(value);
-                }
+                value = this.$utils.escapePayload(value);
                 if (this.$utils.typeOf(value) === "object" ||
                     this.$utils.typeOf(value) === "array") {
                     value = JSON.stringify(value);
@@ -4150,17 +4141,14 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 return {
                     query: async (sql) => {
                         const first = sql.trim().split(/\s+/)[0].toUpperCase();
+                        const isRowLock = Object.values(this.$constants("ROW_LEVEL_LOCK")).some(lock => sql.toUpperCase().includes(lock));
+                        // Row-level locked SELECTs (e.g. FOR UPDATE, FOR SHARE) acquire database locks,
+                        // so they are not considered read-only queries and should be handled as write/locking operations.
                         const isReaded = [
                             this.$constants("SELECT"),
                             this.$constants("SHOW"),
                             this.$constants("DESCRIBE")
-                        ].includes(first) &&
-                            (!sql
-                                .toUpperCase()
-                                .includes(this.$constants("ROW_LEVEL_LOCK").update) ||
-                                !sql
-                                    .toUpperCase()
-                                    .includes(this.$constants("ROW_LEVEL_LOCK").share));
+                        ].includes(first) && !isRowLock;
                         if (isReaded) {
                             const length = poolCluster?.slaves?.length ?? 0;
                             const random = Math.floor(Math.random() * length);
@@ -4194,10 +4182,16 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     transaction: async () => {
                         return await poolCluster.masters[0].connection();
                     },
+                    stream: async (sql) => {
+                        return await poolCluster.masters[0].stream(sql);
+                    },
                 };
             }
             let pool = Pool_1.Pool.connect();
             return {
+                stream: async (sql) => {
+                    return await pool.stream(sql);
+                },
                 transaction: async () => {
                     return await pool.connection();
                 },