diff options
author | Evan Jones <evan.jones@datadoghq.com> | 2020-11-16 11:52:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-17 01:52:26 +0900 |
commit | 70c77097f2f2a8c57fa2c898284e9cfb80173eb2 (patch) | |
tree | c15790079a5db7e927020a0a7585126f6fcf2584 | |
parent | doc.go: you can use Conn.Raw to get *SQLiteConn (#882) (diff) | |
download | golite-70c77097f2f2a8c57fa2c898284e9cfb80173eb2.tar.gz golite-70c77097f2f2a8c57fa2c898284e9cfb80173eb2.tar.xz |
sqlite3_test.go: Move Go 1.13 test to sqlite3_go113_test.go (#883)
Commit 4f7abea96e added a test that uses Conn.Raw, which was added in
Go >= 1.13. The go-sqlite3 project runs tests with Go >= 1.11. Remove
the test from sqlite3_test.go, so it only runs with the correct
versions of Go.
Instead of adding a new test, modify the existing test that already
uses Conn.Raw() to check the type of driverConn.
-rw-r--r-- | doc.go | 2 | ||||
-rw-r--r-- | sqlite3_go113_test.go | 4 | ||||
-rw-r--r-- | sqlite3_test.go | 30 |
3 files changed, 5 insertions, 31 deletions
@@ -90,7 +90,7 @@ ConnectHook to get the SQLiteConn. }, }) -You can also use database/sql.Conn.Raw: +You can also use database/sql.Conn.Raw (Go >= 1.13): conn, err := db.Conn(context.Background()) // if err != nil { ... } diff --git a/sqlite3_go113_test.go b/sqlite3_go113_test.go index 74036f8..6f74e6b 100644 --- a/sqlite3_go113_test.go +++ b/sqlite3_go113_test.go @@ -49,6 +49,10 @@ func TestBeginTxCancel(t *testing.T) { if !ok { t.Fatal("unexpected: wrong type") } + // checks that conn.Raw can be used to get *SQLiteConn + if _, ok = driverConn.(*SQLiteConn); !ok { + t.Fatalf("conn.Raw() driverConn type=%T, expected *SQLiteConn", driverConn) + } go cancel() // make it cancel concurrently with exec("BEGIN"); tx, err := d.BeginTx(ctx, driver.TxOptions{}) diff --git a/sqlite3_test.go b/sqlite3_test.go index fe367cf..d5b0cea 100644 --- a/sqlite3_test.go +++ b/sqlite3_test.go @@ -9,7 +9,6 @@ package sqlite3 import ( "bytes" - "context" "database/sql" "database/sql/driver" "errors" @@ -2353,32 +2352,3 @@ func benchmarkStmtRows(b *testing.B) { } } } - -func TestConnRawIsSQLiteConn(t *testing.T) { - db, err := sql.Open("sqlite3", ":memory:") - if err != nil { - t.Fatal("Failed to open db:", err) - } - defer db.Close() - - conn, err := db.Conn(context.Background()) - if err != nil { - t.Fatal("Failed to get conn:", err) - } - defer conn.Close() - err = conn.Raw(func(driverConn interface{}) error { - sqliteConn, ok := driverConn.(*SQLiteConn) - if !ok { - t.Errorf("driverConn type=%T; expected to be *SQLiteConn", driverConn) - return nil - } - // call a private SQLite API to confirm the raw conn "works" - if sqliteConn.AuthEnabled() { - t.Error("sqliteConn.AuthEnabled()=true; expected false") - } - return nil - }) - if err != nil { - t.Error("conn.Raw() returned err:", err) - } -} |