From 65f6d7e4e9c462b9bd9527e538a11f288ef735d0 Mon Sep 17 00:00:00 2001 From: Alexander Menzhinsky Date: Fri, 28 Apr 2017 20:10:40 +0300 Subject: Make sqlite public --- CONTRIBUTORS | 1 + sqlite.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5e86f06..155663a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -6,4 +6,5 @@ # # Please keep the list sorted. +Alexander Menzhinsky Jan Mercl <0xjnml@gmail.com> diff --git a/sqlite.go b/sqlite.go index 6e675c2..ed318ef 100644 --- a/sqlite.go +++ b/sqlite.go @@ -70,7 +70,7 @@ import ( var ( _ driver.Conn = (*conn)(nil) - _ driver.Driver = (*sqlite)(nil) + _ driver.Driver = (*Driver)(nil) _ driver.Execer = (*conn)(nil) _ driver.Queryer = (*conn)(nil) _ driver.Result = (*result)(nil) @@ -991,17 +991,17 @@ func (t *tx) exec(sql string) (err error) { } type conn struct { - *sqlite + *Driver *virtual.Thread ppdb uintptr } func (c *conn) String() string { - return fmt.Sprintf("&%T@%p{sqlite: %p, Thread: %p, ppdb: %#x}", *c, c, c.sqlite, c.Thread, c.ppdb) + return fmt.Sprintf("&%T@%p{sqlite: %p, Thread: %p, ppdb: %#x}", *c, c, c.Driver, c.Thread, c.ppdb) } -func newConn(s *sqlite, name string) (_ *conn, err error) { - c := &conn{sqlite: s} +func newConn(s *Driver, name string) (_ *conn, err error) { + c := &conn{Driver: s} defer func() { if err != nil { @@ -1298,12 +1298,12 @@ func (c *conn) close() (err error) { return err } -type sqlite struct { +type Driver struct { conns int sync.Mutex } -func newDrv() *sqlite { return &sqlite{} } +func newDrv() *Driver { return &Driver{} } // Open returns a new connection to the database. The name is a string in a // driver-specific format. @@ -1313,7 +1313,7 @@ func newDrv() *sqlite { return &sqlite{} } // efficient re-use. // // The returned connection is only used by one goroutine at a time. -func (s *sqlite) Open(name string) (c driver.Conn, err error) { +func (s *Driver) Open(name string) (c driver.Conn, err error) { if trace { defer func() { tracer(s, "Open(%s): (%v, %v)", name, c, err) -- cgit v1.2.3-70-g09d2