[bug] Escape reserved words used as identifier.

tests/mysql/alltypes_test.go

@@ -1095,3 +1095,53 @@ var allTypesJson = `
 	}
 ]
 `
+
+func TestReservedWord(t *testing.T) {
+	stmt := SELECT(User.AllColumns).
+		FROM(User)
+
+	// NOTE: A word that follows a period in a qualified name must be an identifier, so it
+	//       need not be quoted even if it is reserved
+	testutils.AssertDebugStatementSql(t, stmt, `
+SELECT user.column AS "user.column",
+     user.use AS "user.use",
+     user.ceil AS "user.ceil",
+     user.commit AS "user.commit",
+     user.create AS "user.create",
+     user.default AS "user.default",
+     user.desc AS "user.desc",
+     user.empty AS "user.empty",
+     user.float AS "user.float",
+     user.join AS "user.join",
+     user.like AS "user.like",
+     user.max AS "user.max",
+     user.rank AS "user.rank"
+FROM test_sample.user;
+`)
+
+	var dest []model.User
+	err := stmt.Query(db, &dest)
+	assert.NoError(t, err)
+
+	testutils.PrintJson(dest)
+
+	testutils.AssertJSON(t, dest, `
+[
+	{
+		"Column": "Column",
+		"Use": "CHECK",
+		"Ceil": "CEIL",
+		"Commit": "COMMIT",
+		"Create": "CREATE",
+		"Default": "DEFAULT",
+		"Desc": "DESC",
+		"Empty": "EMPTY",
+		"Float": "FLOAT",
+		"Join": "JOIN",
+		"Like": "LIKE",
+		"Max": "MAX",
+		"Rank": "RANK"
+	}
+]
+`)
+}

tests/postgres/generator_test.go

@@ -291,7 +291,7 @@ func TestGeneratedAllTypesSQLBuilderFiles(t *testing.T) {
 	assert.NoError(t, err)
 
 	testutils.AssertFileNamesEqual(t, modelFiles, "all_types.go", "all_types_view.go", "employee.go", "link.go",
-		"mood.go", "person.go", "person_phone.go", "weird_names_table.go", "level.go")
+		"mood.go", "person.go", "person_phone.go", "weird_names_table.go", "level.go", "user.go")
 
 	testutils.AssertFileContent(t, modelDir+"all_types.go", "\npackage model", allTypesModelContent)
 
@@ -299,7 +299,7 @@ func TestGeneratedAllTypesSQLBuilderFiles(t *testing.T) {
 	assert.NoError(t, err)
 
 	testutils.AssertFileNamesEqual(t, tableFiles, "all_types.go", "employee.go", "link.go",
-		"person.go", "person_phone.go", "weird_names_table.go")
+		"person.go", "person_phone.go", "weird_names_table.go", "user.go")
 
 	testutils.AssertFileContent(t, tableDir+"all_types.go", "\npackage table", allTypesTableContent)
 }

tests/postgres/sample_test.go

@@ -328,3 +328,54 @@ FROM test_sample."WEIRD NAMES TABLE";
 		WeirdColuName16:  "Doe",
 	})
 }
+
+func TestReserwedWordEscape(t *testing.T) {
+	stmt := SELECT(User.AllColumns).
+		FROM(User)
+
+	//fmt.Println(stmt.DebugSql())
+
+	testutils.AssertDebugStatementSql(t, stmt, `
+SELECT "User"."column" AS "User.column",
+     "User"."check" AS "User.check",
+     "User".ceil AS "User.ceil",
+     "User".commit AS "User.commit",
+     "User"."create" AS "User.create",
+     "User"."default" AS "User.default",
+     "User"."desc" AS "User.desc",
+     "User".empty AS "User.empty",
+     "User".float AS "User.float",
+     "User".join AS "User.join",
+     "User".like AS "User.like",
+     "User".max AS "User.max",
+     "User".rank AS "User.rank"
+FROM test_sample."User";
+`)
+
+	var dest []model.User
+
+	err := stmt.Query(db, &dest)
+	assert.NoError(t, err)
+
+	testutils.PrintJson(dest)
+
+	testutils.AssertJSON(t, dest, `
+[
+	{
+		"Column": "Column",
+		"Check": "CHECK",
+		"Ceil": "CEIL",
+		"Commit": "COMMIT",
+		"Create": "CREATE",
+		"Default": "DEFAULT",
+		"Desc": "DESC",
+		"Empty": "EMPTY",
+		"Float": "FLOAT",
+		"Join": "JOIN",
+		"Like": "LIKE",
+		"Max": "MAX",
+		"Rank": "RANK"
+	}
+]
+`)
+}

tests/testdata

@@ -1 +1 @@
-Subproject commit 02e0795d1e06b959d0c564dc1e349159d57b1bf6
+Subproject commit 889e07c0ebaf6b4021e31cce29b5861eb5c8cc17