[refactoring] Handle naked "values" statement, and make the whole AST…

… more coherent

#33

src/ast-mapper.ts

@@ -52,7 +52,7 @@ export interface IAstPartialMapper {
     from?: (from: a.From) => a.From | nil
     fromCall?: (from: a.FromCall) => a.From | nil
     fromStatement?: (from: a.FromStatement) => a.From | nil
-    fromValues?: (from: a.FromValues) => a.From | nil;
+    values?: (from: a.ValuesStatement) => a.SelectStatement | nil;
     fromTable?: (from: a.FromTable) => a.From | nil
     selectionColumn?: (val: a.SelectedColumn) => a.SelectedColumn | nil
     expr?: (val: a.Expr) => a.Expr | nil
@@ -68,6 +68,7 @@ export interface IAstPartialMapper {
     callOverlay?: (val: a.ExprOverlay) => a.Expr | nil
     array?: (val: a.ExprList) => a.Expr | nil
     constant?: (value: a.ExprLiteral) => a.Expr | nil
+    default?: (value: a.ExprDefault) => a.Expr | nil;
     ref?: (val: a.ExprRef) => a.Expr | nil
     unary?: (val: a.ExprUnary) => a.Expr | nil
     binary?: (val: a.ExprBinary) => a.Expr | nil
@@ -272,6 +273,8 @@ export class AstDefaultMapper implements IAstMapper {
                 return this.do(val);
             case 'create function':
                 return this.createFunction(val);
+            case 'values':
+                return this.values(val);
             default:
                 throw NotSupported.never(val);
         }
@@ -432,18 +435,10 @@ export class AstDefaultMapper implements IAstMapper {
         if (!into) {
             return null; // nowhere to insert into
         }
-        const values = arrayNilMap(val.values, valSet => {
-            return arrayNilMap(valSet, v => {
-                if (v === 'default') {
-                    return v;
-                }
-                return this.expr(v);
-            });
-        });
 
-        const select = val.select && this.select(val.select);
+        const select = val.insert && this.select(val.insert);
 
-        if (!values?.length && !select) {
+        if (!select) {
             // nothing to insert
             return null;
         }
@@ -462,8 +457,7 @@ export class AstDefaultMapper implements IAstMapper {
 
         return assignChanged(val, {
             into,
-            values,
-            select,
+            insert: select,
             returning,
             onConflict: !ocdo ? val.onConflict : assignChanged(val.onConflict, {
                 do: ocdo,
@@ -811,6 +805,8 @@ export class AstDefaultMapper implements IAstMapper {
                 return this.union(val);
             case 'with':
                 return this.with(val);
+            case 'values':
+                return this.values(val);
             default:
                 throw NotSupported.never(val);
         }
@@ -894,8 +890,6 @@ export class AstDefaultMapper implements IAstMapper {
                 return this.fromTable(from);
             case 'statement':
                 return this.fromStatement(from);
-            case 'values':
-                return this.fromValues(from);
             case 'call':
                 return this.fromCall(from);
             default:
@@ -924,7 +918,7 @@ export class AstDefaultMapper implements IAstMapper {
         })
     }
 
-    fromValues(from: a.FromValues): a.From | nil {
+    values(from: a.ValuesStatement): a.SelectStatement | nil {
         const values = arrayNilMap(from.values, x => arrayNilMap(x, y => this.expr(y)));
         if (!values?.length) {
             return null; // nothing to select from
@@ -945,13 +939,13 @@ export class AstDefaultMapper implements IAstMapper {
     }
 
     fromTable(from: a.FromTable): a.From | nil {
-        const nfrom = this.tableRef(from);
+        const nfrom = this.tableRef(from.name);
         if (!nfrom) {
             return null; // nothing to select from
         }
         const join = from.join && this.join(from.join);
         return assignChanged(from, {
-            ...nfrom,
+            name: nfrom,
             join,
         })
     }
@@ -1021,6 +1015,10 @@ export class AstDefaultMapper implements IAstMapper {
                 return this.callOverlay(val);
             case 'substring':
                 return this.callSubstring(val);
+            case 'values':
+                return this.values(val);
+            case 'default':
+                return this.default(val);
             default:
                 throw NotSupported.never(val);
         }
@@ -1166,6 +1164,9 @@ export class AstDefaultMapper implements IAstMapper {
         return value;
     }
 
+    default(value: a.ExprDefault): a.Expr | nil {
+        return value;
+    }
 
     /** Called when a reference is used */
     ref(val: a.ExprRef): a.Expr | nil {

src/syntax/ast.ts

@@ -37,6 +37,7 @@ export type Statement = SelectStatement
     | CommentStatement
     | CreateSchemaStatement
     | RaiseStatement
+    | ValuesStatement
     | CreateFunctionStatement
     | DoStatement
     | BeginStatement
@@ -212,10 +213,7 @@ export interface InsertStatement extends PGNode {
     returning?: SelectedColumn[] | nil;
     columns?: Name[] | nil;
     overriding?: 'system' | 'user';
-    /** Insert values */
-    values?: (Expr | 'default')[][] | nil;
-    /** Insert into select */
-    select?: SelectStatement | nil;
+    insert: SelectStatement;
     onConflict?: OnConflictAction | nil;
 }
 
@@ -512,6 +510,7 @@ export interface WithStatement extends PGNode {
 
 export type SelectStatement = SelectFromStatement
     | SelectFromUnion
+    | ValuesStatement
     | WithStatement;
 
 export interface SelectFromStatement extends PGNode {
@@ -560,7 +559,9 @@ export interface SelectedColumn extends PGNode {
     alias?: Name;
 }
 
-export type From = FromTable | FromStatement | FromValues | FromCall
+export type From = FromTable
+    | FromStatement
+    | FromCall
 
 
 export interface FromCall extends ExprCall, PGNode {
@@ -570,28 +571,32 @@ export interface FromCall extends ExprCall, PGNode {
 
 
 
-export interface FromValues {
+export interface ValuesStatement extends PGNode {
     type: 'values';
-    alias: Name;
     values: Expr[][];
-    columnNames?: Name[] | nil;
-    join?: JoinClause | nil;
 }
 
 
+
 export interface QNameAliased extends QName, PGNode {
     alias?: string;
 }
 
-export interface FromTable extends QNameAliased, PGNode {
+export interface QNameMapped extends QNameAliased {
+    columnNames?: Name[] | nil;
+}
+
+export interface FromTable extends PGNode {
     type: 'table',
+    name: QNameMapped;
     join?: JoinClause | nil;
 }
 
 export interface FromStatement extends PGNode {
     type: 'statement';
     statement: SelectStatement;
-    alias: Name;
+    alias: string;
+    columnNames?: Name[] | nil;
     db?: null | nil;
     join?: JoinClause | nil;
 }
@@ -614,6 +619,7 @@ export type Expr = ExprRef
     | ExprNull
     | ExprExtract
     | ExprInteger
+    | ExprDefault
     | ExprMember
     | ExprValueKeyword
     | ExprArrayIndex
@@ -804,6 +810,10 @@ export interface ExprInteger extends PGNode {
     value: number;
 }
 
+export interface ExprDefault extends PGNode {
+    type: 'default';
+}
+
 export interface ExprNumeric extends PGNode {
     type: 'numeric';
     value: number;

src/syntax/create-view.spec.ts

@@ -1,6 +1,6 @@
 import 'mocha';
 import 'chai';
-import { checkInvalid, checkStatement, columns } from './spec-utils';
+import { checkInvalid, checkStatement, columns, tbl } from './spec-utils';
 
 describe('Create view statements', () => {
 
@@ -10,7 +10,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -23,7 +23,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -36,7 +36,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -48,7 +48,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -60,7 +60,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -71,7 +71,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -82,7 +82,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -94,7 +94,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -107,7 +107,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -117,7 +117,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -128,7 +128,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -139,7 +139,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 
@@ -151,7 +151,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
         withData: true,
     });
@@ -163,7 +163,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
         withData: false,
     });
@@ -178,7 +178,7 @@ describe('Create view statements', () => {
         query: {
             type: 'select',
             columns: columns('*'),
-            from: [{ type: 'table', name: 'tbl' }],
+            from: [tbl('tbl')],
         },
     });
 

src/syntax/expr.ne

@@ -227,6 +227,7 @@ expr_primary
     | %kw_null {% x => track(x, { type: 'null' }) %}
     | value_keyword {% x => track(x, {type: 'keyword', keyword: toStr(x) }) %}
     | %qparam {% x => track(x, { type: 'parameter', name: toStr(x[0]) }) %}
+    | %kw_default  {% x => track(x, { type: 'default'}) %}
 
 
 # LIKE-kind operators

src/syntax/expr.spec.ts

@@ -1,6 +1,6 @@
 import 'mocha';
 import 'chai';
-import { checkTreeExpr, checkInvalidExpr, checkInvalid, checkTreeExprLoc, starCol, star, col, ref } from './spec-utils';
+import { checkTreeExpr, checkInvalidExpr, checkInvalid, checkTreeExprLoc, starCol, star, col, ref, tbl, name } from './spec-utils';
 import { toSql } from '../to-sql';
 import { expect } from 'chai';
 import { parse } from '../parser';
@@ -1332,7 +1332,11 @@ line`,
                     }],
                     from: [{
                         _location: { start: 22, end: 25 },
-                        type: 'table', name: 'tbl'
+                        type: 'table',
+                        name: {
+                            _location: { start: 22, end: 25 },
+                            name: 'tbl'
+                        },
                     }],
                 }]
             }
@@ -1346,7 +1350,7 @@ line`,
             right: {
                 type: 'select',
                 columns: [starCol],
-                from: [{ type: 'table', name: 'tb' }],
+                from: [tbl('tb')],
             }
         });