GORM v1.25.1.

embed/build.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../
-BINARYEN="$ROOT/tools/binaryen-version_113/bin"
+BINARYEN="$ROOT/tools/binaryen-version_114/bin"
 WASI_SDK="$ROOT/tools/wasi-sdk-20.0/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -flto -g0 -O2 \

embed/exports.txt

@@ -46,4 +46,27 @@ sqlite3_uri_parameter
 sqlite3_uri_key
 sqlite3_changes64
 sqlite3_last_insert_rowid
-sqlite3_get_autocommit
+sqlite3_get_autocommit
+sqlite3_anycollseq_init
+sqlite3_create_go_collation
+sqlite3_create_go_function
+sqlite3_create_go_window_function
+sqlite3_create_go_aggregate_function
+sqlite3_aggregate_context
+sqlite3_user_data
+sqlite3_value_type
+sqlite3_value_int64
+sqlite3_value_double
+sqlite3_value_text
+sqlite3_value_blob
+sqlite3_value_bytes
+sqlite3_result_null
+sqlite3_result_int64
+sqlite3_result_double
+sqlite3_result_text64
+sqlite3_result_blob64
+sqlite3_result_zeroblob64
+sqlite3_result_error
+sqlite3_result_error_code
+sqlite3_result_error_nomem
+sqlite3_result_error_toobig

func.go

@@ -0,0 +1,36 @@
+package sqlite3
+
+import (
+	"context"
+
+	"github.com/ncruces/go-sqlite3/internal/util"
+	"github.com/tetratelabs/wazero"
+	"github.com/tetratelabs/wazero/api"
+)
+
+func exportHostFunctions(env wazero.HostModuleBuilder) wazero.HostModuleBuilder {
+	util.ExportFuncVI(env, "go_destroy", cbDestroy)
+	util.ExportFuncIIIIII(env, "go_compare", cbCompare)
+	util.ExportFuncVIII(env, "go_func", cbFunc)
+	util.ExportFuncVIII(env, "go_step", cbStep)
+	util.ExportFuncVI(env, "go_final", cbFinal)
+	util.ExportFuncVI(env, "go_value", cbValue)
+	util.ExportFuncVIII(env, "go_inverse", cbInverse)
+	return env
+}
+
+func cbDestroy(ctx context.Context, mod api.Module, pArg uint32) {}
+
+func cbCompare(ctx context.Context, mod api.Module, pArg, nKey1, pKey1, nKey2, pKey2 uint32) uint32 {
+	return 0
+}
+
+func cbFunc(ctx context.Context, mod api.Module, pCtx, nArg, pArg uint32) {}
+
+func cbStep(ctx context.Context, mod api.Module, pCtx, nArg, pArg uint32) {}
+
+func cbFinal(ctx context.Context, mod api.Module, pCtx uint32) {}
+
+func cbValue(ctx context.Context, mod api.Module, pCtx uint32) {}
+
+func cbInverse(ctx context.Context, mod api.Module, pCtx, nArg, pArg uint32) {}

gormlite/error_translator.go

@@ -15,7 +15,7 @@ func (dialector Dialector) Translate(err error) error {
 		return gorm.ErrDuplicatedKey
 	case
 		errors.Is(err, sqlite3.CONSTRAINT_FOREIGNKEY):
-		return err // gorm.ErrForeignKeyViolated (gorm v1.25.2)
+		return gorm.ErrForeignKeyViolated
 	}
 	return err
 }

gormlite/go.mod

