fix: between star column, support bracket in function args

taozhi8833998 · taozhi8833998 · commit 132f593de35e · 2024-06-06T09:22:11.000+08:00
diff --git a/pegjs/athena.pegjs b/pegjs/athena.pegjs
@@ -1752,6 +1752,7 @@ in_op_right
 additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/bigquery.pegjs b/pegjs/bigquery.pegjs
@@ -2262,6 +2262,7 @@ in_op_right
 additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/db2.pegjs b/pegjs/db2.pegjs
@@ -1764,6 +1764,7 @@ in_op_right
 additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -2571,6 +2571,7 @@ additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
       // => binary_expr
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/hive.pegjs b/pegjs/hive.pegjs
@@ -1752,6 +1752,7 @@ in_op_right
 additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -2728,6 +2728,7 @@ in_op_right
 additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -2996,6 +2996,7 @@ in_op_right
 additive_expr
   = head: multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -3892,6 +3892,7 @@ additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
       // => binary_expr
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -4089,6 +4089,7 @@ additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
       // => binary_expr
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -3932,6 +3932,7 @@ additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
       // => binary_expr
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -3283,6 +3283,7 @@ additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
       // => binary_expr
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -1950,6 +1950,7 @@ in_op_right
 additive_expr
   = head: multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/transactsql.pegjs b/pegjs/transactsql.pegjs
@@ -2324,6 +2324,7 @@ in_op_right
 additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -2196,9 +2196,15 @@ array_index
     }
   }
 
+array_index_list
+  = head:array_index tail:(__ array_index)* {
+    // => array_index[]
+    return createList(head, tail, 1)
+  }
+
 expr_item
-  = e:binary_column_expr __ a:array_index? {
-    // => binary_expr & { array_index: array_index }
+  = e:binary_column_expr __ a:array_index_list? {
+    // => binary_column_expr & { array_index: array_index }
     if (a) e.array_index = a
     return e
   }
@@ -3142,7 +3148,7 @@ binary_column_expr
   }
 
 or_and_where_expr
