internal/dinosql: Quote reserved keywords (#205)

Author: kyleconroy

internal/dinosql/parser.go

@@ -545,6 +545,9 @@ func expandStmt(c core.Catalog, raw nodes.RawStmt, node nodes.Node) ([]edit, err
 				if scope != "" {
 					cname = scope + "." + cname
 				}
+				if postgres.IsReservedKeyword(cname) {
+					cname = "\"" + cname + "\""
+				}
 				cols = append(cols, cname)
 			}
 		}

internal/dinosql/query_test.go

@@ -813,6 +813,19 @@ func TestQueries(t *testing.T) {
 				SQL: "SELECT a, b, c, d FROM foo, bar",
 			},
 		},
+		{
+			"star-expansion-reserved",
+			`
+			CREATE TABLE foo ("group" text);
+			SELECT * FROM foo;
+			`,
+			Query{
+				Columns: []core.Column{
+					{Name: "group", DataType: "text", Table: public("foo")},
+				},
+				SQL: "SELECT \"group\" FROM foo",
+			},
+		},
 		{
 			"datetimes",
 			`

internal/postgres/types.go

@@ -1,5 +1,7 @@
 package postgres
 
+import "strings"
+
 func IsComparisonOperator(s string) bool {
 	switch s {
 	case ">":
@@ -39,3 +41,112 @@ func IsMathematicalOperator(s string) bool {
 	}
 	return true
 }
+
+// https://www.postgresql.org/docs/current/sql-keywords-appendix.html
+func IsReservedKeyword(s string) bool {
+	switch strings.ToLower(s) {
+	case "all":
+	case "analyse":
+	case "analyze":
+	case "and":
+	case "any":
+	case "array":
+	case "as":
+	case "asc":
+	case "asymmetric":
+	case "authorization":
+	case "binary":
+	case "both":
+	case "case":
+	case "cast":
+	case "check":
+	case "collate":
+	case "collation":
+	case "column":
+	case "concurrently":
+	case "constraint":
+	case "create":
+	case "cross":
+	case "current_catalog":
+	case "current_date":
+	case "current_role":
+	case "current_schema":
+	case "current_time":
+	case "current_timestamp":
+	case "current_user":
+	case "default":
+	case "deferrable":
+	case "desc":
+	case "distinct":
+	case "do":
+	case "else":
+	case "end":
+	case "except":
+	case "false":
+	case "fetch":
+	case "for":
+	case "foreign":
+	case "freeze":
+	case "from":
+	case "full":
+	case "grant":
+	case "group":
+	case "having":
+	case "ilike":
+	case "in":
+	case "initially":
+	case "inner":
+	case "intersect":
+	case "into":
+	case "is":
+	case "isnull":
+	case "join":
+	case "lateral":
+	case "leading":
+	case "left":
+	case "like":
+	case "limit":
+	case "localtime":
+	case "localtimestamp":
+	case "natural":
+	case "not":
+	case "notnull":
+	case "null":
+	case "offset":
+	case "on":
+	case "only":
+	case "or":
+	case "order":
+	case "outer":
+	case "overlaps":
+	case "placing":
+	case "primary":
+	case "references":
+	case "returning":
+	case "right":
+	case "select":
+	case "session_user":
+	case "similar":
+	case "some":
+	case "symmetric":
+	case "table":
+	case "tablesample":
+	case "then":
+	case "to":
+	case "trailing":
+	case "true":
+	case "union":
+	case "unique":
+	case "user":
+	case "using":
+	case "variadic":
+	case "verbose":
+	case "when":
+	case "where":
+	case "window":
+	case "with":
+	default:
+		return false
+	}
+	return true
+}