@@ -3,8 +3,8 @@ module github.com/ncruces/go-sqlite3/gormlite
 go 1.19
 
 require (
-	github.com/ncruces/go-sqlite3 v0.8.0
-	gorm.io/gorm v1.25.1
+	github.com/ncruces/go-sqlite3 v0.8.1
+	gorm.io/gorm v1.25.2
 )
 
 require (

gormlite/go.sum

@@ -2,13 +2,13 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 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.8.0 h1:9FsLTTPqHE/GyW42dGqe9KUXDt4QHRaKf67Lk7jvdIQ=
-github.com/ncruces/go-sqlite3 v0.8.0/go.mod h1:EhHe1qvG6Zc/8ffYMzre8n//rTRs1YNN5dUD1f1mEGc=
+github.com/ncruces/go-sqlite3 v0.8.1 h1:e1Y7uHu96xC4fWKsCVWprbTi8vAaQX9R+8kgkxOHWaY=
+github.com/ncruces/go-sqlite3 v0.8.1/go.mod h1:EhHe1qvG6Zc/8ffYMzre8n//rTRs1YNN5dUD1f1mEGc=
 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.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=
+gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
+gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=

gormlite/test.sh

@@ -3,8 +3,8 @@ set -euo pipefail
 
 cd -P -- "$(dirname -- "$0")"
 
-rm -rf gorm/ tests/
-git clone --filter=blob:none --branch=v1.25.1 https://github.com/go-gorm/gorm.git
+rm -rf gorm/ tests/ $TMPDIR/gorm.db
+git clone --filter=blob:none https://github.com/go-gorm/gorm.git
 mv gorm/tests tests
 rm -rf gorm/
 
@@ -14,5 +14,5 @@ cd tests
 go mod tidy && go work use . && go test
 
 cd ..
-rm -rf tests/
+rm -rf tests/ $TMPDIR/gorm.db
 go work use -r .

gormlite/tests.patch

@@ -1,51 +1,30 @@
 diff --git a/tests/.gitignore b/tests/.gitignore
-index 08cb523..72e8ffc 100644
 --- a/tests/.gitignore
 +++ b/tests/.gitignore
 @@ -1 +1 @@
 -go.sum
 +*
 diff --git a/tests/go.mod b/tests/go.mod
-index f47d175..84b80c2 100644
 --- a/tests/go.mod
 +++ b/tests/go.mod
-@@ -7,13 +7,13 @@ require (
+@@ -7,12 +7,12 @@ 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.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
-+	gorm.io/gorm v1.25.1
+ 	gorm.io/driver/sqlserver v1.5.1
+-	gorm.io/gorm v1.25.1
++	gorm.io/gorm v1.25.2
  )
  
 -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
-+++ b/tests/scanner_valuer_test.go
-@@ -170,10 +170,10 @@ func (data *EncryptedData) Scan(value interface{}) error {
- 			return errors.New("Too short")
- 		}
- 
--		*data = b[3:]
-+		*data = append((*data)[0:], b[3:]...)
- 		return nil
- 	} else if s, ok := value.(string); ok {
--		*data = []byte(s)[3:]
-+		*data = []byte(s[3:])
- 		return nil
- 	}
- 
 diff --git a/tests/tests_test.go b/tests/tests_test.go
