Disallow numbers as from targets

src/parser.ts

@@ -44,8 +44,8 @@ export default class Parser {
       return args;
     }
 
-    const from =
-      this.currentToken().kind === TokenKind.FROM ? this.from() : null;
+    const currentToken = this.currentToken();
+    const from = currentToken.kind === TokenKind.FROM ? this.from() : null;
     if (isError(from)) {
       return from;
     }
@@ -78,11 +78,11 @@ export default class Parser {
 
   private from(): AST.Secondary | Error {
     this.eat(TokenKind.FROM);
-    return this.alias();
+    return this.alias(this.identifier);
   }
 
-  private alias(): AST.Secondary | Error {
-    const primary = this.primary();
+  private alias(fn: () => AST.Primary | Error = this.primary): AST.Secondary | Error {
+    const primary = fn.bind(this)();
     if (isError(primary)) {
       return primary;
     }
@@ -137,7 +137,9 @@ export default class Parser {
       return token;
     }
 
-    return new Error(`Unexpected token ${token}`, token.line);
+    const repr = `{ kind: ${token.kind}${token.value ? `, value: ${token.value} }` : ""}`;
+
+    return new Error(`Unexpected token: ${repr}`, token.line);
   }
 
   private currentToken(): Token {

test/parser.test.ts

@@ -86,4 +86,9 @@ describe("Parser", () => {
       }),
     ]);
   });
+
+  it("should not allow a number as a from target", () => {
+    const fn = () => parse("select 1 from 2");
+    expect(fn).to.throw("Unexpected token: { kind: NUMBER, value: 2 }");
+  });
 });