-	= head:expr tail:(__ (KW_AND / KW_OR / COMMA) __ expr)* {
+	= head:expr_item tail:(__ (KW_AND / KW_OR / COMMA) __ expr_item)* {
     // => binary_expr | { type: 'expr_list'; value: expr[] }
     const len = tail.length
     let result = head;
@@ -3326,6 +3332,7 @@ additive_expr
   = head:multiplicative_expr
     tail:(__ additive_operator  __ multiplicative_expr)* {
       // => binary_expr
+      if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')
       return createBinaryExprChain(head, tail);
     }
 
diff --git a/src/column.js b/src/column.js
@@ -199,6 +199,7 @@ function columnsToSQL(columns, tables) {
 }
 
 export {
+  arrayIndexToSQL,
   columnDefinitionToSQL,
   columnRefToSQL,
   columnToSQL,
diff --git a/src/func.js b/src/func.js
@@ -1,3 +1,4 @@
+import { arrayIndexToSQL } from './column'
 import { exprToSQL } from './expr'
 import { commonOptionConnector, commonTypeValue, hasVal, identifierToSql, literalToSQL, toUpper } from './util'
 import { overToSQL } from './over'
@@ -75,7 +76,7 @@ function flattenFunToSQL(stmt) {
 }
 
 function funcToSQL(expr) {
-  const { args, name, args_parentheses, parentheses, over, collate, suffix } = expr
+  const { args, array_index, name, args_parentheses, parentheses, over, collate, suffix } = expr
   const collateStr = commonTypeValue(collate).join(' ')
   const overStr = overToSQL(over)
   const suffixStr = exprToSQL(suffix)
@@ -87,6 +88,7 @@ function funcToSQL(expr) {
   str.push(args_parentheses === false ? ' ' : '(')
   str.push(exprToSQL(args).join(separator))
   if (args_parentheses !== false) str.push(')')
+  str.push(arrayIndexToSQL(array_index))
   str = [str.join(''), suffixStr].filter(hasVal).join(' ')
   return [parentheses ? `(${str})` : str, collateStr, overStr].filter(hasVal).join(' ')
 }
diff --git a/test/trino.spec.js b/test/trino.spec.js
@@ -73,19 +73,33 @@ describe('trino', () => {
         'SELECT SUM(a) OVER (PARTITION BY b ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)'
 
       ]
-    }
+    },
+    {
+      title: 'nested array index',
+      sql: [
+        `SELECT ddd(split(name, '_')[1]) as test
+        FROM tableName
+        WHERE u BETWEEN t('today') and t('tomorrow')
+        LIMIT 10`,
+        `SELECT ddd(split(name, '_')[1]) AS "test" FROM "tableName" WHERE u BETWEEN t('today') AND t('tomorrow') LIMIT 10`
+      ]
+    },
   ]
   SQL_LIST.forEach(sqlInfo => {
     const { title, sql } = sqlInfo
     it(`should support ${title}`, () => {
       expect(getParsedSql(sql[0], opt)).to.equal(sql[1])
     })
   })
+  it('should throw error when star column in additive expr', () => {
+    const sql = 'SELECT abc FROM tableA WHERE u BETWEEN * - * - * - * - * and 10 LIMIT 10'
+    expect(parser.astify.bind(parser, sql, opt)).to.throw('args could not be star column in additive expr')
+  })
   it('should throw error when lambda expression is invalid', () => {
     let sql = 'SELECT numbers, transform(numbers, n -> max(n)) as squared_numbers FROM (VALUES (ARRAY[1, 2]),(ARRAY[3, 4]),(ARRAY[5, 6, 7])) AS t(numbers);'
     expect(parser.astify.bind(parser, sql, opt)).to.throw('Aggregations are not supported in lambda expressions')
     sql = 'SELECT numbers, transform(numbers, n -> 2 + (select 3)) as squared_numbers FROM (VALUES (ARRAY[1, 2]),(ARRAY[3, 4]),(ARRAY[5, 6, 7])) AS t(numbers);'
-    expect(parser.astify.bind(parser, sql, opt)).to.throw('Subqueries are not supported in lambda expressions')
+    expect(parser.astify.bind(parser, sql, opt)).to.throw('invalid column clause with select statement')
   })
   it('should support deep nest function call', function () {
     this.timeout(100)

Original file line number	Diff line number	Diff line change
`@@ -1752,6 +1752,7 @@ in_op_right`
`1752`	`1752`	`additive_expr`
`1753`	`1753`	`= head:multiplicative_expr`
`1754`	`1754`	`tail:(__ additive_operator __ multiplicative_expr)* {`
	`1755`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`1755`	`1756`	`return createBinaryExprChain(head, tail);`
`1756`	`1757`	`}`
`1757`	`1758`
Original file line number	Diff line number	Diff line change
`@@ -2262,6 +2262,7 @@ in_op_right`
`2262`	`2262`	`additive_expr`
`2263`	`2263`	`= head:multiplicative_expr`
`2264`	`2264`	`tail:(__ additive_operator __ multiplicative_expr)* {`
	`2265`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`2265`	`2266`	`return createBinaryExprChain(head, tail);`
`2266`	`2267`	`}`
`2267`	`2268`
Original file line number	Diff line number	Diff line change
`@@ -1764,6 +1764,7 @@ in_op_right`
`1764`	`1764`	`additive_expr`
`1765`	`1765`	`= head:multiplicative_expr`
`1766`	`1766`	`tail:(__ additive_operator __ multiplicative_expr)* {`
	`1767`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`1767`	`1768`	`return createBinaryExprChain(head, tail);`
`1768`	`1769`	`}`
`1769`	`1770`
Original file line number	Diff line number	Diff line change
`@@ -2571,6 +2571,7 @@ additive_expr`
`2571`	`2571`	`= head:multiplicative_expr`
`2572`	`2572`	`tail:(__ additive_operator __ multiplicative_expr)* {`
`2573`	`2573`	`// => binary_expr`
	`2574`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`2574`	`2575`	`return createBinaryExprChain(head, tail);`
`2575`	`2576`	`}`
`2576`	`2577`
Original file line number	Diff line number	Diff line change
`@@ -2728,6 +2728,7 @@ in_op_right`
`2728`	`2728`	`additive_expr`
`2729`	`2729`	`= head:multiplicative_expr`
`2730`	`2730`	`tail:(__ additive_operator __ multiplicative_expr)* {`
	`2731`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`2731`	`2732`	`return createBinaryExprChain(head, tail);`
`2732`	`2733`	`}`
`2733`	`2734`
Original file line number	Diff line number	Diff line change
`@@ -2996,6 +2996,7 @@ in_op_right`
`2996`	`2996`	`additive_expr`
`2997`	`2997`	`= head: multiplicative_expr`
`2998`	`2998`	`tail:(__ additive_operator __ multiplicative_expr)* {`
	`2999`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`2999`	`3000`	`return createBinaryExprChain(head, tail);`
`3000`	`3001`	`}`
`3001`	`3002`
Original file line number	Diff line number	Diff line change
`@@ -3892,6 +3892,7 @@ additive_expr`
`3892`	`3892`	`= head:multiplicative_expr`
`3893`	`3893`	`tail:(__ additive_operator __ multiplicative_expr)* {`
`3894`	`3894`	`// => binary_expr`
	`3895`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`3895`	`3896`	`return createBinaryExprChain(head, tail);`
`3896`	`3897`	`}`
`3897`	`3898`
Original file line number	Diff line number	Diff line change
`@@ -4089,6 +4089,7 @@ additive_expr`
`4089`	`4089`	`= head:multiplicative_expr`
`4090`	`4090`	`tail:(__ additive_operator __ multiplicative_expr)* {`
`4091`	`4091`	`// => binary_expr`
	`4092`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`4092`	`4093`	`return createBinaryExprChain(head, tail);`
`4093`	`4094`	`}`
`4094`	`4095`
Original file line number	Diff line number	Diff line change
`@@ -3932,6 +3932,7 @@ additive_expr`
`3932`	`3932`	`= head:multiplicative_expr`
`3933`	`3933`	`tail:(__ additive_operator __ multiplicative_expr)* {`
`3934`	`3934`	`// => binary_expr`
	`3935`	`+ if (tail && tail.length && head.type === 'column_ref' && head.column === '*') throw new Error('args could not be star column in additive expr')`
`3935`	`3936`	`return createBinaryExprChain(head, tail);`
`3936`	`3937`	`}`
`3937`	`3938`