Merge pull request taozhi8833998#2136 from taozhi8833998/fix-distinct-on-jsonb-pg

fix: distinct on jsonb expr in pg

Author: taozhi8833998

pegjs/postgresql.pegjs

@@ -3146,8 +3146,8 @@ cte_column_definition
     }
 
 distinct_on
-  = d:KW_DISTINCT __ o:KW_ON __ LPAREN __ c:column_ref_list __ RPAREN {
-    // => {type: string; columns: column_ref_list;}
+  = d:KW_DISTINCT __ o:KW_ON __ LPAREN __ c:column_list_items __ RPAREN {
+    // => {type: string; columns: column_list_items;}
     console.lo
     return {
       type: `${d} ON`,
@@ -3238,6 +3238,11 @@ query_option
       return option;
     }
 
+column_list_items
+  = head:column_list_item tail:(__ COMMA __ column_list_item)* {
+    // => column_list_item[]
+      return createList(head, tail);
+    }
 column_clause
   = head: (KW_ALL / (STAR !ident_start) / STAR) tail:(__ COMMA __ column_list_item)* {
       // => 'ALL' | '*' | column_list_item[]
@@ -3253,10 +3258,7 @@ column_clause
       if (tail && tail.length > 0) return createList(item, tail)
       return [item]
     }
-  / head:column_list_item tail:(__ COMMA __ column_list_item)* {
-    // => column_list_item[]
-      return createList(head, tail);
-    }
+  / column_list_items
 
 array_index
   = LBRAKE __ n:(literal_numeric / literal_string) __ RBRAKE {

src/expr.js

@@ -71,6 +71,7 @@ function exprToSQL(exprOrigin) {
     }
   }
   const { type } = expr
+  if (type === 'expr') return exprToSQL(expr.expr)
   return exprToSQLConvertFn[type] ? exprToSQLConvertFn[type](expr) : literalToSQL(expr)
 }
 

src/select.js

@@ -1,5 +1,5 @@
 import { exprToSQL, getExprListSQL, orderOrPartitionByToSQL, varToSQL } from './expr'
-import { columnRefToSQL, columnsToSQL } from './column'
+import { columnsToSQL } from './column'
 import { limitToSQL } from './limit'
 import { withToSQL } from './with'
 import { tablesToSQL } from './tables'
@@ -11,7 +11,7 @@ function distinctToSQL(distinct) {
   if (typeof distinct === 'string') return distinct
   const { type, columns } = distinct
   const result = [toUpper(type)]
-  if (columns) result.push(`(${columns.map(columnRefToSQL).join(', ')})`)
+  if (columns) result.push(`(${columns.map(exprToSQL).join(', ')})`)
   return result.filter(hasVal).join(' ')
 }
 

test/postgres.spec.js

@@ -521,8 +521,8 @@ describe('Postgres', () => {
     {
       title: 'distinct on',
       sql: [
-        'SELECT DISTINCT ON (a, b) a, b, c FROM tbl',
-        'SELECT DISTINCT ON (a, b) a, b, c FROM "tbl"'
+        "SELECT DISTINCT ON (a->>'someJsonAttribute', b, c) a->>'someJsonAttribute', b, c FROM tbl",
+        `SELECT DISTINCT ON (a ->> 'someJsonAttribute', b, c) a ->> 'someJsonAttribute', b, c FROM "tbl"`
       ]
     },
     {