From d151503d3428d61b5b3cb27ddbe849d3a6f288eb Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 17 Oct 2019 17:26:49 +0800
Subject: [PATCH] Upgrade xorm to v0.8.0 (#8536)
---
contrib/pr/checkout.go | 2 +-
go.mod | 4 +-
go.sum | 18 ++----
integrations/migration-test/migration_test.go | 2 +-
models/attachment.go | 2 +-
models/commit_status.go | 2 +-
models/gpg_key.go | 2 +-
models/issue.go | 2 +-
models/issue_assignees.go | 2 +-
models/issue_comment.go | 2 +-
models/issue_label.go | 2 +-
models/issue_milestone.go | 2 +-
models/issue_reaction.go | 2 +-
models/issue_tracked_time.go | 2 +-
models/issue_user.go | 2 +-
models/issue_xref.go | 2 +-
models/lfs_lock.go | 2 +-
models/login_source.go | 2 +-
models/migrate.go | 2 +-
models/migrations/migrations.go | 2 +-
models/migrations/v100.go | 2 +-
models/migrations/v13.go | 2 +-
models/migrations/v14.go | 2 +-
models/migrations/v15.go | 2 +-
models/migrations/v16.go | 2 +-
models/migrations/v17.go | 2 +-
models/migrations/v18.go | 2 +-
models/migrations/v19.go | 2 +-
models/migrations/v20.go | 2 +-
models/migrations/v21.go | 2 +-
models/migrations/v22.go | 2 +-
models/migrations/v23.go | 2 +-
models/migrations/v24.go | 2 +-
models/migrations/v25.go | 2 +-
models/migrations/v26.go | 2 +-
models/migrations/v27.go | 2 +-
models/migrations/v28.go | 2 +-
models/migrations/v29.go | 2 +-
models/migrations/v30.go | 2 +-
models/migrations/v31.go | 2 +-
models/migrations/v32.go | 2 +-
models/migrations/v33.go | 2 +-
models/migrations/v34.go | 2 +-
models/migrations/v35.go | 2 +-
models/migrations/v36.go | 2 +-
models/migrations/v37.go | 2 +-
models/migrations/v38.go | 2 +-
models/migrations/v39.go | 2 +-
models/migrations/v40.go | 2 +-
models/migrations/v41.go | 2 +-
models/migrations/v45.go | 2 +-
models/migrations/v46.go | 2 +-
models/migrations/v47.go | 2 +-
models/migrations/v48.go | 2 +-
models/migrations/v49.go | 2 +-
models/migrations/v50.go | 2 +-
models/migrations/v51.go | 2 +-
models/migrations/v52.go | 2 +-
models/migrations/v53.go | 2 +-
models/migrations/v54.go | 2 +-
models/migrations/v55.go | 2 +-
models/migrations/v56.go | 2 +-
models/migrations/v57.go | 2 +-
models/migrations/v58.go | 2 +-
models/migrations/v59.go | 2 +-
models/migrations/v60.go | 2 +-
models/migrations/v61.go | 2 +-
models/migrations/v62.go | 2 +-
models/migrations/v63.go | 2 +-
models/migrations/v64.go | 2 +-
models/migrations/v65.go | 2 +-
models/migrations/v66.go | 2 +-
models/migrations/v67.go | 2 +-
models/migrations/v68.go | 2 +-
models/migrations/v69.go | 2 +-
models/migrations/v70.go | 2 +-
models/migrations/v71.go | 2 +-
models/migrations/v72.go | 2 +-
models/migrations/v73.go | 2 +-
models/migrations/v74.go | 2 +-
models/migrations/v75.go | 2 +-
models/migrations/v76.go | 2 +-
models/migrations/v77.go | 2 +-
models/migrations/v78.go | 2 +-
models/migrations/v79.go | 2 +-
models/migrations/v80.go | 2 +-
models/migrations/v81.go | 2 +-
models/migrations/v82.go | 2 +-
models/migrations/v83.go | 2 +-
models/migrations/v84.go | 2 +-
models/migrations/v85.go | 2 +-
models/migrations/v86.go | 2 +-
models/migrations/v87.go | 2 +-
models/migrations/v88.go | 2 +-
models/migrations/v89.go | 2 +-
models/migrations/v90.go | 2 +-
models/migrations/v91.go | 2 +-
models/migrations/v92.go | 2 +-
models/migrations/v93.go | 2 +-
models/migrations/v94.go | 2 +-
models/migrations/v95.go | 2 +-
models/migrations/v96.go | 2 +-
models/migrations/v97.go | 2 +-
models/migrations/v98.go | 2 +-
models/migrations/v99.go | 2 +-
models/models.go | 2 +-
models/oauth2_application.go | 2 +-
models/org.go | 2 +-
models/org_team.go | 2 +-
models/pull.go | 2 +-
models/repo.go | 2 +-
models/repo_activity.go | 2 +-
models/repo_mirror.go | 2 +-
models/repo_unit.go | 2 +-
models/review.go | 2 +-
models/ssh_key.go | 2 +-
models/unit_tests.go | 2 +-
models/user.go | 2 +-
modules/auth/oauth2/oauth2.go | 2 +-
routers/install.go | 2 +-
vendor/github.com/go-xorm/xorm/go.mod | 20 -------
vendor/github.com/lafriks/xormstore/go.mod | 3 +-
vendor/github.com/lafriks/xormstore/go.sum | 25 +-------
.../github.com/lafriks/xormstore/xormstore.go | 2 +-
vendor/modules.txt | 6 +-
.../go-xorm => xorm.io}/xorm/.drone.yml | 60 ++-----------------
.../go-xorm => xorm.io}/xorm/.gitignore | 0
.../go-xorm => xorm.io}/xorm/CONTRIBUTING.md | 4 +-
.../go-xorm => xorm.io}/xorm/LICENSE | 0
.../go-xorm => xorm.io}/xorm/README.md | 14 ++---
.../go-xorm => xorm.io}/xorm/README_CN.md | 14 ++---
.../go-xorm => xorm.io}/xorm/cache_lru.go | 0
.../xorm/cache_memory_store.go | 0
.../go-xorm => xorm.io}/xorm/context_cache.go | 0
.../go-xorm => xorm.io}/xorm/convert.go | 0
.../go-xorm => xorm.io}/xorm/dialect_mssql.go | 0
.../go-xorm => xorm.io}/xorm/dialect_mysql.go | 0
.../xorm/dialect_oracle.go | 0
.../xorm/dialect_postgres.go | 0
.../xorm/dialect_sqlite3.go | 0
.../go-xorm => xorm.io}/xorm/doc.go | 2 +-
.../go-xorm => xorm.io}/xorm/engine.go | 0
.../go-xorm => xorm.io}/xorm/engine_cond.go | 0
.../xorm/engine_context.go | 0
.../go-xorm => xorm.io}/xorm/engine_group.go | 0
.../xorm/engine_group_policy.go | 0
.../go-xorm => xorm.io}/xorm/engine_table.go | 0
.../go-xorm => xorm.io}/xorm/error.go | 0
.../go-xorm => xorm.io}/xorm/gen_reserved.sh | 0
vendor/xorm.io/xorm/go.mod | 15 +++++
.../go-xorm => xorm.io}/xorm/go.sum | 37 +++---------
.../go-xorm => xorm.io}/xorm/helpers.go | 0
.../go-xorm => xorm.io}/xorm/helpler_time.go | 0
.../go-xorm => xorm.io}/xorm/interface.go | 0
.../go-xorm => xorm.io}/xorm/json.go | 0
.../go-xorm => xorm.io}/xorm/logger.go | 0
.../go-xorm => xorm.io}/xorm/pg_reserved.txt | 0
.../go-xorm => xorm.io}/xorm/processors.go | 0
.../go-xorm => xorm.io}/xorm/rows.go | 0
.../go-xorm => xorm.io}/xorm/session.go | 0
.../go-xorm => xorm.io}/xorm/session_cols.go | 0
.../go-xorm => xorm.io}/xorm/session_cond.go | 0
.../xorm/session_context.go | 0
.../xorm/session_convert.go | 10 ++++
.../xorm/session_delete.go | 0
.../go-xorm => xorm.io}/xorm/session_exist.go | 0
.../go-xorm => xorm.io}/xorm/session_find.go | 2 +-
.../go-xorm => xorm.io}/xorm/session_get.go | 0
.../xorm/session_insert.go | 0
.../xorm/session_iterate.go | 0
.../go-xorm => xorm.io}/xorm/session_query.go | 0
.../go-xorm => xorm.io}/xorm/session_raw.go | 0
.../xorm/session_schema.go | 0
.../go-xorm => xorm.io}/xorm/session_stats.go | 0
.../go-xorm => xorm.io}/xorm/session_tx.go | 0
.../xorm/session_update.go | 0
.../go-xorm => xorm.io}/xorm/statement.go | 8 ++-
.../xorm/statement_args.go | 0
.../xorm/statement_columnmap.go | 0
.../xorm/statement_exprparam.go | 0
.../xorm/statement_quote.go | 0
.../go-xorm => xorm.io}/xorm/syslogger.go | 0
.../go-xorm => xorm.io}/xorm/tag.go | 0
.../go-xorm => xorm.io}/xorm/test_mssql.sh | 0
.../xorm/test_mssql_cache.sh | 0
.../go-xorm => xorm.io}/xorm/test_mymysql.sh | 0
.../xorm/test_mymysql_cache.sh | 0
.../go-xorm => xorm.io}/xorm/test_mysql.sh | 0
.../xorm/test_mysql_cache.sh | 0
.../go-xorm => xorm.io}/xorm/test_postgres.sh | 0
.../xorm/test_postgres_cache.sh | 0
.../go-xorm => xorm.io}/xorm/test_sqlite.sh | 0
.../xorm/test_sqlite_cache.sh | 0
.../go-xorm => xorm.io}/xorm/test_tidb.sh | 0
.../go-xorm => xorm.io}/xorm/transaction.go | 0
.../go-xorm => xorm.io}/xorm/types.go | 0
.../go-xorm => xorm.io}/xorm/xorm.go | 2 +-
197 files changed, 191 insertions(+), 291 deletions(-)
delete mode 100644 vendor/github.com/go-xorm/xorm/go.mod
rename vendor/{github.com/go-xorm => xorm.io}/xorm/.drone.yml (94%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/.gitignore (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/CONTRIBUTING.md (89%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/LICENSE (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/README.md (95%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/README_CN.md (95%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/cache_lru.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/cache_memory_store.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/context_cache.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/convert.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/dialect_mssql.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/dialect_mysql.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/dialect_oracle.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/dialect_postgres.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/dialect_sqlite3.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/doc.go (99%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/engine.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/engine_cond.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/engine_context.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/engine_group.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/engine_group_policy.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/engine_table.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/error.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/gen_reserved.sh (100%)
create mode 100644 vendor/xorm.io/xorm/go.mod
rename vendor/{github.com/go-xorm => xorm.io}/xorm/go.sum (83%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/helpers.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/helpler_time.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/interface.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/json.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/logger.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/pg_reserved.txt (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/processors.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/rows.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_cols.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_cond.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_context.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_convert.go (98%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_delete.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_exist.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_find.go (99%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_get.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_insert.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_iterate.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_query.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_raw.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_schema.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_stats.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_tx.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/session_update.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/statement.go (99%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/statement_args.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/statement_columnmap.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/statement_exprparam.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/statement_quote.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/syslogger.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/tag.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_mssql.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_mssql_cache.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_mymysql.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_mymysql_cache.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_mysql.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_mysql_cache.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_postgres.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_postgres_cache.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_sqlite.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_sqlite_cache.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/test_tidb.sh (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/transaction.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/types.go (100%)
rename vendor/{github.com/go-xorm => xorm.io}/xorm/xorm.go (99%)
diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go
index 490d6760c8..9c06357295 100644
--- a/contrib/pr/checkout.go
+++ b/contrib/pr/checkout.go
@@ -27,13 +27,13 @@ import (
"code.gitea.io/gitea/routers"
"code.gitea.io/gitea/routers/routes"
- "github.com/go-xorm/xorm"
context2 "github.com/gorilla/context"
"github.com/unknwon/com"
"gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/config"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/testfixtures.v2"
+ "xorm.io/xorm"
)
var codeFilePath = "contrib/pr/checkout.go"
diff --git a/go.mod b/go.mod
index f3ee20acf4..e1bbd9ac89 100644
--- a/go.mod
+++ b/go.mod
@@ -44,7 +44,6 @@ require (
github.com/go-redis/redis v6.15.2+incompatible
github.com/go-sql-driver/mysql v1.4.1
github.com/go-swagger/go-swagger v0.20.1
- github.com/go-xorm/xorm v0.7.9
github.com/gobwas/glob v0.2.3
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
@@ -60,7 +59,7 @@ require (
github.com/klauspost/compress v0.0.0-20161025140425-8df558b6cb6f
github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc // indirect
github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect
- github.com/lafriks/xormstore v1.3.1
+ github.com/lafriks/xormstore v1.3.2
github.com/lib/pq v1.2.0
github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
github.com/lunny/levelqueue v0.0.0-20190217115915-02b525a4418e
@@ -118,4 +117,5 @@ require (
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
xorm.io/builder v0.3.6
xorm.io/core v0.7.2
+ xorm.io/xorm v0.8.0
)
diff --git a/go.sum b/go.sum
index c4317af9e2..2eeaa79810 100644
--- a/go.sum
+++ b/go.sum
@@ -89,8 +89,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f h1:REH9VH5ubNR0skLaOxK7TRJeRbE2dDfvaouQo8FsRcA=
github.com/chaseadamsio/goorgeous v0.0.0-20170901132237-098da33fde5f/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/corbym/gocrest v1.0.3 h1:gwEdq6RkTmq+09CTuM29DfKOCtZ7G7bcyxs3IZ6EVdU=
github.com/corbym/gocrest v1.0.3/go.mod h1:maVFL5lbdS2PgfOQgGRWDYTeunSWQeiEgoNdTABShCs=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -241,11 +239,8 @@ github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l
github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/go-xorm/xorm v0.7.9 h1:LZze6n1UvRmM5gpL9/U9Gucwqo6aWlFVlfcHKH10qA0=
-github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561 h1:deE7ritpK04PgtpyVOS2TYcQEld9qLCD5b5EbVNOuLA=
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:YgYOrVn3Nj9Tq0EvjmFbphRytDj7JNRoWSStJZWDJTQ=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -329,9 +324,6 @@ github.com/issue9/assert v1.3.2 h1:IaTa37u4m1fUuTH9K9ldO5IONKVDXjLiUO1T9vj0OF0=
github.com/issue9/assert v1.3.2/go.mod h1:9Ger+iz8X7r1zMYYwEhh++2wMGWcNN2oVI+zIQXxcio=
github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c h1:A/PDn117UYld5mlxe58EpMguqpkeTMw5/FCo0ZPS/Ko=
github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c/go.mod h1:5mTb/PQNkqmq2x3IxlQZE0aSnTksJg7fg/oWmJ5SKXQ=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
-github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d h1:ig/iUfDDg06RVW8OMby+GrmW6K2nPO3AFHlEIdvJSd4=
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
@@ -376,8 +368,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lafriks/xormstore v1.3.1 h1:KpzRUamSV3zmA85Kzw+PZOU9wgMbYsNzuDzLuBMbxpA=
-github.com/lafriks/xormstore v1.3.1/go.mod h1:qALRD4Vto2Ic7/A5eplMpu5V62mugtSqFysRwz8FETs=
+github.com/lafriks/xormstore v1.3.2 h1:hqi3F8s/B4rz8GuEZZDuHuOxRjeuOpEI/cC7vcnWwH4=
+github.com/lafriks/xormstore v1.3.2/go.mod h1:mVNIwIa25QIr8rfR7YlVjrqN/apswHkVdtLCyVYBzXw=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -503,8 +495,6 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b h1:4kg1wyftSKxLtnPAvcRWakIPpokB9w780/KwrNLnfPA=
github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
github.com/shurcooL/sanitized_anchor_name v0.0.0-20160918041101-1dba4b3954bc h1:3wIrJvFb3Pf6B/2mDBnN1G5IfUVev4X5apadQlWOczE=
@@ -811,7 +801,7 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY=
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
+xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM=
+xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go
index 3b47f0d7fc..8dc366dc3f 100644
--- a/integrations/migration-test/migration_test.go
+++ b/integrations/migration-test/migration_test.go
@@ -23,8 +23,8 @@ import (
"code.gitea.io/gitea/modules/charset"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/stretchr/testify/assert"
+ "xorm.io/xorm"
)
var currentEngine *xorm.Engine
diff --git a/models/attachment.go b/models/attachment.go
index a9032f1a86..f585bda8cb 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -14,8 +14,8 @@ import (
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
+ "xorm.io/xorm"
)
// Attachment represent a attachment of issue/comment/release.
diff --git a/models/commit_status.go b/models/commit_status.go
index 6f6cbc387f..4e0f8166f3 100644
--- a/models/commit_status.go
+++ b/models/commit_status.go
@@ -16,7 +16,7 @@ import (
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// CommitStatusState holds the state of a Status
diff --git a/models/gpg_key.go b/models/gpg_key.go
index 5cfe67435e..9b690475bd 100644
--- a/models/gpg_key.go
+++ b/models/gpg_key.go
@@ -20,10 +20,10 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/keybase/go-crypto/openpgp"
"github.com/keybase/go-crypto/openpgp/armor"
"github.com/keybase/go-crypto/openpgp/packet"
+ "xorm.io/xorm"
)
// GPGKey represents a GPG key.
diff --git a/models/issue.go b/models/issue.go
index c55e96168f..525152552c 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -19,9 +19,9 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/builder"
+ "xorm.io/xorm"
)
// Issue represents an issue or pull request of repository.
diff --git a/models/issue_assignees.go b/models/issue_assignees.go
index 1f504a9950..00ee498860 100644
--- a/models/issue_assignees.go
+++ b/models/issue_assignees.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// IssueAssignees saves all issue assignees
diff --git a/models/issue_comment.go b/models/issue_comment.go
index ffc3c006f5..d7128bdbac 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -18,9 +18,9 @@ import (
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/builder"
+ "xorm.io/xorm"
)
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
diff --git a/models/issue_label.go b/models/issue_label.go
index dab5ba2827..2b77c4bc35 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -13,8 +13,8 @@ import (
api "code.gitea.io/gitea/modules/structs"
- "github.com/go-xorm/xorm"
"xorm.io/builder"
+ "xorm.io/xorm"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
diff --git a/models/issue_milestone.go b/models/issue_milestone.go
index 1587e5e341..d32cb3c7d1 100644
--- a/models/issue_milestone.go
+++ b/models/issue_milestone.go
@@ -12,7 +12,7 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/builder"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// Milestone represents a milestone of repository.
diff --git a/models/issue_reaction.go b/models/issue_reaction.go
index ab644b4b3e..4596d32d06 100644
--- a/models/issue_reaction.go
+++ b/models/issue_reaction.go
@@ -11,8 +11,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"xorm.io/builder"
+ "xorm.io/xorm"
)
// Reaction represents a reactions on issues and comments.
diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go
index f9313b7653..f616836c85 100644
--- a/models/issue_tracked_time.go
+++ b/models/issue_tracked_time.go
@@ -10,8 +10,8 @@ import (
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
- "github.com/go-xorm/xorm"
"xorm.io/builder"
+ "xorm.io/xorm"
)
// TrackedTime represents a time that was spent for a specific issue.
diff --git a/models/issue_user.go b/models/issue_user.go
index d55a0dc2fb..6974a4d3cc 100644
--- a/models/issue_user.go
+++ b/models/issue_user.go
@@ -7,7 +7,7 @@ package models
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// IssueUser represents an issue-user relation.
diff --git a/models/issue_xref.go b/models/issue_xref.go
index 141a7e0e8c..4b01022bc5 100644
--- a/models/issue_xref.go
+++ b/models/issue_xref.go
@@ -8,8 +8,8 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/references"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
type crossReference struct {
diff --git a/models/lfs_lock.go b/models/lfs_lock.go
index 7ea1dc8660..ba1a452815 100644
--- a/models/lfs_lock.go
+++ b/models/lfs_lock.go
@@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// LFSLock represents a git lfs lock of repository.
diff --git a/models/login_source.go b/models/login_source.go
index 9381ed034f..ce03c4154f 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -21,9 +21,9 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/core"
+ "xorm.io/xorm"
)
// LoginType represents an login type.
diff --git a/models/migrate.go b/models/migrate.go
index 85be3a312c..53838fd65e 100644
--- a/models/migrate.go
+++ b/models/migrate.go
@@ -4,7 +4,7 @@
package models
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
// InsertMilestones creates milestones of repository.
func InsertMilestones(ms ...*Milestone) (err error) {
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 60a416c6e9..ef4f5b823f 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -21,10 +21,10 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
ini "gopkg.in/ini.v1"
+ "xorm.io/xorm"
)
const minDBVersion = 4
diff --git a/models/migrations/v100.go b/models/migrations/v100.go
index ac3b73e2ad..6a4e98af1f 100644
--- a/models/migrations/v100.go
+++ b/models/migrations/v100.go
@@ -9,7 +9,7 @@ import (
"strings"
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func updateMigrationServiceTypes(x *xorm.Engine) error {
diff --git a/models/migrations/v13.go b/models/migrations/v13.go
index 8b6b38cadf..3c35b66ab9 100644
--- a/models/migrations/v13.go
+++ b/models/migrations/v13.go
@@ -9,8 +9,8 @@ import (
"fmt"
"strings"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error {
diff --git a/models/migrations/v14.go b/models/migrations/v14.go
index 392f9fdba6..675c7459dd 100644
--- a/models/migrations/v14.go
+++ b/models/migrations/v14.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v15.go b/models/migrations/v15.go
index 3492a7190b..8872f1e946 100644
--- a/models/migrations/v15.go
+++ b/models/migrations/v15.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func createAllowCreateOrganizationColumn(x *xorm.Engine) error {
diff --git a/models/migrations/v16.go b/models/migrations/v16.go
index 5b8ec19d32..a849205b55 100644
--- a/models/migrations/v16.go
+++ b/models/migrations/v16.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/modules/markup"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// Enumerate all the unit types
diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index 2986badc97..2907b009db 100644
--- a/models/migrations/v17.go
+++ b/models/migrations/v17.go
@@ -8,7 +8,7 @@ import (
"fmt"
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func setProtectedBranchUpdatedWithCreated(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v18.go b/models/migrations/v18.go
index 3b3cd23ccf..66a1de3499 100644
--- a/models/migrations/v18.go
+++ b/models/migrations/v18.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// ExternalLoginUser makes the connecting between some existing user and additional external login sources
diff --git a/models/migrations/v19.go b/models/migrations/v19.go
index 7728f5add6..349d5850aa 100644
--- a/models/migrations/v19.go
+++ b/models/migrations/v19.go
@@ -13,8 +13,8 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v20.go b/models/migrations/v20.go
index ded99e09ce..0897eada74 100644
--- a/models/migrations/v20.go
+++ b/models/migrations/v20.go
@@ -16,7 +16,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func useNewNameAvatars(x *xorm.Engine) error {
diff --git a/models/migrations/v21.go b/models/migrations/v21.go
index 65cae2ac03..2750725760 100644
--- a/models/migrations/v21.go
+++ b/models/migrations/v21.go
@@ -11,8 +11,8 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
const (
diff --git a/models/migrations/v22.go b/models/migrations/v22.go
index faac74343b..eb37aec17f 100644
--- a/models/migrations/v22.go
+++ b/models/migrations/v22.go
@@ -13,8 +13,8 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v23.go b/models/migrations/v23.go
index 4aadf7ef0d..50dc6cd2c7 100644
--- a/models/migrations/v23.go
+++ b/models/migrations/v23.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// UserOpenID is the list of all OpenID identities of a user.
diff --git a/models/migrations/v24.go b/models/migrations/v24.go
index 076c710cc3..20791d7981 100644
--- a/models/migrations/v24.go
+++ b/models/migrations/v24.go
@@ -7,7 +7,7 @@ package migrations
import (
"time"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func changeGPGKeysColumns(x *xorm.Engine) error {
diff --git a/models/migrations/v25.go b/models/migrations/v25.go
index a8d746590a..da74e27c28 100644
--- a/models/migrations/v25.go
+++ b/models/migrations/v25.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addUserOpenIDShow(x *xorm.Engine) error {
diff --git a/models/migrations/v26.go b/models/migrations/v26.go
index 04277191f5..03ce2ef94b 100644
--- a/models/migrations/v26.go
+++ b/models/migrations/v26.go
@@ -16,8 +16,8 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v27.go b/models/migrations/v27.go
index 12e5fbcdbf..2bba0b7412 100644
--- a/models/migrations/v27.go
+++ b/models/migrations/v27.go
@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func convertIntervalToDuration(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v28.go b/models/migrations/v28.go
index a30cbf2afb..587e944ce6 100644
--- a/models/migrations/v28.go
+++ b/models/migrations/v28.go
@@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addRepoSize(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v29.go b/models/migrations/v29.go
index eadb0f3d87..ea70a2dd77 100644
--- a/models/migrations/v29.go
+++ b/models/migrations/v29.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// CommitStatus see models/status.go
diff --git a/models/migrations/v30.go b/models/migrations/v30.go
index 90047df8b6..5acdc5dac7 100644
--- a/models/migrations/v30.go
+++ b/models/migrations/v30.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addExternalLoginUserPK(x *xorm.Engine) error {
diff --git a/models/migrations/v31.go b/models/migrations/v31.go
index d6cea4c51b..b3aef0d665 100644
--- a/models/migrations/v31.go
+++ b/models/migrations/v31.go
@@ -8,8 +8,8 @@ import (
"fmt"
"time"
- "github.com/go-xorm/xorm"
"xorm.io/core"
+ "xorm.io/xorm"
)
func addLoginSourceSyncEnabledColumn(x *xorm.Engine) error {
diff --git a/models/migrations/v32.go b/models/migrations/v32.go
index d209fc34f6..f5c021cccf 100644
--- a/models/migrations/v32.go
+++ b/models/migrations/v32.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addUnitsToRepoTeam(x *xorm.Engine) error {
type Team struct {
diff --git a/models/migrations/v33.go b/models/migrations/v33.go
index 566951db96..625c5f4a53 100644
--- a/models/migrations/v33.go
+++ b/models/migrations/v33.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeActionColumns(x *xorm.Engine) error {
diff --git a/models/migrations/v34.go b/models/migrations/v34.go
index 258da41c04..26f0f565f7 100644
--- a/models/migrations/v34.go
+++ b/models/migrations/v34.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// Team see models/team.go
diff --git a/models/migrations/v35.go b/models/migrations/v35.go
index 7746663a40..d5059c7998 100644
--- a/models/migrations/v35.go
+++ b/models/migrations/v35.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addCommentIDToAction(x *xorm.Engine) error {
diff --git a/models/migrations/v36.go b/models/migrations/v36.go
index 06f76a26d6..729019925e 100644
--- a/models/migrations/v36.go
+++ b/models/migrations/v36.go
@@ -7,7 +7,7 @@ package migrations
import (
"code.gitea.io/gitea/models"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func regenerateGitHooks36(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v37.go b/models/migrations/v37.go
index 00653a780d..29e1c966f3 100644
--- a/models/migrations/v37.go
+++ b/models/migrations/v37.go
@@ -7,7 +7,7 @@ package migrations
import (
"html"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func unescapeUserFullNames(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v38.go b/models/migrations/v38.go
index 6060b70fe8..4e4e6628d3 100644
--- a/models/migrations/v38.go
+++ b/models/migrations/v38.go
@@ -9,8 +9,8 @@ import (
"code.gitea.io/gitea/models"
- "github.com/go-xorm/xorm"
"xorm.io/core"
+ "xorm.io/xorm"
)
func removeCommitsUnitType(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v39.go b/models/migrations/v39.go
index 1312cb3313..f3b32ea873 100644
--- a/models/migrations/v39.go
+++ b/models/migrations/v39.go
@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// ReleaseV39 describes the added field for Release
diff --git a/models/migrations/v40.go b/models/migrations/v40.go
index fffe158bf9..944377ce9b 100644
--- a/models/migrations/v40.go
+++ b/models/migrations/v40.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func fixProtectedBranchCanPushValue(x *xorm.Engine) error {
diff --git a/models/migrations/v41.go b/models/migrations/v41.go
index 4de3ad4e99..928bb1cd3f 100644
--- a/models/migrations/v41.go
+++ b/models/migrations/v41.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeDuplicateUnitTypes(x *xorm.Engine) error {
diff --git a/models/migrations/v45.go b/models/migrations/v45.go
index 99baff2c8b..eb346d7b3a 100644
--- a/models/migrations/v45.go
+++ b/models/migrations/v45.go
@@ -8,7 +8,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v46.go b/models/migrations/v46.go
index b6dd059c94..3d9c1329d8 100644
--- a/models/migrations/v46.go
+++ b/models/migrations/v46.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeOrganizationWatchRepo(x *xorm.Engine) error {
diff --git a/models/migrations/v47.go b/models/migrations/v47.go
index 7a217e6f01..81f92e2f5a 100644
--- a/models/migrations/v47.go
+++ b/models/migrations/v47.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addDeletedBranch(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v48.go b/models/migrations/v48.go
index 6cea66b5ac..6365feba89 100644
--- a/models/migrations/v48.go
+++ b/models/migrations/v48.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addRepoIndexerStatus(x *xorm.Engine) error {
diff --git a/models/migrations/v49.go b/models/migrations/v49.go
index 9e98de5cf2..4776125137 100644
--- a/models/migrations/v49.go
+++ b/models/migrations/v49.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addTimetracking(x *xorm.Engine) error {
diff --git a/models/migrations/v50.go b/models/migrations/v50.go
index 23b1bb526e..ddc378b432 100644
--- a/models/migrations/v50.go
+++ b/models/migrations/v50.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func migrateProtectedBranchStruct(x *xorm.Engine) error {
diff --git a/models/migrations/v51.go b/models/migrations/v51.go
index 85e903bbe7..8dadcf3349 100644
--- a/models/migrations/v51.go
+++ b/models/migrations/v51.go
@@ -8,7 +8,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addDefaultValueToUserProhibitLogin(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v52.go b/models/migrations/v52.go
index ab57d27de0..6547698d5b 100644
--- a/models/migrations/v52.go
+++ b/models/migrations/v52.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/models"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addLFSLock(x *xorm.Engine) error {
diff --git a/models/migrations/v53.go b/models/migrations/v53.go
index 7437cace25..a3068cdb00 100644
--- a/models/migrations/v53.go
+++ b/models/migrations/v53.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addReactions(x *xorm.Engine) error {
diff --git a/models/migrations/v54.go b/models/migrations/v54.go
index 5194624f69..af1e287419 100644
--- a/models/migrations/v54.go
+++ b/models/migrations/v54.go
@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addPullRequestOptions(x *xorm.Engine) error {
diff --git a/models/migrations/v55.go b/models/migrations/v55.go
index c20c51616e..a259e4f001 100644
--- a/models/migrations/v55.go
+++ b/models/migrations/v55.go
@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/models"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addModeToDeploKeys(x *xorm.Engine) error {
diff --git a/models/migrations/v56.go b/models/migrations/v56.go
index 79f8ce0ba5..4e1cafcca2 100644
--- a/models/migrations/v56.go
+++ b/models/migrations/v56.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeIsOwnerColumnFromOrgUser(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v57.go b/models/migrations/v57.go
index fe4bf6b0ee..6c0ab6f496 100644
--- a/models/migrations/v57.go
+++ b/models/migrations/v57.go
@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addIssueClosedTime(x *xorm.Engine) error {
diff --git a/models/migrations/v58.go b/models/migrations/v58.go
index 6ec24b08c8..0fa3bcfe2d 100644
--- a/models/migrations/v58.go
+++ b/models/migrations/v58.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addLabelsDescriptions(x *xorm.Engine) error {
diff --git a/models/migrations/v59.go b/models/migrations/v59.go
index 0a05495e76..d442f2569e 100644
--- a/models/migrations/v59.go
+++ b/models/migrations/v59.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addProtectedBranchMergeWhitelist(x *xorm.Engine) error {
diff --git a/models/migrations/v60.go b/models/migrations/v60.go
index 13ec38241a..6482e8e4a5 100644
--- a/models/migrations/v60.go
+++ b/models/migrations/v60.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addFsckEnabledToRepo(x *xorm.Engine) error {
diff --git a/models/migrations/v61.go b/models/migrations/v61.go
index 8d9b7e2d23..13affaf068 100644
--- a/models/migrations/v61.go
+++ b/models/migrations/v61.go
@@ -12,7 +12,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addSizeToAttachment(x *xorm.Engine) error {
diff --git a/models/migrations/v62.go b/models/migrations/v62.go
index 0c2966854b..e7f6cf6890 100644
--- a/models/migrations/v62.go
+++ b/models/migrations/v62.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addLastUsedPasscodeTOTP(x *xorm.Engine) error {
diff --git a/models/migrations/v63.go b/models/migrations/v63.go
index 6e7d940edc..62e8a299f6 100644
--- a/models/migrations/v63.go
+++ b/models/migrations/v63.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addLanguageSetting(x *xorm.Engine) error {
diff --git a/models/migrations/v64.go b/models/migrations/v64.go
index 00637ca046..623cceddbc 100644
--- a/models/migrations/v64.go
+++ b/models/migrations/v64.go
@@ -7,7 +7,7 @@ package migrations
import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addMultipleAssignees(x *xorm.Engine) error {
diff --git a/models/migrations/v65.go b/models/migrations/v65.go
index cc199d34e2..a87f8bc76c 100644
--- a/models/migrations/v65.go
+++ b/models/migrations/v65.go
@@ -3,7 +3,7 @@ package migrations
import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addU2FReg(x *xorm.Engine) error {
diff --git a/models/migrations/v66.go b/models/migrations/v66.go
index 43acfb4ea5..8e9df97fea 100644
--- a/models/migrations/v66.go
+++ b/models/migrations/v66.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addLoginSourceIDToPublicKeyTable(x *xorm.Engine) error {
diff --git a/models/migrations/v67.go b/models/migrations/v67.go
index 6cf3dd4d19..dee744e4d3 100644
--- a/models/migrations/v67.go
+++ b/models/migrations/v67.go
@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func removeStaleWatches(x *xorm.Engine) error {
diff --git a/models/migrations/v68.go b/models/migrations/v68.go
index d9e80ca80e..41c1f8f71d 100644
--- a/models/migrations/v68.go
+++ b/models/migrations/v68.go
@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/log"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
var topicPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-]*$`)
diff --git a/models/migrations/v69.go b/models/migrations/v69.go
index 9a6e42e712..a08747edff 100644
--- a/models/migrations/v69.go
+++ b/models/migrations/v69.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error {
diff --git a/models/migrations/v70.go b/models/migrations/v70.go
index 4ce1d4ee53..ef8dd85d6d 100644
--- a/models/migrations/v70.go
+++ b/models/migrations/v70.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addIssueDependencies(x *xorm.Engine) (err error) {
diff --git a/models/migrations/v71.go b/models/migrations/v71.go
index 004f0a3f51..0b6aff61b2 100644
--- a/models/migrations/v71.go
+++ b/models/migrations/v71.go
@@ -11,8 +11,8 @@ import (
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"golang.org/x/crypto/pbkdf2"
+ "xorm.io/xorm"
)
func addScratchHash(x *xorm.Engine) error {
diff --git a/models/migrations/v72.go b/models/migrations/v72.go
index c99b46afd2..612f58aab5 100644
--- a/models/migrations/v72.go
+++ b/models/migrations/v72.go
@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addReview(x *xorm.Engine) error {
diff --git a/models/migrations/v73.go b/models/migrations/v73.go
index 1265b4519e..0c06e2ba5c 100644
--- a/models/migrations/v73.go
+++ b/models/migrations/v73.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addMustChangePassword(x *xorm.Engine) error {
diff --git a/models/migrations/v74.go b/models/migrations/v74.go
index 66e958c7fa..f3b38418b7 100644
--- a/models/migrations/v74.go
+++ b/models/migrations/v74.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addApprovalWhitelistsToProtectedBranches(x *xorm.Engine) error {
type ProtectedBranch struct {
diff --git a/models/migrations/v75.go b/models/migrations/v75.go
index 58d1d34c98..208153b9b0 100644
--- a/models/migrations/v75.go
+++ b/models/migrations/v75.go
@@ -5,8 +5,8 @@
package migrations
import (
- "github.com/go-xorm/xorm"
"xorm.io/builder"
+ "xorm.io/xorm"
)
func clearNonusedData(x *xorm.Engine) error {
diff --git a/models/migrations/v76.go b/models/migrations/v76.go
index e1fd6f100b..545bff64c5 100644
--- a/models/migrations/v76.go
+++ b/models/migrations/v76.go
@@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
diff --git a/models/migrations/v77.go b/models/migrations/v77.go
index c564d4cf54..d62fbe7fb6 100644
--- a/models/migrations/v77.go
+++ b/models/migrations/v77.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addUserDefaultTheme(x *xorm.Engine) error {
diff --git a/models/migrations/v78.go b/models/migrations/v78.go
index 8082996b6f..e4274ca605 100644
--- a/models/migrations/v78.go
+++ b/models/migrations/v78.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func renameRepoIsBareToIsEmpty(x *xorm.Engine) error {
diff --git a/models/migrations/v79.go b/models/migrations/v79.go
index e246393957..3c3e77b8db 100644
--- a/models/migrations/v79.go
+++ b/models/migrations/v79.go
@@ -7,7 +7,7 @@ package migrations
import (
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addCanCloseIssuesViaCommitInAnyBranch(x *xorm.Engine) error {
diff --git a/models/migrations/v80.go b/models/migrations/v80.go
index d9040da601..3c1b3315cf 100644
--- a/models/migrations/v80.go
+++ b/models/migrations/v80.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addIsLockedToIssues(x *xorm.Engine) error {
// Issue see models/issue.go
diff --git a/models/migrations/v81.go b/models/migrations/v81.go
index 48e96508d9..271d479a64 100644
--- a/models/migrations/v81.go
+++ b/models/migrations/v81.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func changeU2FCounterType(x *xorm.Engine) error {
diff --git a/models/migrations/v82.go b/models/migrations/v82.go
index eb73f18343..3fb4b6c59e 100644
--- a/models/migrations/v82.go
+++ b/models/migrations/v82.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
diff --git a/models/migrations/v83.go b/models/migrations/v83.go
index cdc59292ab..6707dbdf81 100644
--- a/models/migrations/v83.go
+++ b/models/migrations/v83.go
@@ -7,7 +7,7 @@ package migrations
import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addUploaderIDForAttachment(x *xorm.Engine) error {
diff --git a/models/migrations/v84.go b/models/migrations/v84.go
index 4acb94b9ce..baab29fcd7 100644
--- a/models/migrations/v84.go
+++ b/models/migrations/v84.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addGPGKeyImport(x *xorm.Engine) error {
diff --git a/models/migrations/v85.go b/models/migrations/v85.go
index 6066d5ebe9..8c92f10b6e 100644
--- a/models/migrations/v85.go
+++ b/models/migrations/v85.go
@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func hashAppToken(x *xorm.Engine) error {
diff --git a/models/migrations/v86.go b/models/migrations/v86.go
index 492a08c71e..39c196ca6a 100644
--- a/models/migrations/v86.go
+++ b/models/migrations/v86.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addHTTPMethodToWebhook(x *xorm.Engine) error {
diff --git a/models/migrations/v87.go b/models/migrations/v87.go
index c8c7011a08..6b5af5be33 100644
--- a/models/migrations/v87.go
+++ b/models/migrations/v87.go
@@ -5,7 +5,7 @@
package migrations
import (
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addAvatarFieldToRepository(x *xorm.Engine) error {
diff --git a/models/migrations/v88.go b/models/migrations/v88.go
index fef425db0a..7318995a8c 100644
--- a/models/migrations/v88.go
+++ b/models/migrations/v88.go
@@ -8,7 +8,7 @@ import (
"crypto/sha1"
"fmt"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func hashContext(context string) string {
diff --git a/models/migrations/v89.go b/models/migrations/v89.go
index 83d0b1a8b9..a972b07b6d 100644
--- a/models/migrations/v89.go
+++ b/models/migrations/v89.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addOriginalMigrationInfo(x *xorm.Engine) error {
// Issue see models/issue.go
diff --git a/models/migrations/v90.go b/models/migrations/v90.go
index 09aceae2f9..72f7534dc8 100644
--- a/models/migrations/v90.go
+++ b/models/migrations/v90.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func changeSomeColumnsLengthOfRepo(x *xorm.Engine) error {
type Repository struct {
diff --git a/models/migrations/v91.go b/models/migrations/v91.go
index fea71b5d3b..3c49d9b96a 100644
--- a/models/migrations/v91.go
+++ b/models/migrations/v91.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addIndexOnRepositoryAndComment(x *xorm.Engine) error {
type Repository struct {
diff --git a/models/migrations/v92.go b/models/migrations/v92.go
index 090332f151..7ad5118176 100644
--- a/models/migrations/v92.go
+++ b/models/migrations/v92.go
@@ -5,8 +5,8 @@
package migrations
import (
- "github.com/go-xorm/xorm"
"xorm.io/builder"
+ "xorm.io/xorm"
)
func removeLingeringIndexStatus(x *xorm.Engine) error {
diff --git a/models/migrations/v93.go b/models/migrations/v93.go
index 0b0441cd5d..0cb9d6631f 100644
--- a/models/migrations/v93.go
+++ b/models/migrations/v93.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addEmailNotificationEnabledToUser(x *xorm.Engine) error {
// User see models/user.go
diff --git a/models/migrations/v94.go b/models/migrations/v94.go
index 5fe8c3fa12..8c1e33b647 100644
--- a/models/migrations/v94.go
+++ b/models/migrations/v94.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addStatusCheckColumnsForProtectedBranches(x *xorm.Engine) error {
type ProtectedBranch struct {
diff --git a/models/migrations/v95.go b/models/migrations/v95.go
index f6e4e41c48..94787f7501 100644
--- a/models/migrations/v95.go
+++ b/models/migrations/v95.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addCrossReferenceColumns(x *xorm.Engine) error {
// Comment see models/comment.go
diff --git a/models/migrations/v96.go b/models/migrations/v96.go
index 34f67534c2..b8eb201591 100644
--- a/models/migrations/v96.go
+++ b/models/migrations/v96.go
@@ -10,7 +10,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func deleteOrphanedAttachments(x *xorm.Engine) error {
diff --git a/models/migrations/v97.go b/models/migrations/v97.go
index fa542f2ccd..8e58886e2e 100644
--- a/models/migrations/v97.go
+++ b/models/migrations/v97.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addRepoAdminChangeTeamAccessColumnForUser(x *xorm.Engine) error {
type User struct {
diff --git a/models/migrations/v98.go b/models/migrations/v98.go
index 3b9fdbb1c5..617e1ec3d7 100644
--- a/models/migrations/v98.go
+++ b/models/migrations/v98.go
@@ -4,7 +4,7 @@
package migrations
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
func addOriginalAuthorOnMigratedReleases(x *xorm.Engine) error {
type Release struct {
diff --git a/models/migrations/v99.go b/models/migrations/v99.go
index 3eb287af6c..00b4509721 100644
--- a/models/migrations/v99.go
+++ b/models/migrations/v99.go
@@ -8,7 +8,7 @@ import (
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
func addTaskTable(x *xorm.Engine) error {
diff --git a/models/models.go b/models/models.go
index ea550cb839..0454ec6add 100644
--- a/models/models.go
+++ b/models/models.go
@@ -14,8 +14,8 @@ import (
// Needed for the MySQL driver
_ "github.com/go-sql-driver/mysql"
- "github.com/go-xorm/xorm"
"xorm.io/core"
+ "xorm.io/xorm"
// Needed for the Postgresql driver
_ "github.com/lib/pq"
diff --git a/models/oauth2_application.go b/models/oauth2_application.go
index 46355a0b3f..4df207ae16 100644
--- a/models/oauth2_application.go
+++ b/models/oauth2_application.go
@@ -16,10 +16,10 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"github.com/dgrijalva/jwt-go"
- "github.com/go-xorm/xorm"
uuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
"golang.org/x/crypto/bcrypt"
+ "xorm.io/xorm"
)
// OAuth2Application represents an OAuth2 client (RFC 6749)
diff --git a/models/org.go b/models/org.go
index ca3bce81a1..2cc302dac6 100644
--- a/models/org.go
+++ b/models/org.go
@@ -14,9 +14,9 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/builder"
+ "xorm.io/xorm"
)
// IsOwnedBy returns true if given user is in the owner team.
diff --git a/models/org_team.go b/models/org_team.go
index 10d53e3a86..a7a179f104 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -14,8 +14,8 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"xorm.io/builder"
+ "xorm.io/xorm"
)
const ownerTeamName = "Owners"
diff --git a/models/pull.go b/models/pull.go
index 962e433fb0..817ea09cca 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -25,8 +25,8 @@ import (
"code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
+ "xorm.io/xorm"
)
var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
diff --git a/models/repo.go b/models/repo.go
index 06708d24ab..3b5395ce16 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -37,11 +37,11 @@ import (
"code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/mcuadros/go-version"
"github.com/unknwon/com"
ini "gopkg.in/ini.v1"
"xorm.io/builder"
+ "xorm.io/xorm"
)
var repoWorkingPool = sync.NewExclusivePool()
diff --git a/models/repo_activity.go b/models/repo_activity.go
index 04612ae1ef..aa5c2217e0 100644
--- a/models/repo_activity.go
+++ b/models/repo_activity.go
@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/git"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// ActivityAuthorData represents statistical git commit count data
diff --git a/models/repo_mirror.go b/models/repo_mirror.go
index 4e91ea296a..aa0ec26808 100644
--- a/models/repo_mirror.go
+++ b/models/repo_mirror.go
@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
)
// Mirror represents mirror information of a repository.
diff --git a/models/repo_unit.go b/models/repo_unit.go
index 2fc1c40fa2..a6162a65e5 100644
--- a/models/repo_unit.go
+++ b/models/repo_unit.go
@@ -9,9 +9,9 @@ import (
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/core"
+ "xorm.io/xorm"
)
// RepoUnit describes all units of a repository
diff --git a/models/review.go b/models/review.go
index 454d16ee88..58660b2e3d 100644
--- a/models/review.go
+++ b/models/review.go
@@ -10,9 +10,9 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"xorm.io/builder"
"xorm.io/core"
+ "xorm.io/xorm"
)
// ReviewType defines the sort of feedback a review gives
diff --git a/models/ssh_key.go b/models/ssh_key.go
index d1132bf0c6..69699f24c1 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -28,10 +28,10 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"golang.org/x/crypto/ssh"
"xorm.io/builder"
+ "xorm.io/xorm"
)
const (
diff --git a/models/unit_tests.go b/models/unit_tests.go
index b53302dad4..eb4da37fe5 100644
--- a/models/unit_tests.go
+++ b/models/unit_tests.go
@@ -17,11 +17,11 @@ import (
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/stretchr/testify/assert"
"github.com/unknwon/com"
"gopkg.in/testfixtures.v2"
"xorm.io/core"
+ "xorm.io/xorm"
)
// NonexistentID an ID that will never exist
diff --git a/models/user.go b/models/user.go
index 030e23c383..c393d8dce5 100644
--- a/models/user.go
+++ b/models/user.go
@@ -33,7 +33,6 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"golang.org/x/crypto/argon2"
"golang.org/x/crypto/bcrypt"
@@ -41,6 +40,7 @@ import (
"golang.org/x/crypto/scrypt"
"golang.org/x/crypto/ssh"
"xorm.io/builder"
+ "xorm.io/xorm"
)
// UserType defines the user type
diff --git a/modules/auth/oauth2/oauth2.go b/modules/auth/oauth2/oauth2.go
index 242254e600..20dfb15e81 100644
--- a/modules/auth/oauth2/oauth2.go
+++ b/modules/auth/oauth2/oauth2.go
@@ -11,7 +11,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "github.com/go-xorm/xorm"
"github.com/lafriks/xormstore"
"github.com/markbates/goth"
"github.com/markbates/goth/gothic"
@@ -26,6 +25,7 @@ import (
"github.com/markbates/goth/providers/openidConnect"
"github.com/markbates/goth/providers/twitter"
"github.com/satori/go.uuid"
+ "xorm.io/xorm"
)
var (
diff --git a/routers/install.go b/routers/install.go
index 8f3d0d5ae6..53880d2c46 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -20,9 +20,9 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/user"
- "github.com/go-xorm/xorm"
"github.com/unknwon/com"
"gopkg.in/ini.v1"
+ "xorm.io/xorm"
)
const (
diff --git a/vendor/github.com/go-xorm/xorm/go.mod b/vendor/github.com/go-xorm/xorm/go.mod
deleted file mode 100644
index 1ab39831a8..0000000000
--- a/vendor/github.com/go-xorm/xorm/go.mod
+++ /dev/null
@@ -1,20 +0,0 @@
-module github.com/go-xorm/xorm
-
-go 1.11
-
-require (
- github.com/cockroachdb/apd v1.1.0 // indirect
- github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4
- github.com/go-sql-driver/mysql v1.4.1
- github.com/gofrs/uuid v3.2.0+incompatible // indirect
- github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
- github.com/jackc/pgx v3.6.0+incompatible
- github.com/lib/pq v1.0.0
- github.com/mattn/go-sqlite3 v1.10.0
- github.com/pkg/errors v0.8.1 // indirect
- github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
- github.com/stretchr/testify v1.4.0
- github.com/ziutek/mymysql v1.5.4
- xorm.io/builder v0.3.6
- xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb
-)
diff --git a/vendor/github.com/lafriks/xormstore/go.mod b/vendor/github.com/lafriks/xormstore/go.mod
index 1a68ce6513..8a7528ee78 100644
--- a/vendor/github.com/lafriks/xormstore/go.mod
+++ b/vendor/github.com/lafriks/xormstore/go.mod
@@ -5,15 +5,14 @@ go 1.11
require (
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538
github.com/go-sql-driver/mysql v1.4.1
- github.com/go-xorm/xorm v0.7.9
github.com/gorilla/context v1.1.1
github.com/gorilla/securecookie v1.1.1
github.com/gorilla/sessions v1.2.0
- github.com/kr/pretty v0.1.0 // indirect
github.com/lib/pq v1.2.0
github.com/mattn/go-sqlite3 v1.11.0
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad // indirect
google.golang.org/appengine v1.6.4 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
xorm.io/core v0.7.2
+ xorm.io/xorm v0.8.0
)
diff --git a/vendor/github.com/lafriks/xormstore/go.sum b/vendor/github.com/lafriks/xormstore/go.sum
index d3dc6aee62..9d0273a87c 100644
--- a/vendor/github.com/lafriks/xormstore/go.sum
+++ b/vendor/github.com/lafriks/xormstore/go.sum
@@ -1,6 +1,5 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
@@ -10,8 +9,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -29,9 +26,6 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/go-xorm/xorm v0.7.9 h1:LZze6n1UvRmM5gpL9/U9Gucwqo6aWlFVlfcHKH10qA0=
-github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
-github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -43,7 +37,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -57,9 +50,6 @@ github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYb
github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
-github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -70,11 +60,9 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q=
github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -86,8 +74,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -98,13 +84,10 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -113,7 +96,6 @@ github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wK
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ=
@@ -149,7 +131,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -160,7 +141,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.4 h1:WiKh4+/eMB2HaY7QhCfW/R7MuRAoA8QMCSJA6jP5/fo=
@@ -172,7 +152,6 @@ google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -186,7 +165,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
+xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM=
+xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY=
diff --git a/vendor/github.com/lafriks/xormstore/xormstore.go b/vendor/github.com/lafriks/xormstore/xormstore.go
index 85be25225e..e095508243 100644
--- a/vendor/github.com/lafriks/xormstore/xormstore.go
+++ b/vendor/github.com/lafriks/xormstore/xormstore.go
@@ -44,7 +44,7 @@ import (
"github.com/lafriks/xormstore/util"
- "github.com/go-xorm/xorm"
+ "xorm.io/xorm"
"github.com/gorilla/context"
"github.com/gorilla/securecookie"
"github.com/gorilla/sessions"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 91f7fce0d9..e24275236a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -191,8 +191,6 @@ github.com/go-swagger/go-swagger/cmd/swagger/commands/initcmd
github.com/go-swagger/go-swagger/codescan
github.com/go-swagger/go-swagger/generator
github.com/go-swagger/go-swagger/scan
-# github.com/go-xorm/xorm v0.7.9
-github.com/go-xorm/xorm
# github.com/gobwas/glob v0.2.3
github.com/gobwas/glob
github.com/gobwas/glob/compiler
@@ -274,7 +272,7 @@ github.com/klauspost/crc32
github.com/kr/pretty
# github.com/kr/text v0.1.0
github.com/kr/text
-# github.com/lafriks/xormstore v1.3.1
+# github.com/lafriks/xormstore v1.3.2
github.com/lafriks/xormstore
github.com/lafriks/xormstore/util
# github.com/lib/pq v1.2.0
@@ -609,3 +607,5 @@ strk.kbt.io/projects/go/libravatar
xorm.io/builder
# xorm.io/core v0.7.2
xorm.io/core
+# xorm.io/xorm v0.8.0
+xorm.io/xorm
diff --git a/vendor/github.com/go-xorm/xorm/.drone.yml b/vendor/xorm.io/xorm/.drone.yml
similarity index 94%
rename from vendor/github.com/go-xorm/xorm/.drone.yml
rename to vendor/xorm.io/xorm/.drone.yml
index b162d7c8a4..c373975df6 100644
--- a/vendor/github.com/go-xorm/xorm/.drone.yml
+++ b/vendor/xorm.io/xorm/.drone.yml
@@ -6,28 +6,11 @@ platform:
os: linux
arch: amd64
-clone:
- disable: true
-
workspace:
base: /go
- path: src/github.com/go-xorm/xorm
+ path: src/gitea.com/xorm/xorm
steps:
-- name: git
- pull: default
- image: plugins/git:next
- settings:
- depth: 50
- tags: true
-
-- name: init_postgres
- pull: default
- image: postgres:9.5
- commands:
- - "until psql -U postgres -d xorm_test -h pgsql \\\n -c \"SELECT 1;\" >/dev/null 2>&1; do sleep 1; done\n"
- - "psql -U postgres -d xorm_test -h pgsql \\\n -c \"create schema xorm;\"\n"
-
- name: build
pull: default
image: golang:1.10
@@ -186,28 +169,11 @@ platform:
os: linux
arch: amd64
-clone:
- disable: true
-
workspace:
base: /go
- path: src/github.com/go-xorm/xorm
+ path: src/gitea.com/xorm/xorm
steps:
-- name: git
- pull: default
- image: plugins/git:next
- settings:
- depth: 50
- tags: true
-
-- name: init_postgres
- pull: default
- image: postgres:9.5
- commands:
- - "until psql -U postgres -d xorm_test -h pgsql \\\n -c \"SELECT 1;\" >/dev/null 2>&1; do sleep 1; done\n"
- - "psql -U postgres -d xorm_test -h pgsql \\\n -c \"create schema xorm;\"\n"
-
- name: build
pull: default
image: golang:1.11
@@ -406,20 +372,11 @@ platform:
os: linux
arch: amd64
-clone:
- disable: true
-
workspace:
base: /go
- path: src/github.com/go-xorm/xorm
+ path: src/gitea.com/xorm/xorm
steps:
-- name: git
- pull: default
- image: plugins/git:next
- settings:
- depth: 50
- tags: true
- name: build
pull: default
@@ -618,20 +575,11 @@ platform:
os: linux
arch: amd64
-clone:
- disable: true
-
workspace:
base: /go
- path: src/github.com/go-xorm/xorm
+ path: src/gitea.com/xorm/xorm
steps:
-- name: git
- pull: default
- image: plugins/git:next
- settings:
- depth: 50
- tags: true
- name: build
pull: default
diff --git a/vendor/github.com/go-xorm/xorm/.gitignore b/vendor/xorm.io/xorm/.gitignore
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/.gitignore
rename to vendor/xorm.io/xorm/.gitignore
diff --git a/vendor/github.com/go-xorm/xorm/CONTRIBUTING.md b/vendor/xorm.io/xorm/CONTRIBUTING.md
similarity index 89%
rename from vendor/github.com/go-xorm/xorm/CONTRIBUTING.md
rename to vendor/xorm.io/xorm/CONTRIBUTING.md
index 37f4bc5fa8..442aa4d311 100644
--- a/vendor/github.com/go-xorm/xorm/CONTRIBUTING.md
+++ b/vendor/xorm.io/xorm/CONTRIBUTING.md
@@ -32,10 +32,10 @@ proposed functionality.
We appreciate any bug reports, but especially ones with self-contained
(doesn't depend on code outside of xorm), minimal (can't be simplified
further) test cases. It's especially helpful if you can submit a pull
-request with just the failing test case(you can find some example test file like [session_get_test.go](https://github.com/go-xorm/xorm/blob/master/session_get_test.go)).
+request with just the failing test case(you can find some example test file like [session_get_test.go](https://gitea.com/xorm/xorm/src/branch/master/session_get_test.go)).
If you implements a new database interface, you maybe need to add a test_<databasename>.sh file.
-For example, [mysql_test.go](https://github.com/go-xorm/xorm/blob/master/test_mysql.sh)
+For example, [mysql_test.go](https://gitea.com/xorm/xorm/src/branch/master/test_mysql.sh)
### New functionality
diff --git a/vendor/github.com/go-xorm/xorm/LICENSE b/vendor/xorm.io/xorm/LICENSE
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/LICENSE
rename to vendor/xorm.io/xorm/LICENSE
diff --git a/vendor/github.com/go-xorm/xorm/README.md b/vendor/xorm.io/xorm/README.md
similarity index 95%
rename from vendor/github.com/go-xorm/xorm/README.md
rename to vendor/xorm.io/xorm/README.md
index 62b40ba304..17a6ed37ff 100644
--- a/vendor/github.com/go-xorm/xorm/README.md
+++ b/vendor/xorm.io/xorm/README.md
@@ -1,11 +1,11 @@
# xorm
-[中文](https://github.com/go-xorm/xorm/blob/master/README_CN.md)
+[中文](https://gitea.com/xorm/xorm/src/branch/master/README_CN.md)
Xorm is a simple and powerful ORM for Go.
-[](https://circleci.com/gh/go-xorm/xorm) [](https://codecov.io/gh/go-xorm/xorm)
-[](https://goreportcard.com/report/github.com/go-xorm/xorm)
+[](https://drone.gitea.com/xorm/xorm) [](https://gocover.io/xorm.io/xorm)
+[](https://goreportcard.com/report/xorm.io/xorm)
[](https://discord.gg/HuR2CF3)
## Features
@@ -56,13 +56,13 @@ Drivers for Go's sql package which currently support database/sql includes:
## Installation
- go get github.com/go-xorm/xorm
+ go get xorm.io/xorm
## Documents
* [Manual](http://xorm.io/docs)
-* [GoDoc](http://godoc.org/github.com/go-xorm/xorm)
+* [GoDoc](http://godoc.org/xorm.io/xorm)
## Quick Start
@@ -337,7 +337,7 @@ if _, err := session.Exec("delete from userinfo where username = ?", user2.Usern
return nil
```
-* Transation should on one go routine. There is transaction and resue session memory
+* Transation should be on one go routine. There is transaction and resue session memory
```Go
session := engine.NewSession()
@@ -419,7 +419,7 @@ res, err := engine.Transaction(func(session *xorm.Session) (interface{}, error)
## Contributing
-If you want to pull request, please see [CONTRIBUTING](https://github.com/go-xorm/xorm/blob/master/CONTRIBUTING.md). And we also provide [Xorm on Google Groups](https://groups.google.com/forum/#!forum/xorm) to discuss.
+If you want to pull request, please see [CONTRIBUTING](https://gitea.com/xorm/xorm/src/branch/master/CONTRIBUTING.md). And we also provide [Xorm on Google Groups](https://groups.google.com/forum/#!forum/xorm) to discuss.
## Credits
diff --git a/vendor/github.com/go-xorm/xorm/README_CN.md b/vendor/xorm.io/xorm/README_CN.md
similarity index 95%
rename from vendor/github.com/go-xorm/xorm/README_CN.md
rename to vendor/xorm.io/xorm/README_CN.md
index 0cec6ed5c6..644bdc0b63 100644
--- a/vendor/github.com/go-xorm/xorm/README_CN.md
+++ b/vendor/xorm.io/xorm/README_CN.md
@@ -1,11 +1,11 @@
# xorm
-[English](https://github.com/go-xorm/xorm/blob/master/README.md)
+[English](https://gitea.com/xorm/xorm/src/branch/master/README.md)
xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作非常简便。
-[](https://circleci.com/gh/go-xorm/xorm) [](https://codecov.io/gh/go-xorm/xorm)
-[](https://goreportcard.com/report/github.com/go-xorm/xorm)
+[](https://drone.gitea.com/xorm/builder) [](https://gocover.io/xorm.io/xorm)
+[](https://goreportcard.com/report/xorm.io/xorm)
[](https://discord.gg/HuR2CF3)
## 特性
@@ -56,15 +56,13 @@ xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作
## 安装
- go get github.com/go-xorm/xorm
+ go get xorm.io/xorm
## 文档
* [操作指南](http://xorm.io/docs)
-* [GoWalker代码文档](http://gowalker.org/github.com/go-xorm/xorm)
-
-* [Godoc代码文档](http://godoc.org/github.com/go-xorm/xorm)
+* [Godoc代码文档](http://godoc.org/xorm.io/xorm)
# 快速开始
@@ -414,7 +412,7 @@ res, err := engine.Transaction(func(session *xorm.Session) (interface{}, error)
## 贡献
-如果您也想为Xorm贡献您的力量，请查看 [CONTRIBUTING](https://github.com/go-xorm/xorm/blob/master/CONTRIBUTING.md)。您也可以加入QQ群 技术帮助和讨论。
+如果您也想为Xorm贡献您的力量，请查看 [CONTRIBUTING](https://gitea.com/xorm/xorm/src/branch/master/CONTRIBUTING.md)。您也可以加入QQ群 技术帮助和讨论。
群一：280360085 （已满）
群二：795010183
diff --git a/vendor/github.com/go-xorm/xorm/cache_lru.go b/vendor/xorm.io/xorm/cache_lru.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/cache_lru.go
rename to vendor/xorm.io/xorm/cache_lru.go
diff --git a/vendor/github.com/go-xorm/xorm/cache_memory_store.go b/vendor/xorm.io/xorm/cache_memory_store.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/cache_memory_store.go
rename to vendor/xorm.io/xorm/cache_memory_store.go
diff --git a/vendor/github.com/go-xorm/xorm/context_cache.go b/vendor/xorm.io/xorm/context_cache.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/context_cache.go
rename to vendor/xorm.io/xorm/context_cache.go
diff --git a/vendor/github.com/go-xorm/xorm/convert.go b/vendor/xorm.io/xorm/convert.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/convert.go
rename to vendor/xorm.io/xorm/convert.go
diff --git a/vendor/github.com/go-xorm/xorm/dialect_mssql.go b/vendor/xorm.io/xorm/dialect_mssql.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/dialect_mssql.go
rename to vendor/xorm.io/xorm/dialect_mssql.go
diff --git a/vendor/github.com/go-xorm/xorm/dialect_mysql.go b/vendor/xorm.io/xorm/dialect_mysql.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/dialect_mysql.go
rename to vendor/xorm.io/xorm/dialect_mysql.go
diff --git a/vendor/github.com/go-xorm/xorm/dialect_oracle.go b/vendor/xorm.io/xorm/dialect_oracle.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/dialect_oracle.go
rename to vendor/xorm.io/xorm/dialect_oracle.go
diff --git a/vendor/github.com/go-xorm/xorm/dialect_postgres.go b/vendor/xorm.io/xorm/dialect_postgres.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/dialect_postgres.go
rename to vendor/xorm.io/xorm/dialect_postgres.go
diff --git a/vendor/github.com/go-xorm/xorm/dialect_sqlite3.go b/vendor/xorm.io/xorm/dialect_sqlite3.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/dialect_sqlite3.go
rename to vendor/xorm.io/xorm/dialect_sqlite3.go
diff --git a/vendor/github.com/go-xorm/xorm/doc.go b/vendor/xorm.io/xorm/doc.go
similarity index 99%
rename from vendor/github.com/go-xorm/xorm/doc.go
rename to vendor/xorm.io/xorm/doc.go
index a687e69476..9620bca19f 100644
--- a/vendor/github.com/go-xorm/xorm/doc.go
+++ b/vendor/xorm.io/xorm/doc.go
@@ -10,7 +10,7 @@ Installation
Make sure you have installed Go 1.6+ and then:
- go get github.com/go-xorm/xorm
+ go get xorm.io/xorm
Create Engine
diff --git a/vendor/github.com/go-xorm/xorm/engine.go b/vendor/xorm.io/xorm/engine.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/engine.go
rename to vendor/xorm.io/xorm/engine.go
diff --git a/vendor/github.com/go-xorm/xorm/engine_cond.go b/vendor/xorm.io/xorm/engine_cond.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/engine_cond.go
rename to vendor/xorm.io/xorm/engine_cond.go
diff --git a/vendor/github.com/go-xorm/xorm/engine_context.go b/vendor/xorm.io/xorm/engine_context.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/engine_context.go
rename to vendor/xorm.io/xorm/engine_context.go
diff --git a/vendor/github.com/go-xorm/xorm/engine_group.go b/vendor/xorm.io/xorm/engine_group.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/engine_group.go
rename to vendor/xorm.io/xorm/engine_group.go
diff --git a/vendor/github.com/go-xorm/xorm/engine_group_policy.go b/vendor/xorm.io/xorm/engine_group_policy.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/engine_group_policy.go
rename to vendor/xorm.io/xorm/engine_group_policy.go
diff --git a/vendor/github.com/go-xorm/xorm/engine_table.go b/vendor/xorm.io/xorm/engine_table.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/engine_table.go
rename to vendor/xorm.io/xorm/engine_table.go
diff --git a/vendor/github.com/go-xorm/xorm/error.go b/vendor/xorm.io/xorm/error.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/error.go
rename to vendor/xorm.io/xorm/error.go
diff --git a/vendor/github.com/go-xorm/xorm/gen_reserved.sh b/vendor/xorm.io/xorm/gen_reserved.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/gen_reserved.sh
rename to vendor/xorm.io/xorm/gen_reserved.sh
diff --git a/vendor/xorm.io/xorm/go.mod b/vendor/xorm.io/xorm/go.mod
new file mode 100644
index 0000000000..6d8b58f41a
--- /dev/null
+++ b/vendor/xorm.io/xorm/go.mod
@@ -0,0 +1,15 @@
+module xorm.io/xorm
+
+go 1.11
+
+require (
+ github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4
+ github.com/go-sql-driver/mysql v1.4.1
+ github.com/kr/pretty v0.1.0 // indirect
+ github.com/lib/pq v1.0.0
+ github.com/mattn/go-sqlite3 v1.10.0
+ github.com/stretchr/testify v1.4.0
+ github.com/ziutek/mymysql v1.5.4
+ xorm.io/builder v0.3.6
+ xorm.io/core v0.7.2
+)
diff --git a/vendor/github.com/go-xorm/xorm/go.sum b/vendor/xorm.io/xorm/go.sum
similarity index 83%
rename from vendor/github.com/go-xorm/xorm/go.sum
rename to vendor/xorm.io/xorm/go.sum
index cf637a8e06..2102cc5b7a 100644
--- a/vendor/github.com/go-xorm/xorm/go.sum
+++ b/vendor/xorm.io/xorm/go.sum
@@ -10,8 +10,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -28,15 +26,12 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
-github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
@@ -48,15 +43,16 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
-github.com/jackc/pgx v3.6.0+incompatible h1:bJeo4JdVbDAW8KB2m8XkFeo8CPipREoG37BwEoKGz+Q=
-github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
@@ -69,8 +65,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -81,8 +75,6 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -98,8 +90,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5 h1:58fnuSXlxZmFdJyvtTFVmVhcMLU6v5fEb/ok4wyqtNU=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -112,34 +102,25 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -164,9 +145,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8=
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU=
-xorm.io/core v0.7.0 h1:hKxuOKWZNeiFQsSuGet/KV8HZ788hclvAl+7azx3tkM=
-xorm.io/core v0.7.0/go.mod h1:TuOJjIVa7e3w/rN8tDcAvuLBMtwzdHPbyOzE6Gk1EUI=
-xorm.io/core v0.7.1 h1:I6x6Q6dYb67aDEoYFWr2t8UcKIYjJPyCHS+aXuj5V0Y=
-xorm.io/core v0.7.1/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo=
-xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
+xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw=
+xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM=
diff --git a/vendor/github.com/go-xorm/xorm/helpers.go b/vendor/xorm.io/xorm/helpers.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/helpers.go
rename to vendor/xorm.io/xorm/helpers.go
diff --git a/vendor/github.com/go-xorm/xorm/helpler_time.go b/vendor/xorm.io/xorm/helpler_time.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/helpler_time.go
rename to vendor/xorm.io/xorm/helpler_time.go
diff --git a/vendor/github.com/go-xorm/xorm/interface.go b/vendor/xorm.io/xorm/interface.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/interface.go
rename to vendor/xorm.io/xorm/interface.go
diff --git a/vendor/github.com/go-xorm/xorm/json.go b/vendor/xorm.io/xorm/json.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/json.go
rename to vendor/xorm.io/xorm/json.go
diff --git a/vendor/github.com/go-xorm/xorm/logger.go b/vendor/xorm.io/xorm/logger.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/logger.go
rename to vendor/xorm.io/xorm/logger.go
diff --git a/vendor/github.com/go-xorm/xorm/pg_reserved.txt b/vendor/xorm.io/xorm/pg_reserved.txt
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/pg_reserved.txt
rename to vendor/xorm.io/xorm/pg_reserved.txt
diff --git a/vendor/github.com/go-xorm/xorm/processors.go b/vendor/xorm.io/xorm/processors.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/processors.go
rename to vendor/xorm.io/xorm/processors.go
diff --git a/vendor/github.com/go-xorm/xorm/rows.go b/vendor/xorm.io/xorm/rows.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/rows.go
rename to vendor/xorm.io/xorm/rows.go
diff --git a/vendor/github.com/go-xorm/xorm/session.go b/vendor/xorm.io/xorm/session.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session.go
rename to vendor/xorm.io/xorm/session.go
diff --git a/vendor/github.com/go-xorm/xorm/session_cols.go b/vendor/xorm.io/xorm/session_cols.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_cols.go
rename to vendor/xorm.io/xorm/session_cols.go
diff --git a/vendor/github.com/go-xorm/xorm/session_cond.go b/vendor/xorm.io/xorm/session_cond.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_cond.go
rename to vendor/xorm.io/xorm/session_cond.go
diff --git a/vendor/github.com/go-xorm/xorm/session_context.go b/vendor/xorm.io/xorm/session_context.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_context.go
rename to vendor/xorm.io/xorm/session_context.go
diff --git a/vendor/github.com/go-xorm/xorm/session_convert.go b/vendor/xorm.io/xorm/session_convert.go
similarity index 98%
rename from vendor/github.com/go-xorm/xorm/session_convert.go
rename to vendor/xorm.io/xorm/session_convert.go
index caff5d2624..7f11354d5e 100644
--- a/vendor/github.com/go-xorm/xorm/session_convert.go
+++ b/vendor/xorm.io/xorm/session_convert.go
@@ -84,6 +84,10 @@ func (session *Session) byte2Time(col *core.Column, data []byte) (outTime time.T
return session.str2Time(col, string(data))
}
+var (
+ nullFloatType = reflect.TypeOf(sql.NullFloat64{})
+)
+
// convert a db data([]byte) to a field value
func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value, data []byte) error {
if structConvert, ok := fieldValue.Addr().Interface().(core.Conversion); ok {
@@ -583,6 +587,12 @@ func (session *Session) value2Interface(col *core.Column, fieldValue reflect.Val
t := fieldValue.Convert(core.TimeType).Interface().(time.Time)
tf := session.engine.formatColTime(col, t)
return tf, nil
+ } else if fieldType.ConvertibleTo(nullFloatType) {
+ t := fieldValue.Convert(nullFloatType).Interface().(sql.NullFloat64)
+ if !t.Valid {
+ return nil, nil
+ }
+ return t.Float64, nil
}
if !col.SQLType.IsJson() {
diff --git a/vendor/github.com/go-xorm/xorm/session_delete.go b/vendor/xorm.io/xorm/session_delete.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_delete.go
rename to vendor/xorm.io/xorm/session_delete.go
diff --git a/vendor/github.com/go-xorm/xorm/session_exist.go b/vendor/xorm.io/xorm/session_exist.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_exist.go
rename to vendor/xorm.io/xorm/session_exist.go
diff --git a/vendor/github.com/go-xorm/xorm/session_find.go b/vendor/xorm.io/xorm/session_find.go
similarity index 99%
rename from vendor/github.com/go-xorm/xorm/session_find.go
rename to vendor/xorm.io/xorm/session_find.go
index 6b8aa469db..e16ae54c94 100644
--- a/vendor/github.com/go-xorm/xorm/session_find.go
+++ b/vendor/xorm.io/xorm/session_find.go
@@ -110,7 +110,7 @@ func (session *Session) find(rowsSlicePtr interface{}, condiBean ...interface{})
}
} else {
// !oinume! Add "<col> IS NULL" to WHERE whatever condiBean is given.
- // See https://github.com/go-xorm/xorm/issues/179
+ // See https://gitea.com/xorm/xorm/issues/179
if col := table.DeletedColumn(); col != nil && !session.statement.unscoped { // tag "deleted" is enabled
var colName = session.engine.Quote(col.Name)
if addedTableName {
diff --git a/vendor/github.com/go-xorm/xorm/session_get.go b/vendor/xorm.io/xorm/session_get.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_get.go
rename to vendor/xorm.io/xorm/session_get.go
diff --git a/vendor/github.com/go-xorm/xorm/session_insert.go b/vendor/xorm.io/xorm/session_insert.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_insert.go
rename to vendor/xorm.io/xorm/session_insert.go
diff --git a/vendor/github.com/go-xorm/xorm/session_iterate.go b/vendor/xorm.io/xorm/session_iterate.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_iterate.go
rename to vendor/xorm.io/xorm/session_iterate.go
diff --git a/vendor/github.com/go-xorm/xorm/session_query.go b/vendor/xorm.io/xorm/session_query.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_query.go
rename to vendor/xorm.io/xorm/session_query.go
diff --git a/vendor/github.com/go-xorm/xorm/session_raw.go b/vendor/xorm.io/xorm/session_raw.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_raw.go
rename to vendor/xorm.io/xorm/session_raw.go
diff --git a/vendor/github.com/go-xorm/xorm/session_schema.go b/vendor/xorm.io/xorm/session_schema.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_schema.go
rename to vendor/xorm.io/xorm/session_schema.go
diff --git a/vendor/github.com/go-xorm/xorm/session_stats.go b/vendor/xorm.io/xorm/session_stats.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_stats.go
rename to vendor/xorm.io/xorm/session_stats.go
diff --git a/vendor/github.com/go-xorm/xorm/session_tx.go b/vendor/xorm.io/xorm/session_tx.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_tx.go
rename to vendor/xorm.io/xorm/session_tx.go
diff --git a/vendor/github.com/go-xorm/xorm/session_update.go b/vendor/xorm.io/xorm/session_update.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/session_update.go
rename to vendor/xorm.io/xorm/session_update.go
diff --git a/vendor/github.com/go-xorm/xorm/statement.go b/vendor/xorm.io/xorm/statement.go
similarity index 99%
rename from vendor/github.com/go-xorm/xorm/statement.go
rename to vendor/xorm.io/xorm/statement.go
index ae396c4bae..67e352136f 100644
--- a/vendor/github.com/go-xorm/xorm/statement.go
+++ b/vendor/xorm.io/xorm/statement.go
@@ -149,8 +149,12 @@ func (statement *Statement) And(query interface{}, args ...interface{}) *Stateme
cond := builder.Expr(query.(string), args...)
statement.cond = statement.cond.And(cond)
case map[string]interface{}:
- cond := builder.Eq(query.(map[string]interface{}))
- statement.cond = statement.cond.And(cond)
+ queryMap := query.(map[string]interface{})
+ newMap := make(map[string]interface{})
+ for k, v := range queryMap {
+ newMap[statement.Engine.Quote(k)] = v
+ }
+ statement.cond = statement.cond.And(builder.Eq(newMap))
case builder.Cond:
cond := query.(builder.Cond)
statement.cond = statement.cond.And(cond)
diff --git a/vendor/github.com/go-xorm/xorm/statement_args.go b/vendor/xorm.io/xorm/statement_args.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/statement_args.go
rename to vendor/xorm.io/xorm/statement_args.go
diff --git a/vendor/github.com/go-xorm/xorm/statement_columnmap.go b/vendor/xorm.io/xorm/statement_columnmap.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/statement_columnmap.go
rename to vendor/xorm.io/xorm/statement_columnmap.go
diff --git a/vendor/github.com/go-xorm/xorm/statement_exprparam.go b/vendor/xorm.io/xorm/statement_exprparam.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/statement_exprparam.go
rename to vendor/xorm.io/xorm/statement_exprparam.go
diff --git a/vendor/github.com/go-xorm/xorm/statement_quote.go b/vendor/xorm.io/xorm/statement_quote.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/statement_quote.go
rename to vendor/xorm.io/xorm/statement_quote.go
diff --git a/vendor/github.com/go-xorm/xorm/syslogger.go b/vendor/xorm.io/xorm/syslogger.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/syslogger.go
rename to vendor/xorm.io/xorm/syslogger.go
diff --git a/vendor/github.com/go-xorm/xorm/tag.go b/vendor/xorm.io/xorm/tag.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/tag.go
rename to vendor/xorm.io/xorm/tag.go
diff --git a/vendor/github.com/go-xorm/xorm/test_mssql.sh b/vendor/xorm.io/xorm/test_mssql.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_mssql.sh
rename to vendor/xorm.io/xorm/test_mssql.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_mssql_cache.sh b/vendor/xorm.io/xorm/test_mssql_cache.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_mssql_cache.sh
rename to vendor/xorm.io/xorm/test_mssql_cache.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_mymysql.sh b/vendor/xorm.io/xorm/test_mymysql.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_mymysql.sh
rename to vendor/xorm.io/xorm/test_mymysql.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_mymysql_cache.sh b/vendor/xorm.io/xorm/test_mymysql_cache.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_mymysql_cache.sh
rename to vendor/xorm.io/xorm/test_mymysql_cache.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_mysql.sh b/vendor/xorm.io/xorm/test_mysql.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_mysql.sh
rename to vendor/xorm.io/xorm/test_mysql.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_mysql_cache.sh b/vendor/xorm.io/xorm/test_mysql_cache.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_mysql_cache.sh
rename to vendor/xorm.io/xorm/test_mysql_cache.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_postgres.sh b/vendor/xorm.io/xorm/test_postgres.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_postgres.sh
rename to vendor/xorm.io/xorm/test_postgres.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_postgres_cache.sh b/vendor/xorm.io/xorm/test_postgres_cache.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_postgres_cache.sh
rename to vendor/xorm.io/xorm/test_postgres_cache.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_sqlite.sh b/vendor/xorm.io/xorm/test_sqlite.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_sqlite.sh
rename to vendor/xorm.io/xorm/test_sqlite.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_sqlite_cache.sh b/vendor/xorm.io/xorm/test_sqlite_cache.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_sqlite_cache.sh
rename to vendor/xorm.io/xorm/test_sqlite_cache.sh
diff --git a/vendor/github.com/go-xorm/xorm/test_tidb.sh b/vendor/xorm.io/xorm/test_tidb.sh
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/test_tidb.sh
rename to vendor/xorm.io/xorm/test_tidb.sh
diff --git a/vendor/github.com/go-xorm/xorm/transaction.go b/vendor/xorm.io/xorm/transaction.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/transaction.go
rename to vendor/xorm.io/xorm/transaction.go
diff --git a/vendor/github.com/go-xorm/xorm/types.go b/vendor/xorm.io/xorm/types.go
similarity index 100%
rename from vendor/github.com/go-xorm/xorm/types.go
rename to vendor/xorm.io/xorm/types.go
diff --git a/vendor/github.com/go-xorm/xorm/xorm.go b/vendor/xorm.io/xorm/xorm.go
similarity index 99%
rename from vendor/github.com/go-xorm/xorm/xorm.go
rename to vendor/xorm.io/xorm/xorm.go
index 26d00d264d..e1c83b56f2 100644
--- a/vendor/github.com/go-xorm/xorm/xorm.go
+++ b/vendor/xorm.io/xorm/xorm.go
@@ -20,7 +20,7 @@ import (
const (
// Version show the xorm's version
- Version string = "0.7.0.0504"
+ Version string = "0.8.0.1015"
)
func regDrvsNDialects() bool {