Change query.Replace() signature to output string

HnH · Feb 20, 2024 · 4cee236 · 4cee236
1 parent f8405f1
commit 4cee236
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/queries.go b/queries.go
@@ -12,12 +12,12 @@ type QuerySet map[string]Query
 type Query string
 
 // Replace part of a query
-func (q Query) Replace(o, r string) Query {
+func (q Query) Replace(o, r string) string {
 	if len(o) == 0 || len(r) == 0 {
-		return q
+		return string(q)
 	}
 
-	return Query(strings.Replace(string(q), o, r, 1))
+	return strings.Replace(string(q), o, r, 1)
 }
 
 func removeMultilineComments(q []byte) []byte {

diff --git a/queries_test.go b/queries_test.go
@@ -5,15 +5,15 @@ import (
 )
 
 func TestQuery(t *testing.T) {
-	var expected = Query("DELETE FROM `users` WHERE `user_id` IN (?,?,?);")
+	var expected = "DELETE FROM `users` WHERE `user_id` IN (?,?,?);"
 	if Query("DELETE FROM `users` WHERE `user_id` IN ({ids});").Replace("{ids}", In(3)) != expected {
 		t.Error("Invalid qry.In() result")
 	}
 }
 
 func TestReplaceEmpty(t *testing.T) {
 	var expected = Query("DELETE FROM `users` WHERE `user_id` IN ({ids});")
-	if expected.Replace("", "") != expected {
+	if expected.Replace("", "") != string(expected) {
 		t.Error("Expected empty qry.Replace() result")
 	}
 }