Merge pull request taozhi8833998#1675 from taozhi8833998/refactor-where-type

refactor: update type for where field

Author: taozhi8833998

ast/postgresql.ts

@@ -833,7 +833,7 @@ export type on_clause = or_and_where_expr;
 
 
 
-export type where_clause = binary_expr;
+export type where_clause = or_and_where_expr;
 
 
 
@@ -1115,6 +1115,8 @@ export type backticks_quoted_ident = string;
 
 export type ident_without_kw = ident_name | quoted_ident;
 
+export type column_without_kw = column_name | quoted_ident;
+
 
 
 export type column = string | quoted_ident;

pegjs/postgresql.pegjs

@@ -3126,7 +3126,7 @@ on_clause
   = KW_ON __ e:or_and_where_expr { /* => or_and_where_expr */ return e; }
 
 where_clause
-  = KW_WHERE __ e:or_and_where_expr { /* => binary_expr */ return e; }
+  = KW_WHERE __ e:or_and_where_expr { /* => or_and_where_expr */ return e; }
 
 group_by_clause
   = KW_GROUP __ KW_BY __ e:expr_list { /* => expr_list['value'] */ return e.value; }

types.d.ts

@@ -68,14 +68,30 @@ export interface Column {
   as: string;
 }
 
+type Param = { type: 'param'; value: string };
+
+export type Expr =
+  | {
+      type: 'binary_expr';
+      operator: 'AND' | 'OR';
+      left: Expr;
+      right: Expr;
+    }
+  | {
+      type: 'binary_expr';
+      operator: string;
+      left: ColumnRef | Param;
+      right: ColumnRef | Param;
+    };
+
 export interface Select {
   with: With | null;
   type: "select";
   options: any[] | null;
   distinct: "DISTINCT" | null;
   columns: any[] | Column[];
   from: Array<From | Dual | any> | null;
-  where: any;
+  where: Expr;
   groupby: ColumnRef[] | null;
   having: any[] | null;
   orderby: OrderBy[] | null;
@@ -97,13 +113,13 @@ export interface Update {
   db: string | null;
   table: Array<From | Dual> | null;
   set: SetList[];
-  where: any;
+  where: Expr;
 }
 export interface Delete {
   type: "delete";
   table: any;
   from: Array<From | Dual>;
-  where: any;
+  where: Expr;
 }
 
 export interface Alter {