@carbonorm/carbonnode 4.0.0 → 4.0.1

package/dist/api/orm/builders/ConditionBuilder.d.ts

@@ -27,6 +27,8 @@ export declare abstract class ConditionBuilder<G extends OrmGenerics> extends Ag
     private serializeOperand;
     private isPlainArrayLiteral;
     private isPlainObjectLiteral;
+    private resolveColumnDefinition;
+    private isJsonColumn;
     protected serializeUpdateValue(value: any, params: any[] | Record<string, any>, contextColumn?: string): string;
     private ensurePlainObject;
     private resolveExistsInnerColumn;

package/dist/index.cjs.js

@@ -1827,8 +1827,9 @@ var ConditionBuilder = /** @class */ (function (_super) {
         }
         throw new Error('Unsupported operand type in SQL expression.');
     };
-    ConditionBuilder.prototype.isPlainArrayLiteral = function (value) {
+    ConditionBuilder.prototype.isPlainArrayLiteral = function (value, allowColumnRefs) {
         var _this = this;
+        if (allowColumnRefs === void 0) { allowColumnRefs = false; }
         if (!Array.isArray(value))
             return false;
         return value.every(function (item) {
@@ -1838,14 +1839,15 @@ var ConditionBuilder = /** @class */ (function (_super) {
             if (type === 'string' || type === 'number' || type === 'boolean')
                 return true;
             if (Array.isArray(item))
-                return _this.isPlainArrayLiteral(item);
+                return _this.isPlainArrayLiteral(item, allowColumnRefs);
             if (item && typeof item === 'object')
-                return _this.isPlainObjectLiteral(item);
+                return _this.isPlainObjectLiteral(item, allowColumnRefs);
             return false;
         });
     };
-    ConditionBuilder.prototype.isPlainObjectLiteral = function (value) {
+    ConditionBuilder.prototype.isPlainObjectLiteral = function (value, allowColumnRefs) {
         var _this = this;
+        if (allowColumnRefs === void 0) { allowColumnRefs = false; }
         if (!value || typeof value !== 'object' || Array.isArray(value))
             return false;
         if (value instanceof Date)
@@ -1864,17 +1866,37 @@ var ConditionBuilder = /** @class */ (function (_super) {
         })) {
             return false;
         }
-        if (entries.some(function (_a) {
-            var key = _a[0];
-            return typeof key === 'string' && (_this.isColumnRef(key) || key.includes('.'));
-        })) {
-            return false;
+        if (!allowColumnRefs) {
+            if (entries.some(function (_a) {
+                var key = _a[0];
+                return typeof key === 'string' && (_this.isColumnRef(key) || key.includes('.'));
+            })) {
+                return false;
+            }
         }
         return true;
     };
+    ConditionBuilder.prototype.resolveColumnDefinition = function (column) {
+        var _a, _b, _c, _d;
+        if (!column || typeof column !== 'string' || !column.includes('.'))
+            return undefined;
+        var _e = column.split('.', 2), prefix = _e[0], colName = _e[1];
+        var tableName = (_a = this.aliasMap[prefix]) !== null && _a !== void 0 ? _a : prefix;
+        var table = (_c = (_b = this.config.C6) === null || _b === void 0 ? void 0 : _b.TABLES) === null || _c === void 0 ? void 0 : _c[tableName];
+        if (!(table === null || table === void 0 ? void 0 : table.TYPE_VALIDATION))
+            return undefined;
+        return (_d = table.TYPE_VALIDATION[colName]) !== null && _d !== void 0 ? _d : table.TYPE_VALIDATION["".concat(tableName, ".").concat(colName)];
+    };
+    ConditionBuilder.prototype.isJsonColumn = function (column) {
+        var columnDef = this.resolveColumnDefinition(column);
+        var mysqlType = columnDef === null || columnDef === void 0 ? void 0 : columnDef.MYSQL_TYPE;
+        return typeof mysqlType === 'string' && mysqlType.toLowerCase().includes('json');
+    };
     ConditionBuilder.prototype.serializeUpdateValue = function (value, params, contextColumn) {
         var normalized = value instanceof Map ? Object.fromEntries(value) : value;
-        if (this.isPlainArrayLiteral(normalized) || this.isPlainObjectLiteral(normalized)) {
+        var allowColumnRefs = this.isJsonColumn(contextColumn);
+        if (this.isPlainArrayLiteral(normalized, allowColumnRefs)
+            || this.isPlainObjectLiteral(normalized, allowColumnRefs)) {
             return this.addParam(params, contextColumn !== null && contextColumn !== void 0 ? contextColumn : '', JSON.stringify(normalized));
         }
         var _a = this.serializeOperand(normalized, params, contextColumn), sql = _a.sql, isReference = _a.isReference, isExpression = _a.isExpression, isSubSelect = _a.isSubSelect;