fix: wip

Author: titanism

lib/builder.js

@@ -104,6 +104,11 @@ Builder.prototype._handleBufferValue = function (value) {
 };
 
 Builder.prototype._handleObjectValue = function (value) {
+  // Handle expression objects first
+  if (value && typeof value === 'object' && value.expression) {
+    return this.dialect.buildExpression(value.expression);
+  }
+
   // Issue #55: Support for BSON ObjectId conversion to String
   // Issue #57: Support for null Object type
   let stringValue;

lib/dialects/base/blocks.js

@@ -178,12 +178,56 @@ module.exports = function (dialect) {
     const modifierParts = [];
 
     each(modifier, (value, key) => {
-      const modifierPart =
-        dialect.wrapIdentifier(key) +
-        ' = ' +
-        dialect.buildBlock('term', { term: value, type: 'value' });
+      // Handle MongoDB operators
+      if (key.startsWith('$')) {
+        switch (key) {
+          case '$set': {
+            each(value, (setValue, setKey) => {
+              const modifierPart =
+                dialect.wrapIdentifier(setKey) +
+                ' = ' +
+                dialect.buildBlock('term', { term: setValue, type: 'value' });
+              modifierParts.push(modifierPart);
+            });
+
+            break;
+          }
+
+          case '$inc': {
+            each(value, (incValue, incKey) => {
+              const modifierPart =
+                dialect.wrapIdentifier(incKey) +
+                ' = ' +
+                dialect.wrapIdentifier(incKey) +
+                ' + ' +
+                dialect.buildBlock('term', { term: incValue, type: 'value' });
+              modifierParts.push(modifierPart);
+            });
+
+            break;
+          }
+
+          case '$unset': {
+            each(value, (unsetValue, unsetKey) => {
+              const modifierPart = dialect.wrapIdentifier(unsetKey) + ' = NULL';
+              modifierParts.push(modifierPart);
+            });
 
-      modifierParts.push(modifierPart);
+            break;
+          }
+
+          default: {
+            throw new Error('Unknown MongoDB operator "' + key + '"');
+          }
+        }
+      } else {
+        // Handle regular field assignments
+        const modifierPart =
+          dialect.wrapIdentifier(key) +
+          ' = ' +
+          dialect.buildBlock('term', { term: value, type: 'value' });
+        modifierParts.push(modifierPart);
+      }
     });
 
     return 'set ' + modifierParts.join(', ');
@@ -681,6 +725,11 @@ module.exports = function (dialect) {
       throw new TypeError('Invalid term object');
     }
 
+    // Handle expression objects
+    if (has(term, 'expression')) {
+      return dialect.buildExpression(term.expression);
+    }
+
     if (has(term, 'name')) {
       let field = '';
 
@@ -716,6 +765,11 @@ module.exports = function (dialect) {
       throw new TypeError('Invalid term object');
     }
 
+    // Handle expression objects
+    if (has(term, 'expression')) {
+      return dialect.buildExpression(term.expression);
+    }
+
     if (objectUtils.hasSome(term, termKeys)) {
       const termKey = keys(term)[0];
       const termValue = term[termKey];

lib/dialects/postgresql/blocks.js

@@ -177,12 +177,63 @@ module.exports = function (dialect) {
     const modifierParts = [];
 
     each(modifier, (value, key) => {
-      const modifierPart =
-        dialect.wrapIdentifier(key) +
-        ' = ' +
-        dialect.buildBlock('term', { term: value, type: 'value' });
+      // Handle MongoDB operators
+      if (key.startsWith('$')) {
+        switch (key) {
+          case '$set': {
+            each(value, (fieldValue, fieldKey) => {
+              const modifierPart =
+                dialect.wrapIdentifier(fieldKey) +
+                ' = ' +
+                dialect.buildBlock('term', { term: fieldValue, type: 'value' });
+              modifierParts.push(modifierPart);
+            });
+
+            break;
+          }
+
+          case '$inc': {
+            each(value, (incValue, fieldKey) => {
+              const modifierPart =
+                dialect.wrapIdentifier(fieldKey) +
+                ' = ' +
+                dialect.wrapIdentifier(fieldKey) +
+                ' + ' +
+                dialect.buildBlock('term', { term: incValue, type: 'value' });
+              modifierParts.push(modifierPart);
+            });
 
-      modifierParts.push(modifierPart);
+            break;
+          }
+
+          case '$unset': {
+            each(value, (unsetValue, fieldKey) => {
+              const modifierPart = dialect.wrapIdentifier(fieldKey) + ' = NULL';
+              modifierParts.push(modifierPart);
+            });
+
+            break;
+          }
+
+          default: {
+            // For other MongoDB operators, try to handle them generically
+            each(value, (fieldValue, fieldKey) => {
+              const modifierPart =
+                dialect.wrapIdentifier(fieldKey) +
+                ' = ' +
+                dialect.buildBlock('term', { term: fieldValue, type: 'value' });
+              modifierParts.push(modifierPart);
+            });
+          }
+        }
+      } else {
+        // Handle regular field assignments
+        const modifierPart =
+          dialect.wrapIdentifier(key) +
+          ' = ' +
+          dialect.buildBlock('term', { term: value, type: 'value' });
+        modifierParts.push(modifierPart);
+      }
     });
 
     return 'set ' + modifierParts.join(', ');
@@ -559,6 +610,10 @@ module.exports = function (dialect) {
       }
 
       if (isObject(term)) {
+        if (has(term, 'expression')) {
+          return dialect.buildExpression(term.expression);
+        }
+
         if (has(term, 'name')) {
           let field = '';