Updated alias generation to maintain an alias map separately from the…

… list of queried fields.

README.md

@@ -34,6 +34,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a]
+	Aliases: map[]
 }
 ```
 
@@ -49,6 +50,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a]
+	Aliases: map[]
 }
 ```
 
@@ -64,21 +66,23 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
 ### Example: SELECT with alias works
 
 ```
-query, err := sqlparser.Parse(`SELECT a as z, b as y FROM 'b'`)
+query, err := sqlparser.Parse(`SELECT a as z, b as y, c FROM 'b'`)
 
 query.Query {
 	Type: Select
 	TableName: b
 	Conditions: []
 	Updates: map[]
 	Inserts: []
-	Fields: [z y]
+	Fields: [a b c]
+	Aliases: map[a:z b:y]
 }
 ```
 
@@ -101,6 +105,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -123,6 +128,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -145,6 +151,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -167,6 +174,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -189,6 +197,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -211,6 +220,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -233,6 +243,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -248,6 +259,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [*]
+	Aliases: map[]
 }
 ```
 
@@ -263,6 +275,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a *]
+	Aliases: map[]
 }
 ```
 
@@ -292,6 +305,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: [a c d]
+	Aliases: map[]
 }
 ```
 
@@ -314,6 +328,7 @@ query.Query {
 	Updates: map[b:hello]
 	Inserts: []
 	Fields: []
+	Aliases: map[]
 }
 ```
 
@@ -336,6 +351,7 @@ query.Query {
 	Updates: map[b:hello\'world]
 	Inserts: []
 	Fields: []
+	Aliases: map[]
 }
 ```
 
@@ -358,6 +374,7 @@ query.Query {
 	Updates: map[b:hello c:bye]
 	Inserts: []
 	Fields: []
+	Aliases: map[]
 }
 ```
 
@@ -387,6 +404,7 @@ query.Query {
 	Updates: map[b:hello c:bye]
 	Inserts: []
 	Fields: []
+	Aliases: map[]
 }
 ```
 
@@ -409,6 +427,7 @@ query.Query {
 	Updates: map[]
 	Inserts: []
 	Fields: []
+	Aliases: map[]
 }
 ```
 
@@ -424,6 +443,7 @@ query.Query {
 	Updates: map[]
 	Inserts: [[1]]
 	Fields: [b]
+	Aliases: map[]
 }
 ```
 
@@ -439,6 +459,7 @@ query.Query {
 	Updates: map[]
 	Inserts: [[1 2 3]]
 	Fields: [b c d]
+	Aliases: map[]
 }
 ```
 
@@ -454,6 +475,7 @@ query.Query {
 	Updates: map[]
 	Inserts: [[1 2 3] [4 5 6]]
 	Fields: [b c d]
+	Aliases: map[]
 }
 ```
 

README.template

@@ -43,6 +43,7 @@ query.Query {
 	Updates: {{.Expected.Updates}}
 	Inserts: {{.Expected.Inserts}}
 	Fields: {{.Expected.Fields}}
+	Aliases: {{.Expected.Aliases}}
 }
 ```
 {{end}}

query/query.go

@@ -8,6 +8,7 @@ type Query struct {
 	Updates    map[string]string
 	Inserts    [][]string
 	Fields     []string // Used for SELECT (i.e. SELECTed field names) and INSERT (INSERTEDed field names)
+	Aliases    map[string]string
 }
 
 // Type is the type of SQL query, e.g. SELECT/UPDATE

sql.go

@@ -127,7 +127,10 @@ func (p *parser) doParse() (query.Query, error) {
 				if !isIdentifier(alias) {
 					return p.query, fmt.Errorf("at SELECT: expected field alias for \"" + identifier + " as\" to SELECT")
 				}
-				p.query.Fields[len(p.query.Fields)-1] = alias
+				if p.query.Aliases == nil {
+					p.query.Aliases = make(map[string]string)
+				}
+				p.query.Aliases[identifier] = alias
 				p.pop()
 				maybeFrom = p.peek()
 			}
@@ -380,7 +383,7 @@ func (p *parser) popWhitespace() {
 
 var reservedWords = []string{
 	"(", ")", ">=", "<=", "!=", ",", "=", ">", "<", "SELECT", "INSERT INTO", "VALUES", "UPDATE", "DELETE FROM",
-	"WHERE", "FROM", "SET",
+	"WHERE", "FROM", "SET", "AS",
 }
 
 func (p *parser) peekWithLength() (string, int) {

sql_test.go

@@ -72,11 +72,15 @@ func TestSQL(t *testing.T) {
 		},
 		{
 			Name: "SELECT with alias works",
-			SQL:  "SELECT a as z, b as y FROM 'b'",
+			SQL:  "SELECT a as z, b as y, c FROM 'b'",
 			Expected: query.Query{
 				Type:      query.Select,
 				TableName: "b",
-				Fields:    []string{"z", "y"},
+				Fields:    []string{"a", "b", "c"},
+				Aliases: map[string]string{
+					"a": "z",
+					"b": "y",
+				},
 			},
 			Err: nil,
 		},