Skip to content

Commit fa259bd

Browse files
committed
Simplify _pragma.
1 parent 8e327a9 commit fa259bd

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

conn.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package sqlite3
22

33
import (
44
"context"
5-
"errors"
65
"fmt"
76
"math"
87
"net/url"
@@ -103,15 +102,14 @@ func (c *Conn) openDB(filename string, flags OpenFlag) (uint32, error) {
103102
pragmas.WriteString(`;`)
104103
}
105104
}
106-
107-
pragmaPtr := c.arena.string(pragmas.String())
108-
r := c.call("sqlite3_exec", uint64(handle), uint64(pragmaPtr), 0, 0, 0)
109-
if err := c.sqlite.error(r, handle, pragmas.String()); err != nil {
110-
if errors.Is(err, ERROR) {
105+
if pragmas.Len() != 0 {
106+
pragmaPtr := c.arena.string(pragmas.String())
107+
r := c.call("sqlite3_exec", uint64(handle), uint64(pragmaPtr), 0, 0, 0)
108+
if err := c.sqlite.error(r, handle, pragmas.String()); err != nil {
111109
err = fmt.Errorf("sqlite3: invalid _pragma: %w", err)
110+
c.closeDB(handle)
111+
return 0, err
112112
}
113-
c.closeDB(handle)
114-
return 0, err
115113
}
116114
}
117115
c.call("sqlite3_progress_handler_go", uint64(handle), 100)

0 commit comments

Comments
 (0)