Skip to content

Commit e5bd10a

Browse files
ncrucesncruces
committed
Fix TestDB.
1 parent 5cf06c4 commit e5bd10a

File tree

18 files changed

+82
-80
lines changed

18 files changed

+82
-80
lines changed

‎driver/driver_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func Test_Open_dir(t *testing.T) {
5151

5252
func Test_Open_pragma(t *testing.T) {
5353
t.Parallel()
54-
tmp := memdb.TestDB(t, url.Values{
54+
dsn := memdb.TestDB(t, url.Values{
5555
"_pragma": {"busy_timeout(1000)"},
5656
})
5757

58-
db, err := Open(tmp)
58+
db, err := Open(dsn)
5959
if err != nil {
6060
t.Fatal(err)
6161
}
@@ -73,11 +73,11 @@ func Test_Open_pragma(t *testing.T) {
7373

7474
func Test_Open_pragma_invalid(t *testing.T) {
7575
t.Parallel()
76-
tmp := memdb.TestDB(t, url.Values{
76+
dsn := memdb.TestDB(t, url.Values{
7777
"_pragma": {"busy_timeout 1000"},
7878
})
7979

80-
db, err := Open(tmp)
80+
db, err := Open(dsn)
8181
if err != nil {
8282
t.Fatal(err)
8383
}
@@ -101,12 +101,12 @@ func Test_Open_pragma_invalid(t *testing.T) {
101101

102102
func Test_Open_txLock(t *testing.T) {
103103
t.Parallel()
104-
tmp := memdb.TestDB(t, url.Values{
104+
dsn := memdb.TestDB(t, url.Values{
105105
"_txlock": {"exclusive"},
106106
"_pragma": {"busy_timeout(1000)"},
107107
})
108108

109-
db, err := Open(tmp)
109+
db, err := Open(dsn)
110110
if err != nil {
111111
t.Fatal(err)
112112
}
@@ -137,11 +137,11 @@ func Test_Open_txLock(t *testing.T) {
137137

138138
func Test_Open_txLock_invalid(t *testing.T) {
139139
t.Parallel()
140-
tmp := memdb.TestDB(t, url.Values{
140+
dsn := memdb.TestDB(t, url.Values{
141141
"_txlock": {"xclusive"},
142142
})
143143

144-
_, err := Open(tmp)
144+
_, err := Open(dsn)
145145
if err == nil {
146146
t.Fatal("want error")
147147
}
@@ -152,12 +152,12 @@ func Test_Open_txLock_invalid(t *testing.T) {
152152

153153
func Test_BeginTx(t *testing.T) {
154154
t.Parallel()
155-
tmp := memdb.TestDB(t, url.Values{
155+
dsn := memdb.TestDB(t, url.Values{
156156
"_txlock": {"exclusive"},
157157
"_pragma": {"busy_timeout(0)"},
158158
})
159159

160-
db, err := Open(tmp)
160+
db, err := Open(dsn)
161161
if err != nil {
162162
t.Fatal(err)
163163
}
@@ -199,9 +199,9 @@ func Test_BeginTx(t *testing.T) {
199199

200200
func Test_nested_context(t *testing.T) {
201201
t.Parallel()
202-
tmp := memdb.TestDB(t)
202+
dsn := memdb.TestDB(t)
203203

204-
db, err := Open(tmp)
204+
db, err := Open(dsn)
205205
if err != nil {
206206
t.Fatal(err)
207207
}
@@ -257,9 +257,9 @@ func Test_nested_context(t *testing.T) {
257257

258258
func Test_Prepare(t *testing.T) {
259259
t.Parallel()
260-
tmp := memdb.TestDB(t)
260+
dsn := memdb.TestDB(t)
261261

262-
db, err := Open(tmp)
262+
db, err := Open(dsn)
263263
if err != nil {
264264
t.Fatal(err)
265265
}
@@ -298,9 +298,9 @@ func Test_Prepare(t *testing.T) {
298298

299299
func Test_QueryRow_named(t *testing.T) {
300300
t.Parallel()
301-
tmp := memdb.TestDB(t)
301+
dsn := memdb.TestDB(t)
302302

303-
db, err := Open(tmp)
303+
db, err := Open(dsn)
304304
if err != nil {
305305
t.Fatal(err)
306306
}
@@ -348,9 +348,9 @@ func Test_QueryRow_named(t *testing.T) {
348348

349349
func Test_QueryRow_blob_null(t *testing.T) {
350350
t.Parallel()
351-
tmp := memdb.TestDB(t)
351+
dsn := memdb.TestDB(t)
352352

353-
db, err := Open(tmp)
353+
db, err := Open(dsn)
354354
if err != nil {
355355
t.Fatal(err)
356356
}
@@ -385,11 +385,11 @@ func Test_time(t *testing.T) {
385385

386386
for _, fmt := range []string{"auto", "sqlite", "rfc3339", time.ANSIC} {
387387
t.Run(fmt, func(t *testing.T) {
388-
tmp := memdb.TestDB(t, url.Values{
388+
dsn := memdb.TestDB(t, url.Values{
389389
"_timefmt": {fmt},
390390
})
391391

392-
db, err := Open(tmp)
392+
db, err := Open(dsn)
393393
if err != nil {
394394
t.Fatal(err)
395395
}
@@ -432,9 +432,9 @@ func Test_ColumnType_ScanType(t *testing.T) {
432432
)
433433

434434
t.Parallel()
435-
tmp := memdb.TestDB(t)
435+
dsn := memdb.TestDB(t)
436436

437-
db, err := Open(tmp)
437+
db, err := Open(dsn)
438438
if err != nil {
439439
t.Fatal(err)
440440
}
@@ -523,9 +523,9 @@ func Test_ColumnType_ScanType(t *testing.T) {
523523

524524
func Test_rows_ScanColumn(t *testing.T) {
525525
t.Parallel()
526-
tmp := memdb.TestDB(t)
526+
dsn := memdb.TestDB(t)
527527

528-
db, err := Open(tmp)
528+
db, err := Open(dsn)
529529
if err != nil {
530530
t.Fatal(err)
531531
}

‎ext/array/array_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ func Example() {
8888

8989
func Test_cursor_Column(t *testing.T) {
9090
t.Parallel()
91-
tmp := memdb.TestDB(t)
91+
dsn := memdb.TestDB(t)
9292

93-
db, err := driver.Open(tmp, array.Register)
93+
db, err := driver.Open(dsn, array.Register)
9494
if err != nil {
9595
t.Fatal(err)
9696
}

‎ext/fileio/fileio_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717

1818
func Test_lsmode(t *testing.T) {
1919
t.Parallel()
20-
tmp := memdb.TestDB(t)
20+
dsn := memdb.TestDB(t)
2121

22-
db, err := driver.Open(tmp, fileio.Register)
22+
db, err := driver.Open(dsn, fileio.Register)
2323
if err != nil {
2424
t.Fatal(err)
2525
}
@@ -53,9 +53,9 @@ func Test_readfile(t *testing.T) {
5353

5454
for _, fsys := range []fs.FS{nil, os.DirFS(".")} {
5555
t.Run("", func(t *testing.T) {
56-
tmp := memdb.TestDB(t)
56+
dsn := memdb.TestDB(t)
5757

58-
db, err := driver.Open(tmp, func(c *sqlite3.Conn) error {
58+
db, err := driver.Open(dsn, func(c *sqlite3.Conn) error {
5959
fileio.RegisterFS(c, fsys)
6060
return nil
6161
})

‎ext/fileio/fsdir_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ func Test_fsdir(t *testing.T) {
2121

2222
for _, fsys := range []fs.FS{nil, os.DirFS(".")} {
2323
t.Run("", func(t *testing.T) {
24-
tmp := memdb.TestDB(t)
24+
dsn := memdb.TestDB(t)
2525

26-
db, err := driver.Open(tmp, func(c *sqlite3.Conn) error {
26+
db, err := driver.Open(dsn, func(c *sqlite3.Conn) error {
2727
fileio.RegisterFS(c, fsys)
2828
return nil
2929
})

‎ext/fileio/write_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
func Test_writefile(t *testing.T) {
1717
t.Parallel()
18-
tmp := memdb.TestDB(t)
18+
dsn := memdb.TestDB(t)
1919

20-
db, err := driver.Open(tmp, Register)
20+
db, err := driver.Open(dsn, Register)
2121
if err != nil {
2222
t.Fatal(err)
2323
}

‎ext/hash/hash_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
func TestRegister(t *testing.T) {
2323
t.Parallel()
24-
tmp := memdb.TestDB(t)
24+
dsn := memdb.TestDB(t)
2525

2626
tests := []struct {
2727
name string
@@ -55,7 +55,7 @@ func TestRegister(t *testing.T) {
5555
{"blake2b('', 256)", "0E5751C026E543B2E8AB2EB06099DAA1D1E5DF47778F7787FAAB45CDF12FE3A8"},
5656
}
5757

58-
db, err := driver.Open(tmp, Register)
58+
db, err := driver.Open(dsn, Register)
5959
if err != nil {
6060
t.Fatal(err)
6161
}

‎ext/ipaddr/ipaddr_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
func TestRegister(t *testing.T) {
1414
t.Parallel()
15-
tmp := memdb.TestDB(t)
15+
dsn := memdb.TestDB(t)
1616

17-
db, err := driver.Open(tmp, ipaddr.Register)
17+
db, err := driver.Open(dsn, ipaddr.Register)
1818
if err != nil {
1919
t.Fatal(err)
2020
}

‎ext/lines/lines_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ func Example() {
6767

6868
func Test_lines(t *testing.T) {
6969
t.Parallel()
70-
tmp := memdb.TestDB(t)
70+
dsn := memdb.TestDB(t)
7171

72-
db, err := driver.Open(tmp, lines.Register)
72+
db, err := driver.Open(dsn, lines.Register)
7373
if err != nil {
7474
log.Fatal(err)
7575
}
@@ -98,9 +98,9 @@ func Test_lines(t *testing.T) {
9898

9999
func Test_lines_error(t *testing.T) {
100100
t.Parallel()
101-
tmp := memdb.TestDB(t)
101+
dsn := memdb.TestDB(t)
102102

103-
db, err := driver.Open(tmp, lines.Register)
103+
db, err := driver.Open(dsn, lines.Register)
104104
if err != nil {
105105
log.Fatal(err)
106106
}
@@ -123,9 +123,9 @@ func Test_lines_error(t *testing.T) {
123123

124124
func Test_lines_read(t *testing.T) {
125125
t.Parallel()
126-
tmp := memdb.TestDB(t)
126+
dsn := memdb.TestDB(t)
127127

128-
db, err := driver.Open(tmp, lines.Register)
128+
db, err := driver.Open(dsn, lines.Register)
129129
if err != nil {
130130
log.Fatal(err)
131131
}
@@ -155,9 +155,9 @@ func Test_lines_read(t *testing.T) {
155155

156156
func Test_lines_test(t *testing.T) {
157157
t.Parallel()
158-
tmp := memdb.TestDB(t)
158+
dsn := memdb.TestDB(t)
159159

160-
db, err := driver.Open(tmp, lines.Register)
160+
db, err := driver.Open(dsn, lines.Register)
161161
if err != nil {
162162
log.Fatal(err)
163163
}

‎ext/regexp/regexp_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
func TestRegister(t *testing.T) {
1717
t.Parallel()
18-
tmp := memdb.TestDB(t)
18+
dsn := memdb.TestDB(t)
1919

20-
db, err := driver.Open(tmp, Register)
20+
db, err := driver.Open(dsn, Register)
2121
if err != nil {
2222
t.Fatal(err)
2323
}
@@ -80,9 +80,9 @@ func TestRegister(t *testing.T) {
8080

8181
func TestRegister_errors(t *testing.T) {
8282
t.Parallel()
83-
tmp := memdb.TestDB(t)
83+
dsn := memdb.TestDB(t)
8484

85-
db, err := driver.Open(tmp, Register)
85+
db, err := driver.Open(dsn, Register)
8686
if err != nil {
8787
t.Fatal(err)
8888
}
@@ -107,9 +107,9 @@ func TestRegister_errors(t *testing.T) {
107107

108108
func TestRegister_pointer(t *testing.T) {
109109
t.Parallel()
110-
tmp := memdb.TestDB(t)
110+
dsn := memdb.TestDB(t)
111111

112-
db, err := driver.Open(tmp, Register)
112+
db, err := driver.Open(dsn, Register)
113113
if err != nil {
114114
t.Fatal(err)
115115
}

‎ext/uuid/uuid_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414

1515
func Test_generate(t *testing.T) {
1616
t.Parallel()
17-
tmp := memdb.TestDB(t)
17+
dsn := memdb.TestDB(t)
1818

19-
db, err := driver.Open(tmp, Register)
19+
db, err := driver.Open(dsn, Register)
2020
if err != nil {
2121
t.Fatal(err)
2222
}
@@ -153,9 +153,9 @@ func Test_generate(t *testing.T) {
153153

154154
func Test_convert(t *testing.T) {
155155
t.Parallel()
156-
tmp := memdb.TestDB(t)
156+
dsn := memdb.TestDB(t)
157157

158-
db, err := driver.Open(tmp, Register)
158+
db, err := driver.Open(dsn, Register)
159159
if err != nil {
160160
t.Fatal(err)
161161
}

0 commit comments

Comments
 (0)