@carbonorm/carbonnode 3.5.2 → 3.5.3

package/src/api/orm/builders/ConditionBuilder.ts

@@ -1,5 +1,4 @@
 import {C6C} from "api/C6Constants";
-import isVerbose from "../../../variables/isVerbose";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {DetermineResponseDataType} from "../../types/ormInterfaces";
 import {convertHexIfBinary, SqlBuilderResult} from "../utils/sqlUtils";
@@ -111,7 +110,7 @@ export abstract class ConditionBuilder<
                     throw new Error(`MATCH_AGAINST requires a table reference as the left operand. Column '${column}' is not a valid table reference.`);
                 }
                 const matchClause = `(MATCH(${column}) ${againstClause})`;
-                isVerbose() && console.log(`[MATCH_AGAINST] ${matchClause}`);
+                this.config.verbose && console.log(`[MATCH_AGAINST] ${matchClause}`);
                 return matchClause;
             }
 
@@ -141,6 +140,10 @@ export abstract class ConditionBuilder<
                 return `(${column}) ${op} ${value}`;
             }
 
+            if (leftIsRef && !rightIsRef) {
+                return `(${column}) ${op} ${this.addParam(params, column, value)}`;
+            }
+
             if (rightIsRef) {
                 return `(${this.addParam(params, column, column)}) ${op} ${value}`;
             }
@@ -195,7 +198,7 @@ export abstract class ConditionBuilder<
         const clause = this.buildBooleanJoinedConditions(whereArg, true, params);
         if (!clause) return '';
         const trimmed = clause.replace(/^\((.*)\)$/, '$1');
-        isVerbose() && console.log(`[WHERE] ${trimmed}`);
+        this.config.verbose && console.log(`[WHERE] ${trimmed}`);
         return ` WHERE ${trimmed}`;
     }
 }

package/src/api/orm/builders/JoinBuilder.ts

@@ -1,4 +1,3 @@
-import isVerbose from "../../../variables/isVerbose";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {ConditionBuilder} from "./ConditionBuilder";
 
@@ -18,7 +17,7 @@ export abstract class JoinBuilder<G extends OrmGenerics> extends ConditionBuilde
             }
         }
 
-        isVerbose() && console.log(`[JOIN] ${sql.trim()}`);
+        this.config.verbose && console.log(`[JOIN] ${sql.trim()}`);
 
         return sql;
     }

package/src/api/orm/builders/PaginationBuilder.ts

@@ -1,5 +1,4 @@
 import {C6Constants} from "api/C6Constants";
-import isVerbose from "../../../variables/isVerbose";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {JoinBuilder} from "./JoinBuilder";
 
@@ -50,7 +49,7 @@ export abstract class PaginationBuilder<G extends OrmGenerics> extends JoinBuild
             sql += ` LIMIT ${offset}, ${lim}`;
         }
 
-        isVerbose() && console.log(`[PAGINATION] ${sql.trim()}`);
+        this.config.verbose && console.log(`[PAGINATION] ${sql.trim()}`);
         return sql;
     }
 }

package/src/api/restRequest.ts

@@ -32,6 +32,8 @@ export default function restRequest<
 
         const config = typeof configX === "function" ? configX() : configX;
 
+        config.verbose ??= true; // Default to verbose logging if not set
+
         // SQL path if on Node with a provided pool
         if (isNode() && config.mysqlPool) {
             const {SqlExecutor} = await import('./executors/SqlExecutor');

package/src/api/utils/logger.ts

@@ -1,17 +1,13 @@
-import isVerbose from "variables/isVerbose";
-
 /**
  * Conditionally group a log if verbose.
  */
 export function group(title: string, data?: any): void {
-    if (!isVerbose()) return;
     console.groupCollapsed(`%c${title}`, "color: #007acc");
     if (data !== undefined) console.log(data);
     console.groupEnd();
 }
 
 export function info(message: string, ...optional: any[]): void {
-    if (!isVerbose()) return;
     console.info(`%cINFO: ${message}`, "color: #0a0", ...optional);
 }