-index 90eb847..cd9af43 100644
 --- a/tests/tests_test.go
 +++ b/tests/tests_test.go
 @@ -7,9 +7,11 @@ import (

internal/util/func.go

@@ -10,6 +10,32 @@ import (
 type i32 interface{ ~int32 | ~uint32 }
 type i64 interface{ ~int64 | ~uint64 }
 
+type funcVI[T0 i32] func(context.Context, api.Module, T0)
+
+func (fn funcVI[T0]) Call(ctx context.Context, mod api.Module, stack []uint64) {
+	fn(ctx, mod, T0(stack[0]))
+}
+
+func ExportFuncVI[T0 i32](mod wazero.HostModuleBuilder, name string, fn func(context.Context, api.Module, T0)) {
+	mod.NewFunctionBuilder().
+		WithGoModuleFunction(funcVI[T0](fn),
+			[]api.ValueType{api.ValueTypeI32}, nil).
+		Export(name)
+}
+
+type funcVIII[T0, T1, T2 i32] func(context.Context, api.Module, T0, T1, T2)
+
+func (fn funcVIII[T0, T1, T2]) Call(ctx context.Context, mod api.Module, stack []uint64) {
+	fn(ctx, mod, T0(stack[0]), T1(stack[1]), T2(stack[2]))
+}
+
+func ExportFuncVIII[T0, T1, T2 i32](mod wazero.HostModuleBuilder, name string, fn func(context.Context, api.Module, T0, T1, T2)) {
+	mod.NewFunctionBuilder().
+		WithGoModuleFunction(funcVIII[T0, T1, T2](fn),
+			[]api.ValueType{api.ValueTypeI32, api.ValueTypeI32, api.ValueTypeI32}, nil).
+		Export(name)
+}
+
 type funcII[TR, T0 i32] func(context.Context, api.Module, T0) TR
 
 func (fn funcII[TR, T0]) Call(ctx context.Context, mod api.Module, stack []uint64) {

module.go

@@ -53,7 +53,9 @@ func compileModule() {
 	ctx := context.Background()
 	sqlite3.runtime = wazero.NewRuntime(ctx)
 
-	env := vfs.ExportHostFunctions(sqlite3.runtime.NewHostModuleBuilder("env"))
+	env := sqlite3.runtime.NewHostModuleBuilder("env")
+	env = vfs.ExportHostFunctions(env)
+	env = exportHostFunctions(env)
 	_, sqlite3.err = env.Instantiate(ctx)
 	if sqlite3.err != nil {
 		return

sqlite3/.gitignore

@@ -1,3 +1,4 @@
+ext/
 sqlite3.c
 sqlite3.h
 sqlite3ext.h

sqlite3/download.sh

@@ -8,10 +8,9 @@ unzip -d . sqlite-amalgamation-*.zip
 mv sqlite-amalgamation-*/sqlite3* .
 rm -rf sqlite-amalgamation-*
 
-patch < vfs_find.patch
-patch < open_memory.patch
-patch < locking_mode.patch
+cat *.patch | patch
 
+mkdir -p ext/
 cd ext/
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/decimal.c"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/uint.c"
@@ -19,6 +18,7 @@ curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/uuid.c"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/base64.c"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/regexp.c"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/series.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/anycollseq.c"
 cd ~-
 
 cd ../vfs/tests/mptest/testdata/

sqlite3/ext/.gitignore

@@ -1 +0,0 @@
-*.c

sqlite3/func.c

@@ -0,0 +1,36 @@
+#include <string.h>
+
+#include "sqlite3.h"
+
+int go_compare(void *, int, const void *, int, const void *);
+void go_func(sqlite3_context *, int, sqlite3_value **);
+void go_step(sqlite3_context *, int, sqlite3_value **);
+void go_final(sqlite3_context *);
+void go_value(sqlite3_context *);
+void go_inverse(sqlite3_context *, int, sqlite3_value **);
+void go_destroy(void *);
+
+int sqlite3_create_go_collation(sqlite3 *db, const char *zName, void *pApp) {
+  return sqlite3_create_collation_v2(db, zName, SQLITE_UTF8, pApp, go_compare,
+                                     go_destroy);
+}
+
+int sqlite3_create_go_function(sqlite3 *db, const char *zName, int nArg,
+                               int flags, void *pApp) {
+  return sqlite3_create_function_v2(db, zName, nArg, SQLITE_UTF8 | flags, pApp,
+                                    go_func, NULL, NULL, go_destroy);
+}
+
+int sqlite3_create_go_window_function(sqlite3 *db, const char *zName, int nArg,
+                                      int flags, void *pApp) {
+  return sqlite3_create_window_function(db, zName, nArg, SQLITE_UTF8 | flags,
+                                        pApp, go_step, go_final, NULL, NULL,
+                                        go_destroy);
+}
+
+int sqlite3_create_go_aggregate_function(sqlite3 *db, const char *zName,
+                                         int nArg, int flags, void *pApp) {
+  return sqlite3_create_window_function(db, zName, nArg, SQLITE_UTF8 | flags,
+                                        pApp, go_step, go_final, go_value,
+                                        go_inverse, go_destroy);
+}

sqlite3/main.c

@@ -6,12 +6,14 @@
 // VFS
 #include "vfs.c"
 // Extensions
+#include "ext/anycollseq.c"
 #include "ext/base64.c"
 #include "ext/decimal.c"
 #include "ext/regexp.c"
 #include "ext/series.c"
 #include "ext/uint.c"
 #include "ext/uuid.c"
+#include "func.c"
 #include "time.c"
 
 __attribute__((constructor)) void init() {

vfs/tests/mptest/testdata/build.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../../../../
-BINARYEN="$ROOT/tools/binaryen-version_113/bin"
+BINARYEN="$ROOT/tools/binaryen-version_114/bin"
 WASI_SDK="$ROOT/tools/wasi-sdk-20.0/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -flto -g0 -O2 \

vfs/tests/speedtest1/testdata/build.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 cd -P -- "$(dirname -- "$0")"
 
 ROOT=../../../../
-BINARYEN="$ROOT/tools/binaryen-version_113/bin"
+BINARYEN="$ROOT/tools/binaryen-version_114/bin"
 WASI_SDK="$ROOT/tools/wasi-sdk-20.0/bin"
 
 "$WASI_SDK/clang" --target=wasm32-wasi -flto -g0 -O2 \