From f1e36e2581daab4ec1f76c24853f7f0039e3a44f Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Wed, 9 Aug 2023 16:30:32 +0100 Subject: [PATCH] Updated dependencies. --- gormlite/go.mod | 8 ++++---- gormlite/go.sum | 15 ++++++++------- gormlite/test.sh | 6 ++++++ gormlite/tests.patch | 21 --------------------- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/gormlite/go.mod b/gormlite/go.mod index 2669d75..f0174dd 100644 --- a/gormlite/go.mod +++ b/gormlite/go.mod @@ -1,9 +1,9 @@ module github.com/ncruces/go-sqlite3/gormlite -go 1.19 +go 1.21 require ( - github.com/ncruces/go-sqlite3 v0.8.3 + github.com/ncruces/go-sqlite3 v0.8.4 gorm.io/gorm v1.25.2 ) @@ -11,6 +11,6 @@ require ( 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.3.1 // indirect - golang.org/x/sys v0.10.0 // indirect + github.com/tetratelabs/wazero v1.4.0 // indirect + golang.org/x/sys v0.11.0 // indirect ) diff --git a/gormlite/go.sum b/gormlite/go.sum index 7a458b5..900029a 100644 --- a/gormlite/go.sum +++ b/gormlite/go.sum @@ -2,14 +2,15 @@ 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.3 h1:kYUAqDpZ0OT+snTH1yWyxq9QSJ22HoM3WKfFEL4N694= -github.com/ncruces/go-sqlite3 v0.8.3/go.mod h1:DUdzKfMlIFmSLAtNHdIgxbdax/5NsQx2RlIlVO7EWfU= +github.com/ncruces/go-sqlite3 v0.8.4 h1:nizhgJMMJJBrthESCwF30+oOvQkdtizgJ/v35Y0v+vg= +github.com/ncruces/go-sqlite3 v0.8.4/go.mod h1:XvDtjKk5MgwHX7L4I7BPzzKl36bTZ7+Hr6Kr2QeVkVw= 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.3.1 h1:rnb9FgOEQRLLR8tgoD1mfjNjMhFeWRUk+a4b4j/GpUM= -github.com/tetratelabs/wazero v1.3.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +github.com/tetratelabs/wazero v1.4.0 h1:9/MirYvmkJ/zSUOygKY/ia3t+e+RqIZXKbylIby1WYk= +github.com/tetratelabs/wazero v1.4.0/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho= gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= diff --git a/gormlite/test.sh b/gormlite/test.sh index 7dfd559..4fc43ce 100755 --- a/gormlite/test.sh +++ b/gormlite/test.sh @@ -11,6 +11,12 @@ rm -rf gorm/ patch -p1 -N < tests.patch cd tests +go mod edit \ + -require github.com/ncruces/go-sqlite3/gormlite@v0.0.0 \ + -replace github.com/ncruces/go-sqlite3/gormlite=../ \ + -replace github.com/ncruces/go-sqlite3=../../ \ + -droprequire gorm.io/driver/sqlite \ + -dropreplace gorm.io/gorm go mod tidy && go work use . && go test cd .. diff --git a/gormlite/tests.patch b/gormlite/tests.patch index a0eb132..01269e3 100644 --- a/gormlite/tests.patch +++ b/gormlite/tests.patch @@ -4,27 +4,6 @@ diff --git a/tests/.gitignore b/tests/.gitignore @@ -1 +1 @@ -go.sum +* -diff --git a/tests/go.mod b/tests/go.mod ---- a/tests/go.mod -+++ b/tests/go.mod -@@ -6,9 +6,10 @@ require ( - github.com/google/uuid v1.3.0 - github.com/jinzhu/now v1.1.5 - github.com/lib/pq v1.10.9 -+ github.com/ncruces/go-sqlite3 v0.8.3 -+ github.com/ncruces/go-sqlite3/gormlite v0.0.0 - gorm.io/driver/mysql v1.5.2-0.20230612053416-48b6526a21f0 - gorm.io/driver/postgres v1.5.3-0.20230607070428-18bc84b75196 -- gorm.io/driver/sqlite v1.5.2 - gorm.io/driver/sqlserver v1.5.2-0.20230613072041-6e2cde390b0a - gorm.io/gorm v1.25.2 - ) -@@ -27,4 +28,4 @@ require ( - golang.org/x/text v0.11.0 // indirect - ) - --replace gorm.io/gorm => ../ -+replace github.com/ncruces/go-sqlite3/gormlite => ../ diff --git a/tests/tests_test.go b/tests/tests_test.go --- a/tests/tests_test.go +++ b/tests/tests_test.go