Skip to content

Commit 4d23fc3

Browse files
committed
Fix file format.
1 parent 34882e7 commit 4d23fc3

File tree

4 files changed

+46
-12
lines changed

4 files changed

+46
-12
lines changed

tests/db_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
)
1717

1818
//go:embed testdata/wal.db
19-
var waldb []byte
19+
var walDB []byte
2020

2121
//go:embed testdata/utf16be.db
22-
var utf16db []byte
22+
var utf16DB []byte
2323

2424
func TestDB_memory(t *testing.T) {
2525
t.Parallel()
@@ -42,7 +42,7 @@ func TestDB_wal(t *testing.T) {
4242

4343
t.Parallel()
4444
tmp := filepath.Join(t.TempDir(), "test.db")
45-
err := os.WriteFile(tmp, waldb, 0666)
45+
err := os.WriteFile(tmp, walDB, 0666)
4646
if err != nil {
4747
t.Fatal(err)
4848
}
@@ -56,7 +56,7 @@ func TestDB_utf16(t *testing.T) {
5656

5757
t.Parallel()
5858
tmp := filepath.Join(t.TempDir(), "test.db")
59-
err := os.WriteFile(tmp, utf16db, 0666)
59+
err := os.WriteFile(tmp, utf16DB, 0666)
6060
if err != nil {
6161
t.Fatal(err)
6262
}

tests/wal_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ func TestWAL_enter_exit(t *testing.T) {
2626
defer db.Close()
2727

2828
if !vfs.SupportsSharedMemory {
29-
err = db.Exec(`PRAGMA locking_mode=EXCLUSIVE`)
29+
err = db.Exec(`PRAGMA locking_mode=exclusive`)
3030
if err != nil {
3131
t.Fatal(err)
3232
}
3333
}
3434

3535
err = db.Exec(`
3636
CREATE TABLE test (col);
37-
PRAGMA journal_mode=WAL;
37+
PRAGMA journal_mode=wal;
3838
SELECT * FROM test;
39-
PRAGMA journal_mode=DELETE;
39+
PRAGMA journal_mode=delete;
4040
SELECT * FROM test;
41-
PRAGMA journal_mode=WAL;
41+
PRAGMA journal_mode=wal;
4242
SELECT * FROM test;
4343
`)
4444
if err != nil {
@@ -53,7 +53,7 @@ func TestWAL_readonly(t *testing.T) {
5353
t.Parallel()
5454

5555
tmp := filepath.Join(t.TempDir(), "test.db")
56-
err := os.WriteFile(tmp, waldb, 0666)
56+
err := os.WriteFile(tmp, walDB, 0666)
5757
if err != nil {
5858
t.Fatal(err)
5959
}
@@ -101,8 +101,8 @@ func TestConn_WalCheckpoint(t *testing.T) {
101101
})
102102

103103
err = db.Exec(`
104-
PRAGMA locking_mode=EXCLUSIVE;
105-
PRAGMA journal_mode=WAL;
104+
PRAGMA locking_mode=exlusive;
105+
PRAGMA journal_mode=wal;
106106
CREATE TABLE test (col);
107107
`)
108108
if err != nil {

vfs/adiantum/adiantum_test.go

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,48 @@
11
package adiantum_test
22

33
import (
4+
_ "embed"
45
"path/filepath"
6+
"strings"
57
"testing"
68

79
"github.com/ncruces/go-sqlite3"
10+
"github.com/ncruces/go-sqlite3/driver"
811
_ "github.com/ncruces/go-sqlite3/embed"
9-
_ "github.com/ncruces/go-sqlite3/vfs/adiantum"
12+
"github.com/ncruces/go-sqlite3/util/ioutil"
13+
"github.com/ncruces/go-sqlite3/vfs"
14+
"github.com/ncruces/go-sqlite3/vfs/adiantum"
15+
"github.com/ncruces/go-sqlite3/vfs/readervfs"
1016
)
1117

18+
//go:embed testdata/test.db
19+
var testDB string
20+
21+
func Test_fileformat(t *testing.T) {
22+
readervfs.Create("test.db", ioutil.NewSizeReaderAt(strings.NewReader(testDB)))
23+
adiantum.Register("adiantum", vfs.Find("reader"), nil)
24+
25+
db, err := driver.Open("file:test.db?vfs=adiantum", nil)
26+
if err != nil {
27+
t.Fatal(err)
28+
}
29+
defer db.Close()
30+
31+
_, err = db.Exec(`PRAGMA textkey='correct+horse+battery+staple'`)
32+
if err != nil {
33+
t.Fatal(err)
34+
}
35+
36+
var version uint32
37+
err = db.QueryRow(`PRAGMA user_version`).Scan(&version)
38+
if err != nil {
39+
t.Fatal(err)
40+
}
41+
if version != 0xBADDB {
42+
t.Error(version)
43+
}
44+
}
45+
1246
func Benchmark_nokey(b *testing.B) {
1347
tmp := filepath.Join(b.TempDir(), "test.db")
1448
sqlite3.Initialize()

vfs/adiantum/testdata/test.db

4 KB
Binary file not shown.

0 commit comments

Comments
 (0)