Build deno [autogenerated commit]

Author: oguimbal

.deno/ast-mapper.ts

@@ -606,6 +606,15 @@ export class AstDefaultMapper implements IAstMapper {
             case 'primary key':
             case 'unique':
             case 'add generated':
+                if (c.type === 'add generated' && c.expression) {
+                    const expression = this.expr(c.expression);
+                    if (!expression) {
+                        return null;
+                    }
+                    return assignChanged(c, {
+                        expression,
+                    });
+                }
                 return c;
             case 'default': {
                 const def = this.expr(c.default);

.deno/syntax/ast.ts

@@ -387,6 +387,8 @@ export interface AlterColumnSetDefault extends PGNode {
 export interface AlterColumnAddGenerated extends PGNode {
     type: 'add generated',
     always?: 'always' | 'by default';
+    expression?: Expr;
+    stored?: true;
     constraintName?: Name;
     sequence?: {
         name?: QName;
@@ -680,7 +682,7 @@ export interface ForStatement extends PGNode {
 }
 
 export interface SkipClause extends PGNode {
-    type: 'nowait' | 'skip locked' 
+    type: 'nowait' | 'skip locked'
 }
 
 export interface LimitStatement extends PGNode {

.deno/syntax/main.ne.ts

@@ -555,6 +555,7 @@ const grammar: Grammar = {
     {"name": "kw_replace", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('replace')},
     {"name": "kw_recursive", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('recursive')},
     {"name": "kw_view", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('view')},
+    {"name": "kw_stored", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('stored')},
     {"name": "kw_cascaded", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('cascaded')},
     {"name": "kw_unlogged", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('unlogged')},
     {"name": "kw_global", "symbols": [(lexerAny.has("word") ? {type: "word"} : word)], "postprocess": notReservedKw('global')},
@@ -2338,14 +2339,24 @@ const grammar: Grammar = {
     {"name": "altercol_generated$ebnf$1$subexpression$1", "symbols": ["kw_by", (lexerAny.has("kw_default") ? {type: "kw_default"} : kw_default)]},
     {"name": "altercol_generated$ebnf$1", "symbols": ["altercol_generated$ebnf$1$subexpression$1"], "postprocess": id},
     {"name": "altercol_generated$ebnf$1", "symbols": [], "postprocess": () => null},
-    {"name": "altercol_generated$subexpression$1", "symbols": [(lexerAny.has("kw_as") ? {type: "kw_as"} : kw_as), "kw_identity"]},
-    {"name": "altercol_generated$ebnf$2$subexpression$1", "symbols": ["lparen", "altercol_generated_seq", "rparen"], "postprocess": get(1)},
+    {"name": "altercol_generated$ebnf$2$subexpression$1", "symbols": [(lexerAny.has("kw_as") ? {type: "kw_as"} : kw_as), "kw_identity"]},
     {"name": "altercol_generated$ebnf$2", "symbols": ["altercol_generated$ebnf$2$subexpression$1"], "postprocess": id},
     {"name": "altercol_generated$ebnf$2", "symbols": [], "postprocess": () => null},
-    {"name": "altercol_generated", "symbols": ["kw_generated", "altercol_generated$ebnf$1", "altercol_generated$subexpression$1", "altercol_generated$ebnf$2"], "postprocess":  x => track(x, {
+    {"name": "altercol_generated$ebnf$3$subexpression$1", "symbols": [(lexerAny.has("kw_as") ? {type: "kw_as"} : kw_as), "lparen", "expr", "rparen"], "postprocess": get(2)},
+    {"name": "altercol_generated$ebnf$3", "symbols": ["altercol_generated$ebnf$3$subexpression$1"], "postprocess": id},
+    {"name": "altercol_generated$ebnf$3", "symbols": [], "postprocess": () => null},
+    {"name": "altercol_generated$ebnf$4$subexpression$1", "symbols": ["lparen", "altercol_generated_seq", "rparen"], "postprocess": get(1)},
+    {"name": "altercol_generated$ebnf$4", "symbols": ["altercol_generated$ebnf$4$subexpression$1"], "postprocess": id},
+    {"name": "altercol_generated$ebnf$4", "symbols": [], "postprocess": () => null},
+    {"name": "altercol_generated$ebnf$5$subexpression$1", "symbols": ["kw_stored"]},
+    {"name": "altercol_generated$ebnf$5", "symbols": ["altercol_generated$ebnf$5$subexpression$1"], "postprocess": id},
+    {"name": "altercol_generated$ebnf$5", "symbols": [], "postprocess": () => null},
+    {"name": "altercol_generated", "symbols": ["kw_generated", "altercol_generated$ebnf$1", "altercol_generated$ebnf$2", "altercol_generated$ebnf$3", "altercol_generated$ebnf$4", "altercol_generated$ebnf$5"], "postprocess":  x => track(x, {
             type: 'add generated',
             ...x[1] && { always: toStr(x[1], ' ') },
-            ...x[3] && { sequence: unwrap(x[3]) },
+            ...x[3] && { expression: unwrap(x[3]) },
+            ...x[4] && { sequence: unwrap(x[4]) },
+            ...x[5] && { stored: true },
         }) },
     {"name": "altercol_generated_seq$ebnf$1$subexpression$1", "symbols": ["kw_sequence", "kw_name", "qualified_name"]},
     {"name": "altercol_generated_seq$ebnf$1", "symbols": ["altercol_generated_seq$ebnf$1$subexpression$1"], "postprocess": id},

.deno/to-sql.ts

@@ -159,7 +159,14 @@ function visitGenerated(m: IAstVisitor, alter: AlterColumnAddGenerated) {
     if (alter.always) {
         ret.push(alter.always.toUpperCase(), ' ');
     }
-    ret.push('AS IDENTITY ');
+    ret.push('AS ');
+    if (alter.expression) {
+        ret.push('(');
+        m.expr(alter.expression);
+        ret.push(') ');
+    } else {
+        ret.push('IDENTITY ');
+    }
     if (alter.sequence) {
         ret.push('(');
         if (alter.sequence.name) {
@@ -170,6 +177,9 @@ function visitGenerated(m: IAstVisitor, alter: AlterColumnAddGenerated) {
         visitSeqOpts(m, alter.sequence);
         ret.push(') ');
     }
+    if (alter.stored) {
+        ret.push('STORED ');
+    }
 }
 function visitSeqOpts(m: IAstVisitor, cs: AlterSequenceSetOptions | CreateSequenceOptions) {
     if (cs.as) {