Merge pull request #28 from derElektrobesen/escape-names

#19: escape columns names in sql statements
jirfag · Feb 8, 2018 · 628a8ad · 628a8ad
2 parents 2e06b66 + 8aca60a
commit 628a8ad
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 127 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ test_static:
 		--deadline=5m \
 		./...
 
-test_unit:
+test_unit: test_gen
 	mkdir -p test
 	go test -v ./parser/ ./queryset/ ./queryset/methods/
 
@@ -25,7 +25,7 @@ test_gen: gen
 		go build $$(dirname $F)/*.go; \
 	)
 
-test: test_unit bench test_static test_gen
+test: test_unit bench test_static
 
 bench:
 	go test -bench=. -benchtime=1s -v -run=^$$ ./queryset/

diff --git a/queryset/methods/queryset.go b/queryset/methods/queryset.go
@@ -246,7 +246,7 @@ func NewBinaryFilterMethod(ctx QsFieldContext) BinaryFilterMethod {
 		onFieldMethod:         ctx.onFieldMethod(),
 		oneArgMethod:          newOneArgMethod(argName, ctx.fieldTypeName()),
 		chainedQuerySetMethod: ctx.chainedQuerySetMethod(),
-		qsCallGormMethod: newQsCallGormMethod("Where", `"%s %s", %s`,
+		qsCallGormMethod: newQsCallGormMethod("Where", "\"`%s` %s\", %s",
 			ctx.fieldDBName(), getWhereCondition(ctx.operationName), argName),
 	}
 }
@@ -280,7 +280,7 @@ func newInFilterMethodImpl(ctx QsFieldContext, operationName, sql string) InFilt
 		onFieldMethod:         ctx.onFieldMethod(),
 		nArgsMethod:           args,
 		chainedQuerySetMethod: ctx.chainedQuerySetMethod(),
-		qsCallGormMethod: newQsCallGormMethod("Where", `"%s %s (?)", iArgs`,
+		qsCallGormMethod: newQsCallGormMethod("Where", "\"`%s` %s (?)\", iArgs",
 			ctx.fieldDBName(), sql),
 	}
 }

diff --git a/queryset/queryset_test.go b/queryset/queryset_test.go
@@ -171,7 +171,7 @@ func testUserSelectWithSurnameFilter(t *testing.T, m sqlmock.Sqlmock, db *gorm.D
 	expUsers[0].Surname = &surname
 
 	req := "SELECT * FROM `users` " +
-		"WHERE `users`.deleted_at IS NULL AND ((user_surname = ?)) ORDER BY `users`.`id` ASC LIMIT 1"
+		"WHERE `users`.deleted_at IS NULL AND ((`user_surname` = ?)) ORDER BY `users`.`id` ASC LIMIT 1"
 	m.ExpectQuery(fixedFullRe(req)).
 		WillReturnRows(getRowsForUsers(expUsers))
 
@@ -191,28 +191,28 @@ type userQueryTestCase struct {
 func testUserQueryFilters(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	cases := []userQueryTestCase{
 		{
-			q:    "((name IN (?)))",
+			q:    "((`name` IN (?)))",
 			args: []driver.Value{"a"},
 			qs: func(qs test.UserQuerySet) test.UserQuerySet {
 				return qs.NameIn("a")
 			},
 		},
 		{
-			q:    "((name IN (?,?)))",
+			q:    "((`name` IN (?,?)))",
 			args: []driver.Value{"a", "b"},
 			qs: func(qs test.UserQuerySet) test.UserQuerySet {
 				return qs.NameIn("a", "b")
 			},
 		},
 		{
-			q:    "((name NOT IN (?)))",
+			q:    "((`name` NOT IN (?)))",
 			args: []driver.Value{"a"},
 			qs: func(qs test.UserQuerySet) test.UserQuerySet {
 				return qs.NameNotIn("a")
 			},
 		},
 		{
-			q:    "((name NOT IN (?,?)))",
+			q:    "((`name` NOT IN (?,?)))",
 			args: []driver.Value{"a", "b"},
 			qs: func(qs test.UserQuerySet) test.UserQuerySet {
 				return qs.NameNotIn("a", "b")
@@ -270,7 +270,7 @@ func testUserCreateOneWithSurname(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB)
 
 func testUserUpdateByEmail(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	u := getUser()
-	req := "UPDATE `users` SET `name` = ? WHERE `users`.deleted_at IS NULL AND ((email = ?))"
+	req := "UPDATE `users` SET `name` = ? WHERE `users`.deleted_at IS NULL AND ((`email` = ?))"
 	m.ExpectExec(fixedFullRe(req)).
 		WithArgs(u.Name, u.Email).
 		WillReturnResult(sqlmock.NewResult(0, 1))
@@ -295,7 +295,7 @@ func testUserUpdateFieldsByPK(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 
 func testUserDeleteByEmail(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	u := getUser()
-	req := "UPDATE `users` SET deleted_at=? WHERE `users`.deleted_at IS NULL AND ((email = ?))"
+	req := "UPDATE `users` SET deleted_at=? WHERE `users`.deleted_at IS NULL AND ((`email` = ?))"
 	m.ExpectExec(fixedFullRe(req)).
 		WithArgs(sqlmock.AnyArg(), u.Email).
 		WillReturnResult(sqlmock.NewResult(0, 1))
@@ -319,7 +319,7 @@ func testUserDeleteByPK(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 func testUsersUpdateNum(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	usersNum := 2
 	users := getTestUsers(usersNum)
-	req := "UPDATE `users` SET `name` = ? WHERE `users`.deleted_at IS NULL AND ((email IN (?,?)))"
+	req := "UPDATE `users` SET `name` = ? WHERE `users`.deleted_at IS NULL AND ((`email` IN (?,?)))"
 	m.ExpectExec(fixedFullRe(req)).
 		WithArgs(sqlmock.AnyArg(), users[0].Email, users[1].Email).
 		WillReturnResult(sqlmock.NewResult(0, int64(usersNum)))
@@ -335,7 +335,7 @@ func testUsersUpdateNum(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 
 func testUsersCount(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	expCount := 5
-	req := "SELECT count(*) FROM `users` WHERE `users`.deleted_at IS NULL AND ((name != ?))"
+	req := "SELECT count(*) FROM `users` WHERE `users`.deleted_at IS NULL AND ((`name` != ?))"
 	m.ExpectQuery(fixedFullRe(req)).WithArgs(driver.Value("")).
 		WillReturnRows(getRowWithFields([]driver.Value{expCount}))