Refactoring: reuse fixQuery

gosql/common/common.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"regexp"
 	"strings"
 	"time"
 
@@ -17,6 +18,8 @@ import (
 	"golang.org/x/exp/slices"
 )
 
+type queryFunc func(ctx context.Context, tx *Tx) error
+
 type Engine interface {
 	Begin(ctx context.Context, opts *sql.TxOptions) (*Tx, error)
 	Close() error
@@ -28,6 +31,10 @@ type Engine interface {
 	Transaction(ctx context.Context, queries queryFunc) error
 }
 
+var rLogSpacesAll = regexp.MustCompile(`[\s\t]+`)
+var rLogSpacesEnd = regexp.MustCompile(`[\s\t]+;$`)
+var rSqlParam = regexp.MustCompile(`\$\d+`)
+
 func log(m string, s time.Time, e error, tx bool, query string, args ...any) {
 	var tmsg string
 
@@ -63,6 +70,10 @@ func log(m string, s time.Time, e error, tx bool, query string, args ...any) {
 	fmt.Fprintln(os.Stdout, "\033["+color+"m[SQL]"+tmsg+qmsg+astr+estr+fmt.Sprintf(" %.3f ms", time.Since(s).Seconds())+"\033[0m")
 }
 
+func fixQuery(query string) string {
+	return rSqlParam.ReplaceAllString(query, "?")
+}
+
 func ParseUrl(dbURL string) (*url.URL, error) {
 	databaseURL, err := url.Parse(dbURL)
 	if err != nil {

gosql/common/dbmethods.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"regexp"
 	"time"
 
 	"github.com/pkg/errors"
@@ -17,15 +16,9 @@ type DBMethods struct {
 	Driver string
 }
 
-var rLogSpacesAll = regexp.MustCompile(`[\s\t]+`)
-var rLogSpacesEnd = regexp.MustCompile(`[\s\t]+;$`)
-var rSqlParam = regexp.MustCompile(`\$\d+`)
-
-type queryFunc func(ctx context.Context, tx *Tx) error
-
 func (db *DBMethods) fixQuery(query string) string {
 	if db.Driver == "mysql" {
-		return rSqlParam.ReplaceAllString(query, "?")
+		return fixQuery(query)
 	}
 	return query
 }

gosql/common/tx.go

@@ -17,7 +17,7 @@ type Tx struct {
 
 func (db *Tx) fixQuery(query string) string {
 	if db.Driver == "mysql" {
-		return rSqlParam.ReplaceAllString(query, "?")
+		return fixQuery(query)
 	}
 	return query
 }