Skip to content

Commit 189fbc9

Browse files
NyaaaWhatsUpDocncruces
authored andcommitted
change driver name to SQLite{}, remove global variable
1 parent d4027b0 commit 189fbc9

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

driver/driver.go

+7-12
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,24 @@ var driverName = "sqlite3"
6363

6464
func init() {
6565
if driverName != "" {
66-
sql.Register(driverName, &SQLiteDriver)
66+
sql.Register(driverName, &SQLite{})
6767
}
6868
}
6969

70-
// SQLiteDriver is a global Driver{} instance
71-
// registered under [database/sql] as "sqlite3".
72-
var SQLiteDriver = Driver{}
73-
7470
// Open opens the SQLite database specified by dataSourceName as a [database/sql.DB].
7571
//
7672
// The init function is called by the driver on new connections.
7773
// The conn can be used to execute queries, register functions, etc.
7874
// Any error return closes the conn and passes the error to [database/sql].
7975
func Open(dataSourceName string, init func(*sqlite3.Conn) error) (*sql.DB, error) {
80-
d := Driver{Init: init}
81-
c, err := d.OpenConnector(dataSourceName)
76+
c, err := (&SQLite{Init: init}).OpenConnector(dataSourceName)
8277
if err != nil {
8378
return nil, err
8479
}
8580
return sql.OpenDB(c), nil
8681
}
8782

88-
type Driver struct {
83+
type SQLite struct {
8984

9085
// The init function is called by the driver on new connections.
9186
// The conn can be used to execute queries, register functions, etc.
@@ -94,7 +89,7 @@ type Driver struct {
9489
}
9590

9691
// Open: implements [database/sql.Driver].
97-
func (d *Driver) Open(name string) (driver.Conn, error) {
92+
func (d *SQLite) Open(name string) (driver.Conn, error) {
9893
c, err := d.newConnector(name)
9994
if err != nil {
10095
return nil, err
@@ -103,11 +98,11 @@ func (d *Driver) Open(name string) (driver.Conn, error) {
10398
}
10499

105100
// OpenConnector: implements [database/sql.DriverContext].
106-
func (d *Driver) OpenConnector(name string) (driver.Connector, error) {
101+
func (d *SQLite) OpenConnector(name string) (driver.Connector, error) {
107102
return d.newConnector(name)
108103
}
109104

110-
func (d *Driver) newConnector(name string) (*connector, error) {
105+
func (d *SQLite) newConnector(name string) (*connector, error) {
111106
c := connector{driver: d, name: name}
112107

113108
var txlock, timefmt string
@@ -150,7 +145,7 @@ func (d *Driver) newConnector(name string) (*connector, error) {
150145
}
151146

152147
type connector struct {
153-
driver *Driver
148+
driver *SQLite
154149
name string
155150
txBegin string
156151
tmRead sqlite3.TimeFormat

0 commit comments

Comments
 (0)