zishuo/go-sqlite
1
0
Fork 0
mirror of https://github.com/glebarez/go-sqlite.git synced 2025-10-06 00:06:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from amenzhinsky/sqlite-public

Browse Source 
Make sqlite public
This commit is contained in:
Alexander Menzhinsky
2017-04-30 15:10:51 +03:00
committed by GitHub
parent 0d9b19cc9d 65f6d7e4e9
commit ced002fb38
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@@ -6,4 +6,5 @@
# #
# Please keep the list sorted. # Please keep the list sorted.
Alexander Menzhinsky <amenzhinsky@gmail.com>
Jan Mercl <0xjnml@gmail.com> Jan Mercl <0xjnml@gmail.com>

16
sqlite.go
View File

@@ -70,7 +70,7 @@ import (
var ( var (
_ driver.Conn = (*conn)(nil) _ driver.Conn = (*conn)(nil)
_ driver.Driver = (*sqlite)(nil) _ driver.Driver = (*Driver)(nil)
_ driver.Execer = (*conn)(nil) _ driver.Execer = (*conn)(nil)
_ driver.Queryer = (*conn)(nil) _ driver.Queryer = (*conn)(nil)
_ driver.Result = (*result)(nil) _ driver.Result = (*result)(nil)
@@ -991,17 +991,17 @@ func (t *tx) exec(sql string) (err error) {
} }
type conn struct { type conn struct {
*sqlite *Driver
*virtual.Thread *virtual.Thread
ppdb uintptr ppdb uintptr
} }
func (c *conn) String() string { 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) { func newConn(s *Driver, name string) (_ *conn, err error) {
c := &conn{sqlite: s} c := &conn{Driver: s}
defer func() { defer func() {
if err != nil { if err != nil {
@@ -1298,12 +1298,12 @@ func (c *conn) close() (err error) {
return err return err
} }
type sqlite struct { type Driver struct {
conns int conns int
sync.Mutex 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 // Open returns a new connection to the database. The name is a string in a
// driver-specific format. // driver-specific format.
@@ -1313,7 +1313,7 @@ func newDrv() *sqlite { return &sqlite{} }
// efficient re-use. // efficient re-use.
// //
// The returned connection is only used by one goroutine at a time. // 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 { if trace {
defer func() { defer func() {
tracer(s, "Open(%s): (%v, %v)", name, c, err) tracer(s, "Open(%s): (%v, %v)", name, c, err)