tspace-mysql 1.9.3-beta.3 → 1.9.4-beta.1

package/README.md

@@ -95,7 +95,8 @@ npm install -D typescript@5.9.3
 - [Query Builder](#query-builder)
   - [Table Name & Alias Name](#table-name--alias-name)
   - [Returning Results](#returning-results)
-  - [Query Statement](#query-statements)
+  - [Query Statements](#query-statements)
+  - [Stream Statements](#stream-statements)
   - [Select Statements](#select-statements)
   - [Raw Expressions](#raw-expressions)
   - [Ordering, Grouping, Limit and Offset](#ordering-grouping-limit-and-offset)
@@ -532,6 +533,19 @@ const query = await DB.query(
   username : ['name1','name2']
 })
 // SELECT * FROM users WHERE id = '1' AND email IS NULL AND username in ('name1','name2');
+
+const query = await DB.query(
+  "SELECT * FROM users WHERE id = ? AND email IS ? AND name IN ?", 
+  [1,null,['name1','name2']]
+)
+// SELECT * FROM users WHERE id = '1' AND email IS NULL AND username in ('name1','name2');
+```
+
+## Stream Statements
+```js
+for await (const user of DB.stream("SELECT * FROM users")) {
+  console.log(user);
+}
 ```
 
 ## Select Statements
@@ -3276,10 +3290,11 @@ class Post extends Model {
       id: Blueprint.int().notNull().primary().autoIncrement(),
       uuid: Blueprint.varchar(50).null(),
       user_id: Blueprint.int().notNull().foreign({
-        references: "id",
-        on: User,
-        onDelete: "CASCADE",
-        onUpdate: "CASCADE",
+        on: () => User, // or "users"
+        // Optionals
+        references: "id", // default "id"
+        onDelete: "CASCADE", // default "CASCADE"
+        onUpdate: "CASCADE", // default "CASCADE"
       }),
       title: Blueprint.varchar(255).null(),
       created_at: Blueprint.timestamp().null(),
@@ -4200,7 +4215,7 @@ await Queue.start({
   maxIdleRetries : 8, // @default 5, maximum retries when no jobs are available
   poll : {            
     enabled : true,   // @default false, enable periodic job checking
-    timeout : 10_000  // @default 60_000, polling interval
+    interval : 10_000  // @default 60_000, polling interval
   };
 }); 
 

package/dist/lib/core/Abstracts/AbstractBuilder.d.ts

@@ -26,6 +26,7 @@ declare abstract class AbstractBuilder {
         get: Function;
         queryBuilder: Function;
         transaction: Function;
+        stream: Function;
     };
     abstract void(): this;
     abstract debug(): this;

package/dist/lib/core/Abstracts/AbstractBuilder.js

@@ -22,6 +22,7 @@ class AbstractBuilder {
         get: () => { },
         queryBuilder: () => { },
         transaction: () => { },
+        stream: (sql) => { },
     };
 }
 exports.AbstractBuilder = AbstractBuilder;

package/dist/lib/core/Abstracts/AbstractBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractBuilder.js","sourceRoot":"","sources":["../../../../src/lib/core/Abstracts/AbstractBuilder.ts"],"names":[],"mappings":";;;AAGA,yCAA4C;AAO5C,MAAe,eAAe;IAEhB,MAAM,CAAU;IAEhB,SAAS,GAAY,MAAM,CAAC,eAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAEnD,YAAY,GAAG;QACrB,IAAI,EAAO,eAAM,CAAC,IAAI;QACtB,IAAI,EAAO,MAAM,CAAC,eAAM,CAAC,IAAI,CAAC;QAC9B,QAAQ,EAAG,MAAM,CAAC,eAAM,CAAC,QAAQ,CAAC;QAClC,QAAQ,EAAG,MAAM,CAAC,eAAM,CAAC,QAAQ,CAAC;QAClC,QAAQ,EAAG,eAAM,CAAC,QAAQ;KAC7B,CAAA;IAES,OAAO,GAAI,MAAM,CAAC,eAAM,CAAC,MAAM,IAAI,OAAO,CAAY,CAAC;IAEvD,QAAQ,GAAa,OAAO,CAAC,eAAM,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IAEtD,UAAU,CAGlB;IAEQ,MAAM,CAAgB;IAEtB,KAAK,GAMX;QACA,KAAK,EAAE,CAAC,GAAW,EAAE,EAAE,GAAE,CAAC;QAC1B,GAAG,EAAE,CAAC,IAAU,EAAE,EAAE,GAAE,CAAC;QACvB,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;QACb,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;QACtB,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC;KACxB,CAAA;CAwFJ;AAES,0CAAe;AACzB,kBAAe,eAAe,CAAA"}
+{"version":3,"file":"AbstractBuilder.js","sourceRoot":"","sources":["../../../../src/lib/core/Abstracts/AbstractBuilder.ts"],"names":[],"mappings":";;;AAGA,yCAA4C;AAO5C,MAAe,eAAe;IAEhB,MAAM,CAAU;IAEhB,SAAS,GAAY,MAAM,CAAC,eAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAEnD,YAAY,GAAG;QACrB,IAAI,EAAO,eAAM,CAAC,IAAI;QACtB,IAAI,EAAO,MAAM,CAAC,eAAM,CAAC,IAAI,CAAC;QAC9B,QAAQ,EAAG,MAAM,CAAC,eAAM,CAAC,QAAQ,CAAC;QAClC,QAAQ,EAAG,MAAM,CAAC,eAAM,CAAC,QAAQ,CAAC;QAClC,QAAQ,EAAG,eAAM,CAAC,QAAQ;KAC7B,CAAA;IAES,OAAO,GAAI,MAAM,CAAC,eAAM,CAAC,MAAM,IAAI,OAAO,CAAY,CAAC;IAEvD,QAAQ,GAAa,OAAO,CAAC,eAAM,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC;IAEtD,UAAU,CAGlB;IAEQ,MAAM,CAAgB;IAEtB,KAAK,GAOX;QACA,KAAK,EAAE,CAAC,GAAW,EAAE,EAAE,GAAE,CAAC;QAC1B,GAAG,EAAE,CAAC,IAAU,EAAE,EAAE,GAAE,CAAC;QACvB,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;QACb,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;QACtB,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC;QACrB,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,GAAE,CAAC;KAC9B,CAAA;CAwFJ;AAES,0CAAe;AACzB,kBAAe,eAAe,CAAA"}

package/dist/lib/core/Blueprint.d.ts

@@ -1,4 +1,4 @@
-import { type T } from "./UtilityTypes";
+import type { T } from "./UtilityTypes";
 import { Model } from "./Model";
 type ExtendType = NumberConstructor | StringConstructor | BooleanConstructor | DateConstructor | readonly ExtendType[] | {
     [_: string]: ExtendType;
@@ -478,7 +478,7 @@ declare class Blueprint<T = any> {
      */
     foreign({ references, on, onDelete, onUpdate, }: {
         references?: string;
-        on: (new () => Model) | string;
+        on: (() => new () => Model) | string;
         onDelete?: "CASCADE" | "NO ACTION" | "RESTRICT" | "SET NULL";
         onUpdate?: "CASCADE" | "NO ACTION" | "RESTRICT" | "SET NULL";
     }): Blueprint<T>;

package/dist/lib/core/Builder.d.ts

@@ -1494,7 +1494,7 @@ declare class Builder<TA extends TAction = null> extends AbstractBuilder {
      * @param {Function} func function for callback result
      * @returns {this}
      */
-    hook(func: Function): this;
+    hook(func: (results: any) => void): this;
     /**
      * The 'before' method is used function when execute returns a result to callback function
      * @param {Function} func function for callback result

package/dist/lib/core/Builder.js

@@ -2036,7 +2036,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             columns[key] = `( ${updateColumns[key].join(" ")} )`;
         }
         const keyValue = Object.entries(columns).map(([column, value]) => {
-            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"))
@@ -4043,7 +4043,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     _queryUpdate(data) {
         this.$utils.transfromDateToDateString(data);
         const values = Object.entries(data).map(([column, value]) => {
-            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)}`;
@@ -4055,7 +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) => {
-            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);
@@ -4075,7 +4075,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         for (let objects of data) {
             this.$utils.transfromDateToDateString(objects);
             const vals = Object.values(objects).map((value) => {
-                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);
@@ -4141,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);
@@ -4185,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();
                 },