From 7d52cb259b86353b1430477f132b4bc827026601 Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Wed, 17 Jan 2024 16:36:26 +0000 Subject: [PATCH] Updated dependencies. --- gormlite/go.mod | 6 +++--- gormlite/go.sum | 12 ++++++------ gormlite/sqlite.go | 48 ++++++---------------------------------------- gormlite/test.sh | 2 +- 4 files changed, 16 insertions(+), 52 deletions(-) diff --git a/gormlite/go.mod b/gormlite/go.mod index e720b40..eb77568 100644 --- a/gormlite/go.mod +++ b/gormlite/go.mod @@ -3,7 +3,7 @@ module github.com/ncruces/go-sqlite3/gormlite go 1.21 require ( - github.com/ncruces/go-sqlite3 v0.11.0 + github.com/ncruces/go-sqlite3 v0.12.0 gorm.io/gorm v1.25.5 ) @@ -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 v1.0.0 // indirect - github.com/tetratelabs/wazero v1.5.0 // indirect - golang.org/x/sys v0.15.0 // indirect + github.com/tetratelabs/wazero v1.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect ) diff --git a/gormlite/go.sum b/gormlite/go.sum index bb1d5e1..e426a37 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.11.0 h1:PDjs8Ve2Z0GWmHyKQHGUyG78grCXKhiHCUZQI8CqXO8= -github.com/ncruces/go-sqlite3 v0.11.0/go.mod h1:zaYJ6xP+EQiWJCa3nd3h28cD8DuSIcIqh+LrJMrBN9k= +github.com/ncruces/go-sqlite3 v0.12.0 h1:ZqCziV5XxdwiDOIOChRjhIwJqmMOctSrYwxwyzYx5zw= +github.com/ncruces/go-sqlite3 v0.12.0/go.mod h1:+8dWcBxb2Yar4EcCwav1a21MpKZbztwOYBLSRYt9bMY= github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M= github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g= -github.com/tetratelabs/wazero v1.5.0 h1:Yz3fZHivfDiZFUXnWMPUoiW7s8tC1sjdBtlJn08qYa0= -github.com/tetratelabs/wazero v1.5.0/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/tetratelabs/wazero v1.6.0 h1:z0H1iikCdP8t+q341xqepY4EWvHEw8Es7tlqiVzlP3g= +github.com/tetratelabs/wazero v1.6.0/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= diff --git a/gormlite/sqlite.go b/gormlite/sqlite.go index 453dbe7..03587de 100644 --- a/gormlite/sqlite.go +++ b/gormlite/sqlite.go @@ -2,7 +2,6 @@ package gormlite import ( - "context" "database/sql" "strconv" @@ -46,23 +45,12 @@ func (dialector _Dialector) Initialize(db *gorm.DB) (err error) { db.ConnPool = conn } - var version string - if err := db.ConnPool.QueryRowContext(context.Background(), "select sqlite_version()").Scan(&version); err != nil { - return err - } - // https://sqlite.org/releaselog/3_35_0.html - if compareVersion(version, "3.35.0") >= 0 { - callbacks.RegisterDefaultCallbacks(db, &callbacks.Config{ - CreateClauses: []string{"INSERT", "VALUES", "ON CONFLICT", "RETURNING"}, - UpdateClauses: []string{"UPDATE", "SET", "FROM", "WHERE", "RETURNING"}, - DeleteClauses: []string{"DELETE", "FROM", "WHERE", "RETURNING"}, - LastInsertIDReversed: true, - }) - } else { - callbacks.RegisterDefaultCallbacks(db, &callbacks.Config{ - LastInsertIDReversed: true, - }) - } + callbacks.RegisterDefaultCallbacks(db, &callbacks.Config{ + CreateClauses: []string{"INSERT", "VALUES", "ON CONFLICT", "RETURNING"}, + UpdateClauses: []string{"UPDATE", "SET", "FROM", "WHERE", "RETURNING"}, + DeleteClauses: []string{"DELETE", "FROM", "WHERE", "RETURNING"}, + LastInsertIDReversed: true, + }) for k, v := range dialector.ClauseBuilders() { db.ClauseBuilders[k] = v @@ -231,27 +219,3 @@ func (dialectopr _Dialector) RollbackTo(tx *gorm.DB, name string) error { tx.Exec("ROLLBACK TO SAVEPOINT " + name) return nil } - -func compareVersion(version1, version2 string) int { - n, m := len(version1), len(version2) - i, j := 0, 0 - for i < n || j < m { - x := 0 - for ; i < n && version1[i] != '.'; i++ { - x = x*10 + int(version1[i]-'0') - } - i++ - y := 0 - for ; j < m && version2[j] != '.'; j++ { - y = y*10 + int(version2[j]-'0') - } - j++ - if x > y { - return 1 - } - if x < y { - return -1 - } - } - return 0 -} diff --git a/gormlite/test.sh b/gormlite/test.sh index 02a6c18..d545f6d 100755 --- a/gormlite/test.sh +++ b/gormlite/test.sh @@ -6,7 +6,7 @@ cd -P -- "$(dirname -- "$0")" go test rm -rf gorm/ tests/ -git clone --filter=blob:none https://github.com/go-gorm/gorm.git +git clone --branch v1.25.5 --filter=blob:none https://github.com/go-gorm/gorm.git mv gorm/tests tests rm -rf gorm/