fix: fixed returning clause, update query, empty condition, and modifier block

Author: titanism

lib/dialects/base/blocks.js

@@ -165,6 +165,10 @@ module.exports = function (dialect) {
   dialect.blocks.add('modifier', (parameters) => {
     const { modifier } = parameters;
 
+    if (isUndefined(modifier) || modifier === null) {
+      return '';
+    }
+
     if (!isObject(modifier)) {
       throw new TypeError(
         'Invalid `modifier` property type "' + typeof modifier + '"'

lib/dialects/base/index.js

@@ -40,6 +40,11 @@ Dialect.prototype.buildQuery = function (query) {
     throw new Error('Unknown query type "' + query.type + '"');
   }
 
+  // Backwards compatibility: map 'values' to 'modifier' for update queries
+  if (query.type === 'update' && query.values && !query.modifier) {
+    query = { ...query, modifier: query.values };
+  }
+
   return this.buildTemplate(template.pattern, query);
 };
 
@@ -201,6 +206,30 @@ Dialect.prototype.wrapIdentifier = function (name) {
     return name;
   }
 
+  // Don't wrap special SQL keywords and wildcards
+  if (name === '*') {
+    return name;
+  }
+
+  // Don't wrap SQL functions (anything with parentheses)
+  if (name.includes('(') && name.includes(')')) {
+    return name;
+  }
+
+  // Don't wrap SQL expressions (CASE, SELECT, etc.)
+  const upperName = name.toUpperCase().trim();
+  if (
+    upperName.startsWith('CASE ') ||
+    upperName.startsWith('SELECT ') ||
+    upperName.startsWith('(SELECT ') ||
+    upperName.includes(' WHEN ') ||
+    upperName.includes(' THEN ') ||
+    upperName.includes(' ELSE ') ||
+    upperName.includes(' END')
+  ) {
+    return name;
+  }
+
   return '"' + name + '"';
 };
 

lib/dialects/postgresql/blocks.js

@@ -164,6 +164,10 @@ module.exports = function (dialect) {
   dialect.blocks.add('modifier', (parameters) => {
     const { modifier } = parameters;
 
+    if (isUndefined(modifier) || modifier === null) {
+      return '';
+    }
+
     if (!isObject(modifier)) {
       throw new TypeError(
         'Invalid `modifier` property type "' + typeof modifier + '"'