Merge pull request taozhi8833998#398 from taozhi8833998/bug-new-type

taozhi8833998 · web-flow · commit fe0009311119 · 2020-07-23T21:18:35.000+08:00
fix new type bug
diff --git a/ast/postgresql.ts b/ast/postgresql.ts
@@ -645,7 +645,7 @@ export type multiplicative_expr = binary_expr;
 
 export type multiplicative_operator = "*" | "/" | "%";
 
-export type primary = cast_expr | literal | aggr_func | func_call | case_expr | interval_expr | column_ref | param | expr | expr_list | var_decl;
+export type primary = cast_expr | literal | aggr_func | func_call | case_expr | interval_expr | column_ref | param | expr | expr_list | var_decl | { type: 'origin'; value: string; };
 
 
 
diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -2139,6 +2139,7 @@ primary
     }
   / var_decl
   / __ prepared_symbol:'$'n:literal_numeric {
+    // => { type: 'origin'; value: string; }
     return {
       type: 'origin',
       value: `$${n.value}`,
diff --git a/typegen.js b/typegen.js
@@ -7,7 +7,7 @@ const ast = peg.parser.parse(syntax);
 
 
 const built = [];
-function checkCode(r) {
+function checkCode(r, onName) {
     const simple = /^[\s$]*\/\/\s*=>\s*([^$\r\n]+)$/m.exec(r.code);
     if (simple) return simple[1].trim();
     const complex = /^[\s$]*\/\*([^§]+)\*\//m.exec(r.code);
@@ -20,7 +20,7 @@ function checkCode(r) {
     return typecode.substr(at + 2).trim();
 }
 function buildExpression(r, onName) {
-    if (r.code) return checkCode(r)
+    if (r.code) return checkCode(r, onName)
     switch (r.type) {
         case 'choice':
             const ret = r.alternatives

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ export type multiplicative_expr = binary_expr;`
`645`	`645`
`646`	`646`	`export type multiplicative_operator = "*" \| "/" \| "%";`
`647`	`647`
`648`		`-export type primary = cast_expr \| literal \| aggr_func \| func_call \| case_expr \| interval_expr \| column_ref \| param \| expr \| expr_list \| var_decl;`
	`648`	`+export type primary = cast_expr \| literal \| aggr_func \| func_call \| case_expr \| interval_expr \| column_ref \| param \| expr \| expr_list \| var_decl \| { type: 'origin'; value: string; };`
`649`	`649`
`650`	`650`
`651`	`651`
Original file line number	Diff line number	Diff line change
`@@ -2139,6 +2139,7 @@ primary`
`2139`	`2139`	`}`
`2140`	`2140`	`/ var_decl`
`2141`	`2141`	`/ __ prepared_symbol:'$'n:literal_numeric {`
	`2142`	`+ // => { type: 'origin'; value: string; }`
`2142`	`2143`	`return {`
`2143`	`2144`	`type: 'origin',`
`2144`	`2145`	value: `$${n.value}`,