wazero v1.2.1.

Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.2.0 to 0.3.0.
- [Commits](https://github.com/golang/sync/compare/v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/go.yml

@@ -34,8 +34,9 @@ jobs:
     - name: Download
       run: go mod download
 
-    - name: Verify
-      run: go mod verify
+    # Fixed in go 1.21: https://go.dev/issue/54372
+    # - name: Verify
+    #   run: go mod verify
 
     - name: Vet
       run: go vet ./...

go.mod

@@ -5,9 +5,9 @@ go 1.19
 require (
 	github.com/ncruces/julianday v0.1.5
 	github.com/psanford/httpreadat v0.1.0
-	github.com/tetratelabs/wazero v1.2.0
-	golang.org/x/sync v0.2.0
-	golang.org/x/sys v0.8.0
+	github.com/tetratelabs/wazero v1.2.1
+	golang.org/x/sync v0.3.0
+	golang.org/x/sys v0.9.0
 )
 
 retract v0.4.0 // tagged from the wrong branch

go.sum

@@ -2,9 +2,9 @@ github.com/ncruces/julianday v0.1.5 h1:hDJ9ejiMp3DHsoZ5KW4c1lwfMjbARS7u/gbYcd0FB
 github.com/ncruces/julianday v0.1.5/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
 github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIwZLUE=
 github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE=
-github.com/tetratelabs/wazero v1.2.0 h1:I/8LMf4YkCZ3r2XaL9whhA0VMyAvF6QE+O7rco0DCeQ=
-github.com/tetratelabs/wazero v1.2.0/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/tetratelabs/wazero v1.2.1 h1:J4X2hrGzJvt+wqltuvcSjHQ7ujQxA9gb6PeMs4qlUWs=
+github.com/tetratelabs/wazero v1.2.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

go.work

@@ -0,0 +1,6 @@
+go 1.19
+
+use (
+	.
+	./gormlite
+)

gormlite/README.md

@@ -1,5 +1,7 @@
 # GORM SQLite Driver
 
+[![Go Reference](https://pkg.go.dev/badge/image)](https://pkg.go.dev/github.com/ncruces/go-sqlite3/gormlite)
+
 ## Usage
 
 ```go

gormlite/ddlmod.go

@@ -162,7 +162,7 @@ func parseDDL(strs ...string) (*ddl, error) {
 			for _, column := range getAllColumns(matches[1]) {
 				for idx, c := range result.columns {
 					if c.NameValue.String == column {
-						c.UniqueValue = sql.NullBool{Bool: true, Valid: true}
+						c.UniqueValue = sql.NullBool{Bool: strings.ToUpper(strings.Fields(str)[1]) == "UNIQUE", Valid: true}
 						result.columns[idx] = c
 					}
 				}

gormlite/ddlmod_test.go

@@ -79,6 +79,24 @@ func TestParseDDL(t *testing.T) {
 				},
 			},
 		},
+		{
+			"non-unique index",
+			[]string{
+				"CREATE TABLE `test-c` (`field` integer NOT NULL)",
+				"CREATE INDEX `idx_uq` ON `test-b`(`field`) WHERE field = 0",
+			},
+			1,
+			[]migrator.ColumnType{
+				{
+					NameValue:       sql.NullString{String: "field", Valid: true},
+					DataTypeValue:   sql.NullString{String: "integer", Valid: true},
+					ColumnTypeValue: sql.NullString{String: "integer", Valid: true},
+					PrimaryKeyValue: sql.NullBool{Bool: false, Valid: true},
+					UniqueValue:     sql.NullBool{Bool: false, Valid: true},
+					NullableValue:   sql.NullBool{Bool: false, Valid: true},
+				},
+			},
+		},
 	}
 
 	for _, p := range params {

gormlite/download.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd -P -- "$(dirname -- "$0")"
+
+curl -#OL "https://github.com/go-gorm/sqlite/raw/master/ddlmod.go"
+curl -#OL "https://github.com/go-gorm/sqlite/raw/master/ddlmod_test.go"
+curl -#OL "https://github.com/go-gorm/sqlite/raw/master/error_translator.go"
+curl -#OL "https://github.com/go-gorm/sqlite/raw/master/migrator.go"
+curl -#OL "https://github.com/go-gorm/sqlite/raw/master/sqlite.go"
+curl -#OL "https://github.com/go-gorm/sqlite/raw/master/sqlite_test.go"

gormlite/error_translator.go

@@ -8,8 +8,14 @@ import (
 )
 
 func (dialector Dialector) Translate(err error) error {
-	if errors.Is(err, sqlite3.CONSTRAINT_UNIQUE) {
+	switch {
+	case
+		errors.Is(err, sqlite3.CONSTRAINT_UNIQUE),
+		errors.Is(err, sqlite3.CONSTRAINT_PRIMARYKEY):
 		return gorm.ErrDuplicatedKey
+	case
+		errors.Is(err, sqlite3.CONSTRAINT_FOREIGNKEY):
+		return err // gorm.ErrForeignKeyViolated (gorm v1.25.2)
 	}
 	return err
 }

gormlite/errors.go

@@ -1,7 +0,0 @@
-package gormlite
-
-import "errors"
-
-var (
-	ErrConstraintsNotImplemented = errors.New("constraints not implemented on sqlite, consider using DisableForeignKeyConstraintWhenMigrating, more details https://github.com/go-gorm/gorm/wiki/GORM-V2-Release-Note-Draft#all-new-migrator")
-)

gormlite/go.mod

@@ -1,19 +1,16 @@
-module github.com/ncruces/go-sqlite/gormlite
+module github.com/ncruces/go-sqlite3/gormlite
 
 go 1.19
 
 require (
-	github.com/google/uuid v1.3.0
-	github.com/jinzhu/now v1.1.5
-	github.com/ncruces/go-sqlite3 v0.7.1
-	gorm.io/driver/mysql v1.5.1
+	github.com/ncruces/go-sqlite3 v0.7.2
 	gorm.io/gorm v1.25.1
 )
 
 require (
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/ncruces/julianday v0.1.5 // indirect
-	github.com/tetratelabs/wazero v1.2.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
+	github.com/tetratelabs/wazero v1.2.1 // indirect
+	golang.org/x/sys v0.9.0 // indirect
 )

gormlite/go.sum

@@ -1,20 +1,14 @@
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/ncruces/go-sqlite3 v0.7.1 h1:SDd3g18RobYi3NM8nZgozHM6jaqIbpMEmX42YGOVcTU=
-github.com/ncruces/go-sqlite3 v0.7.1/go.mod h1:n+DEDYam8SK5jmsfUC/9GFhSF0gVHGXiYFXnAo8Jwsc=
+github.com/ncruces/go-sqlite3 v0.7.2 h1:K7jU4rnUxFdUsbEL+B0Xc+VexLTEwGSO6Qh91Qh4hYc=
+github.com/ncruces/go-sqlite3 v0.7.2/go.mod h1:t3dP4AP9rJddU+ffFv0h6fWyeOCEhjxrYc1nsYG7aQI=
 github.com/ncruces/julianday v0.1.5 h1:hDJ9ejiMp3DHsoZ5KW4c1lwfMjbARS7u/gbYcd0FBZk=
 github.com/ncruces/julianday v0.1.5/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
-github.com/tetratelabs/wazero v1.2.0 h1:I/8LMf4YkCZ3r2XaL9whhA0VMyAvF6QE+O7rco0DCeQ=
-github.com/tetratelabs/wazero v1.2.0/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
+github.com/tetratelabs/wazero v1.2.1 h1:J4X2hrGzJvt+wqltuvcSjHQ7ujQxA9gb6PeMs4qlUWs=
+github.com/tetratelabs/wazero v1.2.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64=
 gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=

gormlite/migrator.go

@@ -322,6 +322,9 @@ func (m Migrator) RenameIndex(value interface{}, oldName, newName string) error
 		var sql string
 		m.DB.Raw("SELECT sql FROM sqlite_master WHERE type = ? AND tbl_name = ? AND name = ?", "index", stmt.Table, oldName).Row().Scan(&sql)
 		if sql != "" {
+			if err := m.DropIndex(value, oldName); err != nil {
+				return err
+			}
 			return m.DB.Exec(strings.Replace(sql, oldName, newName, 1)).Error
 		}
 		return fmt.Errorf("failed to find index with name %v", oldName)

gormlite/test.sh

@@ -11,4 +11,8 @@ rm -rf gorm/
 patch -p1 -N < tests.patch
 
 cd tests
-go mod tidy && go test
+go mod tidy && go work use . && go test
+
+cd ..
+rm -rf tests/
+go work use -r .

gormlite/tests.patch

@@ -6,27 +6,27 @@ index 08cb523..72e8ffc 100644
 -go.sum
 +*
 diff --git a/tests/go.mod b/tests/go.mod
-index f47d175..dba4a24 100644
+index f47d175..84b80c2 100644
 --- a/tests/go.mod
 +++ b/tests/go.mod
-@@ -7,13 +7,10 @@ require (
+@@ -7,13 +7,13 @@ require (
  	github.com/jackc/pgx/v5 v5.3.1 // indirect
  	github.com/jinzhu/now v1.1.5
  	github.com/lib/pq v1.10.8
 -	github.com/mattn/go-sqlite3 v1.14.16 // indirect
-+	github.com/ncruces/go-sqlite3 v0.7.1
++	github.com/ncruces/go-sqlite3 v0.7.2
++	github.com/ncruces/go-sqlite3/gormlite v0.0.0
  	golang.org/x/crypto v0.8.0 // indirect
  	gorm.io/driver/mysql v1.5.0
  	gorm.io/driver/postgres v1.5.0
 -	gorm.io/driver/sqlite v1.5.0
  	gorm.io/driver/sqlserver v1.4.3
 -	gorm.io/gorm v1.25.0
--)
--
--replace gorm.io/gorm => ../
 +	gorm.io/gorm v1.25.1
-+)
-\ No newline at end of file
+ )
+ 
+-replace gorm.io/gorm => ../
++replace github.com/ncruces/go-sqlite3/gormlite => ../
 diff --git a/tests/scanner_valuer_test.go b/tests/scanner_valuer_test.go
 index 1412169..472434b 100644
 --- a/tests/scanner_valuer_test.go

module.go

@@ -23,6 +23,7 @@ import (
 var (
 	Binary []byte // WASM binary to load.
 	Path   string // Path to load the binary from.
+	Debug  bool   // Whether to enable SQLite debug stack traces.
 )
 
 var sqlite3 struct {
@@ -51,7 +52,7 @@ func instantiateModule() (*module, error) {
 
 func compileModule() {
 	ctx := context.Background()
-	sqlite3.runtime = wazero.NewRuntime(ctx)
+	sqlite3.runtime = wazero.NewRuntimeWithConfig(ctx, wazero.NewRuntimeConfig().WithDebugInfoEnabled(Debug))
 
 	env := vfs.ExportHostFunctions(sqlite3.runtime.NewHostModuleBuilder("env"))
 	_, sqlite3.err = env.Instantiate(ctx)

vfs/memdb/memdb.go

@@ -187,17 +187,11 @@ func (m *memFile) Lock(lock vfs.LockLevel) error {
 
 	m.lockMtx.Lock()
 	defer m.lockMtx.Unlock()
-	deadline := time.Now().Add(time.Millisecond)
 
 	switch lock {
 	case vfs.LOCK_SHARED:
-		for m.pending != nil {
-			if time.Now().After(deadline) {
-				return sqlite3.BUSY
-			}
-			m.lockMtx.Unlock()
-			runtime.Gosched()
-			m.lockMtx.Lock()
+		if m.pending != nil {
+			return sqlite3.BUSY
 		}
 		m.shared++
 
@@ -216,8 +210,8 @@ func (m *memFile) Lock(lock vfs.LockLevel) error {
 			m.pending = m
 		}
 
-		for m.shared > 1 {
-			if time.Now().After(deadline) {
+		for start := time.Now(); m.shared > 1; {
+			if time.Since(start) > time.Millisecond {
 				return sqlite3.BUSY
 			}
 			m.lockMtx.Unlock()

vfs/readervfs/api.go

@@ -28,7 +28,7 @@ var (
 )
 
 // Create creates an immutable database from reader.
-// The caller should insure that data from reader does not mutate,
+// The caller should ensure that data from reader does not mutate,
 // otherwise SQLite might return incorrect query results and/or [sqlite3.CORRUPT] errors.
 func Create(name string, reader SizeReaderAt) {
 	readerMtx.Lock()

vfs/readervfs/reader.go

@@ -37,7 +37,7 @@ func (readerVFS) FullPathname(name string) (string, error) {
 
 type readerFile struct{ SizeReaderAt }
 
-func (r readerFile) Close() error {
+func (readerFile) Close() error {
 	return nil
 }
 

vfs/tests/mptest/mptest_test.go

@@ -36,9 +36,8 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	ctx := context.TODO()
-
-	rt = wazero.NewRuntime(ctx)
+	ctx := context.Background()
+	rt = wazero.NewRuntimeWithConfig(ctx, wazero.NewRuntimeConfig().WithDebugInfoEnabled(false))
 	wasi_snapshot_preview1.MustInstantiate(ctx, rt)
 
 	env := vfs.ExportHostFunctions(rt.NewHostModuleBuilder("env"))

vfs/tests/speedtest1/speedtest1_test.go

@@ -36,7 +36,7 @@ func TestMain(m *testing.M) {
 	initFlags()
 
 	ctx := context.Background()
-	rt = wazero.NewRuntime(ctx)
+	rt = wazero.NewRuntimeWithConfig(ctx, wazero.NewRuntimeConfig().WithDebugInfoEnabled(false))
 	wasi_snapshot_preview1.MustInstantiate(ctx, rt)
 	env := vfs.ExportHostFunctions(rt.NewHostModuleBuilder("env"))
 	_, err := env.Instantiate(ctx)