mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
database/sql: add Conn.Raw to expose the driver Conn safely
Exposing the underlying driver conn will allow the use of the standard connection pool while still able to run special function directly on the driver. Fixes #29835 Change-Id: Ib6d3b9535e730f008916805ae3bf76e4494c88f9 Reviewed-on: https://go-review.googlesource.com/c/go/+/174182 Run-TryBot: Daniel Theophanes <kardianos@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
parent
25a2b98f7a
commit
dc63b59630
2 changed files with 83 additions and 0 deletions
|
|
@ -1792,6 +1792,8 @@ type Conn struct {
|
||||||
done int32
|
done int32
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// grabConn takes a context to implement stmtConnGrabber
|
||||||
|
// but the context is not used.
|
||||||
func (c *Conn) grabConn(context.Context) (*driverConn, releaseConn, error) {
|
func (c *Conn) grabConn(context.Context) (*driverConn, releaseConn, error) {
|
||||||
if atomic.LoadInt32(&c.done) != 0 {
|
if atomic.LoadInt32(&c.done) != 0 {
|
||||||
return nil, nil, ErrConnDone
|
return nil, nil, ErrConnDone
|
||||||
|
|
@ -1856,6 +1858,39 @@ func (c *Conn) PrepareContext(ctx context.Context, query string) (*Stmt, error)
|
||||||
return c.db.prepareDC(ctx, dc, release, c, query)
|
return c.db.prepareDC(ctx, dc, release, c, query)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Raw executes f exposing the underlying driver connection for the
|
||||||
|
// duration of f. The driverConn must not be used outside of f.
|
||||||
|
//
|
||||||
|
// Once f returns and err is nil, the Conn will continue to be usable
|
||||||
|
// until Conn.Close is called.
|
||||||
|
func (c *Conn) Raw(f func(driverConn interface{}) error) (err error) {
|
||||||
|
var dc *driverConn
|
||||||
|
var release releaseConn
|
||||||
|
|
||||||
|
// grabConn takes a context to implement stmtConnGrabber, but the context is not used.
|
||||||
|
dc, release, err = c.grabConn(nil)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fPanic := true
|
||||||
|
dc.Mutex.Lock()
|
||||||
|
defer func() {
|
||||||
|
dc.Mutex.Unlock()
|
||||||
|
|
||||||
|
// If f panics fPanic will remain true.
|
||||||
|
// Ensure an error is passed to release so the connection
|
||||||
|
// may be discarded.
|
||||||
|
if fPanic {
|
||||||
|
err = driver.ErrBadConn
|
||||||
|
}
|
||||||
|
release(err)
|
||||||
|
}()
|
||||||
|
err = f(dc.ci)
|
||||||
|
fPanic = false
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// BeginTx starts a transaction.
|
// BeginTx starts a transaction.
|
||||||
//
|
//
|
||||||
// The provided context is used until the transaction is committed or rolled back.
|
// The provided context is used until the transaction is committed or rolled back.
|
||||||
|
|
|
||||||
|
|
@ -1339,6 +1339,54 @@ func TestConnQuery(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestConnRaw(t *testing.T) {
|
||||||
|
db := newTestDB(t, "people")
|
||||||
|
defer closeDB(t, db)
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
defer cancel()
|
||||||
|
conn, err := db.Conn(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.dc.ci.(*fakeConn).skipDirtySession = true
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
sawFunc := false
|
||||||
|
err = conn.Raw(func(dc interface{}) error {
|
||||||
|
sawFunc = true
|
||||||
|
if _, ok := dc.(*fakeConn); !ok {
|
||||||
|
return fmt.Errorf("got %T want *fakeConn", dc)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !sawFunc {
|
||||||
|
t.Fatal("Raw func not called")
|
||||||
|
}
|
||||||
|
|
||||||
|
func() {
|
||||||
|
defer func() {
|
||||||
|
x := recover()
|
||||||
|
if x == nil {
|
||||||
|
t.Fatal("expected panic")
|
||||||
|
}
|
||||||
|
conn.closemu.Lock()
|
||||||
|
closed := conn.dc == nil
|
||||||
|
conn.closemu.Unlock()
|
||||||
|
if !closed {
|
||||||
|
t.Fatal("expected connection to be closed after panic")
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
err = conn.Raw(func(dc interface{}) error {
|
||||||
|
panic("Conn.Raw panic should return an error")
|
||||||
|
})
|
||||||
|
t.Fatal("expected panic from Raw func")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
func TestCursorFake(t *testing.T) {
|
func TestCursorFake(t *testing.T) {
|
||||||
db := newTestDB(t, "people")
|
db := newTestDB(t, "people")
|
||||||
defer closeDB(t, db)
|
defer closeDB(t, db)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue