Merge pull request #1711 from taozhi8833998/fix-except-bigquery

fix: table prefix star with except in bigquery

Author: taozhi8833998

pegjs/bigquery.pegjs

@@ -1641,29 +1641,7 @@ expr_alias
     }
 
 column_clause
-  = STAR __ k:('EXCEPT'i / 'REPLACE'i) __ LPAREN __ c:columns_list __ RPAREN {
-    columnList.add('select::null::(.*)')
-    return {
-      expr_list: c,
-      parentheses: true,
-      star: '*',
-      type: k.toLowerCase(),
-    }
-  }
-  / head: (KW_ALL / (STAR !ident_start) / STAR) tail:(__ COMMA __ column_list_item)* __ COMMA? {
-      columnList.add('select::null::(.*)')
-      const item = {
-        expr: {
-          type: 'column_ref',
-          table: null,
-          column: '*'
-        },
-        as: null
-      }
-      if (tail && tail.length > 0) return createList(item, tail)
-      return [item]
-    }
-  / c:columns_list __ COMMA? {
+  = c:columns_list __ COMMA? {
     return c
   }
 
@@ -1687,17 +1665,32 @@ column_offset_expr
   }
 
 column_list_item
-  = tbl:STAR {
-      columnList.add('select::null::(.*)');
-      return {
+  = p:(column_without_kw __ DOT)? STAR __ k:('EXCEPT'i / 'REPLACE'i) __ LPAREN __ c:columns_list __ RPAREN {
+    const tbl = p && p[0]
+    columnList.add(`select::${tbl}::(.*)`)
+    return {
+      expr_list: c,
+      parentheses: true,
+      expr: {
+        type: 'column_ref',
+        table: tbl,
+        column: '*'
+      },
+      type: k.toLowerCase(),
+    }
+  }
+  / head: (KW_ALL / (STAR !ident_start) / STAR) {
+      columnList.add('select::null::(.*)')
+      const item = {
         expr: {
           type: 'column_ref',
           table: null,
           column: '*'
         },
         as: null
-      };
-    }
+      }
+      return item
+  }
   / tbl:column_without_kw __ DOT pro:((column_offset_expr / column_without_kw) __ DOT)? __ STAR {
       columnList.add(`select::${tbl}::(.*)`)
       let column = '*'

src/column.js

@@ -148,6 +148,13 @@ function columnToSQL(column, isDual) {
   if (type === 'cast') return castToSQL(column)
   if (isDual) expr.isDual = isDual
   let str = exprToSQL(expr)
+  const { expr_list: exprList } = column
+  if (exprList) {
+    const result = [str]
+    const columnsStr = exprList.map(col => columnToSQL(col, isDual)).join(', ')
+    result.push([toUpper(type), type && '(', columnsStr, type && ')'].filter(hasVal).join(''))
+    return result.filter(hasVal).join(' ')
+  }
   if (expr.parentheses && Reflect.has(expr, 'array_index')) str = `(${str})`
   if (expr.array_index && expr.type !== 'column_ref') str = `${str}[${literalToSQL(expr.array_index.index)}]`
   return [str, asToSQL(column.as)].filter(hasVal).join(' ')
@@ -167,13 +174,7 @@ function getDual(tables) {
 function columnsToSQL(columns, tables) {
   if (!columns || columns === '*') return columns
   const isDual = getDual(tables)
-  const result = []
-  const { expr_list: exprList, star, type } = columns
-  result.push(star, toUpper(type))
-  const exprListArr = exprList || columns
-  const columnsStr = exprListArr.map(col => columnToSQL(col, isDual)).join(', ')
-  result.push([type && '(', columnsStr, type && ')'].filter(hasVal).join(''))
-  return result.filter(hasVal).join(' ')
+  return columns.map(col => columnToSQL(col, isDual)).join(', ')
 }
 
 export {

test/bigquery.spec.js

@@ -88,15 +88,15 @@ describe('BigQuery', () => {
       ]
     },
     {
-      title: 'select * expect',
+      title: 'select * except',
       sql: [
         `WITH orders AS
         (SELECT 5 as order_id,
         "sprocket" as item_name,
         200 as quantity)
-      SELECT * EXCEPT (order_id)
+      SELECT * EXCEPT (order_id), orders.* EXCEPT(order_time)
       FROM orders;`,
-        "WITH orders AS (SELECT 5 AS order_id, 'sprocket' AS item_name, 200 AS quantity) SELECT * EXCEPT (order_id) FROM orders"
+        "WITH orders AS (SELECT 5 AS order_id, 'sprocket' AS item_name, 200 AS quantity) SELECT * EXCEPT(order_id), orders.* EXCEPT(order_time) FROM orders"
       ]
     },
     {
@@ -108,7 +108,7 @@ describe('BigQuery', () => {
         200 as quantity)
       SELECT * REPLACE ("widget" AS item_name)
       FROM orders;`,
-        "WITH orders AS (SELECT 5 AS order_id, 'sprocket' AS item_name, 200 AS quantity) SELECT * REPLACE ('widget' AS item_name) FROM orders"
+        "WITH orders AS (SELECT 5 AS order_id, 'sprocket' AS item_name, 200 AS quantity) SELECT * REPLACE('widget' AS item_name) FROM orders"
       ]
     },
     {
@@ -120,7 +120,7 @@ describe('BigQuery', () => {
         200 as quantity)
       SELECT * REPLACE (quantity/2 AS quantity)
       FROM orders;`,
-        "WITH orders AS (SELECT 5 AS order_id, 'sprocket' AS item_name, 200 AS quantity) SELECT * REPLACE (quantity / 2 AS quantity) FROM orders"
+        "WITH orders AS (SELECT 5 AS order_id, 'sprocket' AS item_name, 200 AS quantity) SELECT * REPLACE(quantity / 2 AS quantity) FROM orders"
       ]
     },
     {