Merge pull request taozhi8833998#2601 from taozhi8833998/fix-trim-func

fix: trim function with multiple args in all dialects

Author: taozhi8833998

pegjs/snowflake.pegjs

@@ -177,7 +177,7 @@
   function commonStrToLiteral(strOrLiteral) {
     return typeof strOrLiteral === 'string' ? { type: 'same', value: strOrLiteral } : strOrLiteral
   }
-  
+
   function getSurroundFromLiteralType(literal) {
     switch (literal.type) {
       case 'double_quote_string':
@@ -2571,7 +2571,7 @@ table_name
       v.table = v.name;
       return v;
     }
-  
+
 
 or_and_expr
 	= head:expr tail:(__ (KW_AND / KW_OR) __ expr)* {

src/func.js

@@ -104,8 +104,17 @@ function funcToSQL(expr) {
   const suffixStr = exprToSQL(suffix)
   const funcName = [literalToSQL(name.schema), name.name.map(literalToSQL).join('.')].filter(hasVal).join('.')
   if (!args) return [funcName, withinGroupStr, overStr].filter(hasVal).join(' ')
-  let separator = expr.separator || ', '
-  if (toUpper(funcName) === 'TRIM') separator = ' '
+  const separator = expr.separator || ', '
+  let fromPosition = 0
+  if (toUpper(funcName) === 'TRIM') {
+    for (let i = 0, len = args.value.length; i < len; ++i) {
+      const arg = args.value[i]
+      if (arg.type === 'origin' && arg.value === 'from') {
+        fromPosition = i
+        break
+      }
+    }
+  }
   let str = [funcName]
   str.push(args_parentheses === false ? ' ' : '(')
   const argsList = exprToSQL(args)
@@ -115,6 +124,8 @@ function funcToSQL(expr) {
       argsSQL = [argsSQL, argsList[i]].join(` ${exprToSQL(separator[i - 1])} `)
     }
     str.push(argsSQL)
+  } else if (toUpper(funcName) === 'TRIM' && fromPosition > 0) {
+    str.push([argsList.slice(0, fromPosition + 1).join(' '), argsList.slice(fromPosition + 1).join(', ')].join(' '))
   } else {
     str.push(argsList.join(separator))
   }

test/snowflake.spec.js

@@ -552,6 +552,13 @@ describe('snowflake', () => {
         'SELECT * FROM my_table',
         'SELECT * FROM my_table'
       ]
+    },
+    {
+      title: 'trim function with multiple args',
+      sql: [
+        "SELECT trim(col, ' ') FROM DUAL;",
+        `SELECT trim("col", ' ') FROM DUAL`
+      ]
     }
   ]
   SQL_LIST.forEach(sqlInfo => {