Merge pull request #263 from carlosms/fix-260

Fix corner case in query addLimit

Author: carlosms

server/handler/query.go

@@ -203,7 +203,7 @@ func addLimit(query string, limit int) (string, bool) {
 
 	noComments := noCommentsRegexp.ReplaceAllLiteralString(query, "")
 
-	query = strings.TrimRight(strings.TrimSpace(noComments), ";")
+	query = strings.TrimSpace(strings.TrimRight(strings.TrimSpace(noComments), ";"))
 	upperQuery := strings.ToUpper(query)
 
 	if strings.HasPrefix(upperQuery, "SELECT") {

server/handler/query_test.go

@@ -42,15 +42,27 @@ func (suite *QuerySuite) TestAddLimit() {
 			SELECT * FROM repositories
 			`, "SELECT * FROM repositories LIMIT 100"},
 		{"  SELECT * FROM repositories  ", "SELECT * FROM repositories LIMIT 100"},
-		{"  SELECT * FROM repositories  ; ", "SELECT * FROM repositories   LIMIT 100"},
+		{"  SELECT * FROM repositories  ; ", "SELECT * FROM repositories LIMIT 100"},
+		{`  SELECT * FROM repositories  
+; `, "SELECT * FROM repositories LIMIT 100"},
 		{"/* comment */ SELECT * FROM repositories", "SELECT * FROM repositories LIMIT 100"},
 		{"SELECT * FROM repositories /* comment */", "SELECT * FROM repositories LIMIT 100"},
 		{"SELECT * FROM repositories; /* comment */", "SELECT * FROM repositories LIMIT 100"},
 		{`/* comment
 			multiline */ SELECT * FROM repositories; /* comment
 			multiline */`, "SELECT * FROM repositories LIMIT 100"},
 		{"select * from repositories limit 1", "select * from repositories limit 1"},
+		{"select * from repositories limit 1;", "select * from repositories limit 1"},
+		{"select * from repositories limit 1 ;", "select * from repositories limit 1"},
+		{`select * from repositories limit 1
+;`, "select * from repositories limit 1"},
+		{`select * from repositories limit 1 
+ ; `, "select * from repositories limit 1"},
 		{"select * from repositories limit 900", "select * from repositories LIMIT 100"},
+		{"select * from repositories limit 900;", "select * from repositories LIMIT 100"},
+		{"select * from repositories limit 900 ; ", "select * from repositories LIMIT 100"},
+		{`select * from repositories limit 900
+ ; `, "select * from repositories LIMIT 100"},
 		{"select * from repositories limit qwe", "select * from repositories limit qwe LIMIT 100"},
 	}