From 3ffaec926536567fc4c0a478d6048273ecf1bddf Mon Sep 17 00:00:00 2001 From: Tobie Morgan Hitchcock Date: Tue, 14 Feb 2017 19:21:03 +0000 Subject: [PATCH] Remove RETURN statement from SELECT query --- sql/ast.go | 1 - sql/cork.go | 2 -- sql/select.go | 4 ---- 3 files changed, 7 deletions(-) diff --git a/sql/ast.go b/sql/ast.go index c08b7344..9db41fbd 100644 --- a/sql/ast.go +++ b/sql/ast.go @@ -119,7 +119,6 @@ type SelectStatement struct { Limit Expr `cork:"limit" codec:"limit"` Start Expr `cork:"start" codec:"start"` Version Expr `cork:"version" codec:"version"` - Echo Token `cork:"echo" codec:"echo"` } // CreateStatement represents a SQL CREATE statement. diff --git a/sql/cork.go b/sql/cork.go index 96353356..c857a456 100644 --- a/sql/cork.go +++ b/sql/cork.go @@ -826,7 +826,6 @@ func (this *SelectStatement) MarshalCORK() (dst []byte, err error) { e.Encode(this.Limit) e.Encode(this.Start) e.Encode(this.Version) - e.Encode(this.Echo) return b.Bytes(), nil } @@ -841,7 +840,6 @@ func (this *SelectStatement) UnmarshalCORK(src []byte) (err error) { d.Decode(&this.Limit) d.Decode(&this.Start) d.Decode(&this.Version) - d.Decode(&this.Echo) return } diff --git a/sql/select.go b/sql/select.go index ea9a483c..5caac283 100644 --- a/sql/select.go +++ b/sql/select.go @@ -59,10 +59,6 @@ func (p *parser) parseSelectStatement() (stmt *SelectStatement, err error) { return nil, err } - if stmt.Echo, err = p.parseEcho(); err != nil { - return nil, err - } - if _, _, err = p.shouldBe(EOF, RPAREN, SEMICOLON); err != nil { return nil, err }