Skip to content

Commit 3233b3e

Browse files
committed
make errNoRows and errTooManyRows private to package
1 parent 5bf19bf commit 3233b3e

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

internal/codegen/golang/imports.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func (i *importer) dbImports() fileImports {
124124
}
125125
std := []ImportSpec{
126126
{Path: "runtime"},
127+
{Path: "context"},
127128
}
128129

129130
sqlpkg := parseDriver(i.Options.SqlPackage)

internal/codegen/golang/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func (q *Query) ReceiverType() string {
308308
if q.IsReadOnly() {
309309
return "Queries"
310310
}
311-
return "WriteTx"
311+
return "WriteTxn"
312312
}
313313

314314
func (q *Query) hasRetType() bool {

internal/codegen/golang/templates/sqlite/dbCode.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{{define "dbCodeTemplateStd"}}
22

33
type Queries struct {
4+
Ctx context.Context
45
conn *sqlite.Conn
56
pin runtime.Pinner
67
{{- range .ReadQueries }}
78
{{.FieldName}} {{.MethodName}}Stmt
89
{{- end}}
910
}
1011

11-
type WriteTx struct {
12+
type WriteTxn struct {
1213
Queries
1314
finish func(*error)
1415
{{- range .WriteQueries }}
@@ -40,7 +41,7 @@ func (q *Queries) Close() *lib.Error {
4041
return firstErr
4142
}
4243

43-
func (txn *WriteTx) Close() *lib.Error {
44+
func (txn *WriteTxn) Close() *lib.Error {
4445
var err, firstErr *lib.Error
4546
{{- range .WriteQueries }}
4647
txn.{{.FieldName}}.Close()

internal/codegen/golang/templates/sqlite/queryCode.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ func (q *{{ .ReceiverType }}) {{.MethodName}}({{ .Arg.Pair }}) (result {{.Ret.De
9595
return
9696
}
9797
if !ok {
98-
err = ErrNoRows
98+
err = errNoRows
9999
} else if r.Next() {
100-
err = ErrTooManyRows
100+
err = errTooManyRows
101101
} else {
102102
result = r.Row
103103
}

0 commit comments

Comments
 (0)