@carbonorm/carbonnode 3.4.0 → 3.4.2

package/src/api/orm/queries/SelectQueryBuilder.ts

@@ -6,12 +6,10 @@ export class SelectQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
 
     build(
         table: string,
-        args: any,
-        primary?: string,
         isSubSelect: boolean = false
     ): SqlBuilderResult {
+        const args = this.request;
         const params = this.useNamedParams ? {} : [];
-
         const selectList = args.SELECT ?? ['*'];
         const selectFields = selectList
             .map((f: any) => this.buildAggregateField(f))
@@ -41,7 +39,7 @@ export class SelectQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
         if (args.PAGINATION) {
             sql += this.buildPaginationClause(args.PAGINATION);
         } else if (!isSubSelect) {
-            sql += primary ? ` ORDER BY ${primary} ASC LIMIT 1` : ` LIMIT 100`;
+            sql += ` LIMIT 100`;
         }
 
         return { sql, params };

package/src/api/orm/queries/UpdateQueryBuilder.ts

@@ -1,3 +1,4 @@
+import {C6C} from "../../C6Constants";
 import {OrmGenerics} from "../../types/ormGenerics";
 import { PaginationBuilder } from '../builders/PaginationBuilder';
 import {SqlBuilderResult} from "../utils/sqlUtils";
@@ -6,9 +7,8 @@ export class UpdateQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
 
     build(
         table: string,
-        data: Record<string, any>,
-        args: any = {}
     ): SqlBuilderResult {
+        const args = this.request;
         const params = this.useNamedParams ? {} : [];
         let sql = `UPDATE \`${table}\``;
 
@@ -16,16 +16,11 @@ export class UpdateQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
             sql += this.buildJoinClauses(args.JOIN, params);
         }
 
-        const setClauses = Object.entries(data).map(([col, val]) => {
-            if (Array.isArray(params)) {
-                params.push(val);
-                return `\`${col}\` = ?`;
-            } else {
-                const key = `param${Object.keys(params).length}`;
-                params[key] = val;
-                return `\`${col}\` = :${key}`;
-            }
-        });
+        if (!(C6C.UPDATE in this.request)) {
+            throw new Error("No update data provided in the request.");
+        }
+
+        const setClauses = Object.entries(this.request[C6C.UPDATE]).map(([col, val]) => this.addParam(params, col, val));
 
         sql += ` SET ${setClauses.join(', ')}`;
 

package/src/api/types/ormInterfaces.ts

@@ -90,7 +90,9 @@ export type RequestQueryBody<
     Overrides extends { [key: string]: any } = {}
 > = Method extends 'GET' | 'PUT' | 'DELETE'
     ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom>>
-    : iAPI<Modify<T, Overrides> & Custom>;
+    : Method extends 'POST'
+        ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom> & Modify<T, Overrides> & Custom>
+        : iAPI<Modify<T, Overrides> & Custom>;
 
 export interface iCacheAPI<ResponseDataType = any> {
     requestArgumentsSerialized: string;

package/src/index.ts

@@ -22,6 +22,7 @@ export * from "./api/orm/builders/ConditionBuilder";
 export * from "./api/orm/builders/JoinBuilder";
 export * from "./api/orm/builders/PaginationBuilder";
 export * from "./api/orm/queries/DeleteQueryBuilder";
+export * from "./api/orm/queries/PostQueryBuilder";
 export * from "./api/orm/queries/SelectQueryBuilder";
 export * from "./api/orm/queries/UpdateQueryBuilder";
 export * from "./api/orm/utils/sqlUtils";