diff --git a/gormlite/go.mod b/gormlite/go.mod index 8004625..2669d75 100644 --- a/gormlite/go.mod +++ b/gormlite/go.mod @@ -3,7 +3,7 @@ module github.com/ncruces/go-sqlite3/gormlite go 1.19 require ( - github.com/ncruces/go-sqlite3 v0.8.2 + github.com/ncruces/go-sqlite3 v0.8.3 gorm.io/gorm v1.25.2 ) diff --git a/gormlite/go.sum b/gormlite/go.sum index 9d58f0f..7a458b5 100644 --- a/gormlite/go.sum +++ b/gormlite/go.sum @@ -2,14 +2,14 @@ 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.2 h1:U28YYK/Kl5aUsRljcnvShZZHBgWLzuR26zUntP4uNbQ= -github.com/ncruces/go-sqlite3 v0.8.2/go.mod h1:yGeN+m3ug1wD/+Kg2A3TnochT6H6Or6+2q8KHN//r9k= +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/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.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= 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/tests.patch b/gormlite/tests.patch index 91b76c9..a0eb132 100644 --- a/gormlite/tests.patch +++ b/gormlite/tests.patch @@ -7,19 +7,20 @@ diff --git a/tests/.gitignore b/tests/.gitignore diff --git a/tests/go.mod b/tests/go.mod --- a/tests/go.mod +++ b/tests/go.mod -@@ -7,12 +7,12 @@ require ( - github.com/jackc/pgx/v5 v5.3.1 // indirect +@@ -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.8 -- github.com/mattn/go-sqlite3 v1.14.16 // indirect -+ github.com/ncruces/go-sqlite3 v0.7.2 + 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.0 - gorm.io/driver/postgres v1.5.0 -- gorm.io/driver/sqlite v1.5.0 - gorm.io/driver/sqlserver v1.5.1 -- gorm.io/gorm v1.25.1 -+ gorm.io/gorm v1.25.2 + 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 => ../ @@ -40,3 +41,12 @@ diff --git a/tests/tests_test.go b/tests/tests_test.go "gorm.io/driver/sqlserver" "gorm.io/gorm" "gorm.io/gorm/logger" +@@ -89,7 +91,7 @@ func OpenTestConnection(cfg *gorm.Config) (db *gorm.DB, err error) { + db, err = gorm.Open(mysql.Open(dbDSN), cfg) + default: + log.Println("testing sqlite3...") +- db, err = gorm.Open(sqlite.Open(filepath.Join(os.TempDir(), "gorm.db?_foreign_keys=on")), cfg) ++ db, err = gorm.Open(sqlite.Open("file:"+filepath.Join(os.TempDir(), "gorm.db")+"?_pragma=busy_timeout(1000)&_pragma=foreign_keys(1)"), cfg) + } + + if err != nil {