stackrender
diff --git a/‎pegjs/mysql.pegjs‎
Lines changed: 5 additions & 4 deletions b/‎pegjs/mysql.pegjs‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎src/update.js‎
Lines changed: 2 additions & 3 deletions b/‎src/update.js‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎test/update.spec.js‎
Lines changed: 5 additions & 0 deletions b/‎test/update.spec.js‎
Lines changed: 5 additions & 0 deletions
@@ -1746,9 +1746,6 @@ set_item
   = tbl:(ident __ DOT)? __ c:column __ '=' __ v:additive_expr {
       return { column: c, value: v, table: tbl && tbl[0] };
   }
-  / tbl:(ident __ DOT)? __ c:column __ '=' __ KW_VALUES __ LPAREN __ v:column_ref __ RPAREN {
-      return { column: c, value: v, table: tbl && tbl[0], keyword: 'values' };
-  }
 
 insert_value_clause
   = value_clause
@@ -2840,7 +2837,11 @@ proc_func_name
       }
       return name;
     }
-    / ident_name
+    / n:ident_name {
+      const upperName = n.toUpperCase()
+      if (reservedMap[upperName] === true) return upperName
+      return n
+    }
     / quoted_ident
 
 proc_func_call
 
@@ -1,7 +1,7 @@
 import { tablesToSQL } from './tables'
 import { exprToSQL, orderOrPartitionByToSQL } from './expr'
 import { limitToSQL } from './limit'
-import { hasVal, identifierToSql, commonOptionConnector, returningToSQL, toUpper } from './util'
+import { hasVal, identifierToSql, commonOptionConnector, returningToSQL } from './util'
 
 /**
  * @param {Array} sets
@@ -11,15 +11,14 @@ function setToSQL(sets) {
   if (!sets || sets.length === 0) return ''
   const clauses = []
   for (const set of sets) {
-    const { table, column, value, keyword } = set
+    const { table, column, value } = set
     const str = [table, column].filter(hasVal).map(info => identifierToSql(info)).join('.')
     const setItem = [str]
     let val = ''
     if (value) {
       val = exprToSQL(value)
       setItem.push('=', val)
     }
-    if (keyword) setItem[2] = `${toUpper(keyword)}(${val})`
     clauses.push(setItem.filter(hasVal).join(' '))
   }
   return clauses.join(', ')
 
@@ -200,6 +200,11 @@ describe('update', () => {
     });
   })
 
+  it('should support set value', () => {
+    expect(getParsedSql('update a set id = 123, name = values(abc) where age > 15 order by name'))
+      .to.be.equal('UPDATE `a` SET `id` = 123, `name` = VALUES(`abc`) WHERE `age` > 15 ORDER BY `name` ASC')
+  })
+
   it('should support order by and limit in update sql', () => {
     expect(getParsedSql('update a set id = 123 where age > 15 order by name')).to.be.equal('UPDATE `a` SET `id` = 123 WHERE `age` > 15 ORDER BY `name` ASC')
     expect(getParsedSql('update a set id = 123 order by name')).to.be.equal('UPDATE `a` SET `id` = 123 ORDER BY `name` ASC')