Merge pull request #1612 from taozhi8833998/fix-convert-mysql

fix: convert fun in mysql
taozhi8833998 · Oct 5, 2023 · 0e17e61 · 0e17e61
2 parents 2068f92 + 5e8dbde
commit 0e17e61
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -2783,8 +2783,8 @@ convert_args
       value: [c, { type: 'datatype', ...d, }]
     }
   }
-  / c:(column_ref / literal_string / literal_numeric) __ KW_USING __ d:ident_name {
-    c.suffix = `USING ${d}`
+  / c:or_and_where_expr __ KW_USING __ d:ident_name {
+    c.suffix = `USING ${d.toUpperCase()}`
     return {
       type: 'expr_list',
       value: [c]
@@ -2874,7 +2874,7 @@ func_call
         over: up
     }
   }
-  / name:proc_func_name __ LPAREN __ l:or_and_where_expr? __ RPAREN __ bc:over_partition? {
+  / name:proc_func_name &{ return name.toLowerCase() !== 'convert' } __ LPAREN __ l:or_and_where_expr? __ RPAREN __ bc:over_partition? {
     if (l && l.type !== 'expr_list') l = { type: 'expr_list', value: [l] }
     if ((name.toUpperCase() === 'TIMESTAMPDIFF' || name.toUpperCase() === 'TIMESTAMPADD') && l.value && l.value[0]) l.value[0] = { type: 'origin', value: l.value[0].column }
       return {

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -3075,8 +3075,8 @@ convert_args
       value: [c, { type: 'datatype', ...d, }]
     }
   }
-  / c:(column_ref / literal_string / literal_numeric) __ KW_USING __ d:ident_name {
-    c.suffix = `USING ${d}`
+  / c:or_and_where_expr __ KW_USING __ d:ident_name {
+    c.suffix = `USING ${d.toUpperCase()}`
     return {
       type: 'expr_list',
       value: [c]
@@ -3165,7 +3165,7 @@ func_call
         over: up
     }
   }
-  / name:proc_func_name __ LPAREN __ l:or_and_where_expr? __ RPAREN __ bc:over_partition? {
+  / name:proc_func_name &{ return name.toLowerCase() !== 'convert' } __ LPAREN __ l:or_and_where_expr? __ RPAREN __ bc:over_partition? {
     if (l && l.type !== 'expr_list') l = { type: 'expr_list', value: [l] }
     if ((name.toUpperCase() === 'TIMESTAMPDIFF' || name.toUpperCase() === 'TIMESTAMPADD') && l.value && l.value[0]) l.value[0] = { type: 'origin', value: l.value[0].column }
       return {

diff --git a/src/util.js b/src/util.js
@@ -186,7 +186,7 @@ function literalToSQL(literal) {
   if (!literal) return
   let { prefix } = literal
   const { type, parentheses, suffix, value } = literal
-  let str = value
+  let str = typeof literal === 'string' ? literal : value
   switch (type) {
     case 'backticks_quote_string':
       str = `\`${escape(value)}\``

diff --git a/test/mysql-mariadb.spec.js b/test/mysql-mariadb.spec.js
@@ -790,6 +790,13 @@ describe('mysql', () => {
           "GRANT ALL ON *.* TO 'someuser'@'somehost' WITH GRANT OPTION"
         ]
       },
+      {
+        title: 'convert using',
+        sql: [
+          `select convert(json_unquote(json_extract('{"thing": "252"}', "$.thing")) using utf8);`,
+          `SELECT CONVERT(json_unquote(json_extract('{"thing": "252"}', "$.thing")) USING UTF8)`
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo
@@ -801,6 +808,12 @@ describe('mysql', () => {
       })
     })
 
+    it('should throw error when covert args is not right', () => {
+      const sql = `select convert(json_unquote(json_extract('{"thing": "252"}', "$.thing")));`
+      expect(parser.astify.bind(parser, sql)).to.throw('Expected "!=", "#", "%", "&", "&&", "*", "+", ",", "-", "--", "/", "/*", "<", "<<", "<=", "<>", "=", ">", ">=", ">>", "AND", "BETWEEN", "IN", "IS", "LIKE", "NOT", "ON", "OR", "OVER", "REGEXP", "RLIKE", "USING", "XOR", "^", "div", "|", "||", "~", or [ \\t\\n\\r] but ")" found.')
+      expect(parser.astify.bind(parser, 'select convert("");')).to.throw('Expected "!=", "#", "%", "&", "&&", "*", "+", ",", "-", "--", "/", "/*", "<", "<<", "<=", "<>", "=", ">", ">=", ">>", "AND", "BETWEEN", "COLLATE", "IN", "IS", "LIKE", "NOT", "OR", "REGEXP", "RLIKE", "USING", "XOR", "^", "div", "|", "||", "~", or [ \\t\\n\\r] but ")" found.')
+    })
+
     it('should join multiple table with comma', () => {
       const sql = 'SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id, t3 AS tbl'
       let ast = parser.astify(sql)