add tests & fix InTx

go.mod

@@ -4,10 +4,11 @@ go 1.23
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2
-	github.com/jba/templatecheck v0.7.0
+	github.com/jba/templatecheck v0.7.1
+	github.com/spf13/afero v1.11.0
 )
 
 require (
-	github.com/google/safehtml v0.0.2 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	github.com/google/safehtml v0.1.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )

go.sum

@@ -2,10 +2,18 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/google/safehtml v0.0.2 h1:ZOt2VXg4x24bW0m2jtzAOkhoXV0iM8vNKc0paByCZqM=
 github.com/google/safehtml v0.0.2/go.mod h1:L4KWwDsUJdECRAEpZoBn3O64bQaywRscowZjJAzjHnU=
+github.com/google/safehtml v0.1.0 h1:EwLKo8qawTKfsi0orxcQAZzu07cICaBeFMegAU9eaT8=
+github.com/google/safehtml v0.1.0/go.mod h1:L4KWwDsUJdECRAEpZoBn3O64bQaywRscowZjJAzjHnU=
 github.com/jba/templatecheck v0.7.0 h1:wjTb/VhGgSFeim5zjWVePBdaMo28X74bGLSABZV+zIA=
 github.com/jba/templatecheck v0.7.0/go.mod h1:n1Etw+Rrw1mDDD8dDRsEKTwMZsJ98EkktgNJC6wLUGo=
+github.com/jba/templatecheck v0.7.1 h1:yOEIFazBEwzdTPYHZF3Pm81NF1ksxx1+vJncSEwvjKc=
+github.com/jba/templatecheck v0.7.1/go.mod h1:n1Etw+Rrw1mDDD8dDRsEKTwMZsJ98EkktgNJC6wLUGo=
 github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
+github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
+github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

sqlt.go

@@ -44,7 +44,7 @@ func InTx(ctx context.Context, opts *sql.TxOptions, db *sql.DB, do func(db DB) e
 				panic(p)
 			}
 		} else if err != nil {
-			panic(errors.Join(err, tx.Rollback()))
+			err = errors.Join(err, tx.Rollback())
 		} else {
 			err = tx.Commit()
 		}
@@ -377,6 +377,8 @@ func (r *Runner) QueryRow(db DB, param any) (*sql.Row, error) {
 func Stmt[Param any](opts ...Option) *Statement[Param] {
 	_, file, line, _ := runtime.Caller(1)
 
+	location := fmt.Sprintf("%s:%d", file, line)
+
 	config := &Config{
 		Placeholder: "?",
 	}
@@ -397,12 +399,12 @@ func Stmt[Param any](opts ...Option) *Statement[Param] {
 	for _, to := range config.TemplateOptions {
 		tpl, err = to(tpl)
 		if err != nil {
-			panic(fmt.Errorf("location: [%s:%d]: %w", file, line, err))
+			panic(fmt.Errorf("location: [%s]: %w", location, err))
 		}
 	}
 
 	if err = templatecheck.CheckText(tpl, *new(Param)); err != nil {
-		panic(fmt.Errorf("location: [%s:%d]: %w", file, line, err))
+		panic(fmt.Errorf("location: [%s]: %w", location, err))
 	}
 
 	escape(tpl)
@@ -417,13 +419,13 @@ func Stmt[Param any](opts ...Option) *Statement[Param] {
 			New: func() any {
 				t, err := tpl.Clone()
 				if err != nil {
-					panic(fmt.Errorf("location: [%s:%d]: %w", file, line, err))
+					panic(fmt.Errorf("location: [%s]: %w", location, err))
 				}
 
 				runner := &Runner{
 					Template: t,
 					SQL:      &SQL{},
-					Location: fmt.Sprintf("%s:%d", file, line),
+					Location: location,
 				}
 
 				t.Funcs(template.FuncMap{
@@ -831,7 +833,7 @@ func (w *SQL) String() string {
 	}
 
 	if w.data[len(w.data)-1] == ' ' {
-		return string(w.data[:len(w.data)-1])
+		w.data = w.data[:len(w.data)-1]
 	}
 
 	return string(w.data)