From e10ba5e5e0b5de2cedff2f180cc17245158aee25 Mon Sep 17 00:00:00 2001 From: delvh Date: Sun, 13 Aug 2023 21:17:21 +0200 Subject: Rename `Sync2` -> `Sync` (#26479) The xorm `Sync2` has already been deprecated in favor of `Sync`, so let's do the same inside the Gitea codebase. Command used to replace everything: ```sh for i in $(ag Sync2 --files-with-matches); do vim $i -c ':%sno/Sync2/Sync/g' -c ':wq'; done ``` --- docs/content/administration/command-line.en-us.md | 2 +- docs/content/administration/command-line.zh-cn.md | 2 +- docs/content/help/faq.en-us.md | 2 +- docs/content/help/faq.zh-cn.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/content') diff --git a/docs/content/administration/command-line.en-us.md b/docs/content/administration/command-line.en-us.md index 400d9dd877..91c6c1e626 100644 --- a/docs/content/administration/command-line.en-us.md +++ b/docs/content/administration/command-line.en-us.md @@ -403,7 +403,7 @@ Sometimes when there are migrations the old columns and default values may be le unchanged in the database schema. This may lead to warning such as: ``` -2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0 +2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0 ``` You can cause Gitea to recreate these tables and copy the old data into the new table diff --git a/docs/content/administration/command-line.zh-cn.md b/docs/content/administration/command-line.zh-cn.md index 4b8176322d..bd3d0c72bc 100644 --- a/docs/content/administration/command-line.zh-cn.md +++ b/docs/content/administration/command-line.zh-cn.md @@ -375,7 +375,7 @@ AuthorizedKeysCommand /path/to/gitea keys -e git -u %u -t %t -k %k 有时，在迁移时，旧的列和默认值可能会在数据库模式中保持不变。这可能会导致警告，如下所示: ``` -2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0 +2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0 ``` 您可以通过以下方式让 Gitea 重新创建这些表，并将旧数据复制到新表中，并适当设置默认值： diff --git a/docs/content/help/faq.en-us.md b/docs/content/help/faq.en-us.md index 3d03dd23ba..c83f8549e2 100644 --- a/docs/content/help/faq.en-us.md +++ b/docs/content/help/faq.en-us.md @@ -410,7 +410,7 @@ Sometimes when there are migrations the old columns and default values may be le unchanged in the database schema. This may lead to warning such as: ``` -2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0 +2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0 ``` These can safely be ignored, but you are able to stop these warnings by getting Gitea to recreate these tables using: diff --git a/docs/content/help/faq.zh-cn.md b/docs/content/help/faq.zh-cn.md index a11e074a24..36610db8e0 100644 --- a/docs/content/help/faq.zh-cn.md +++ b/docs/content/help/faq.zh-cn.md @@ -424,7 +424,7 @@ SystemD 上的标准输出默认会写入日志记录中。您可以尝试使用 这可能会导致警告，例如： ``` -2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync2() [W] Table user Column keep_activity_private db default is , struct default is 0 +2020/08/02 11:32:29 ...rm/session_schema.go:360:Sync() [W] Table user Column keep_activity_private db default is , struct default is 0 ``` 可以安全地忽略这些警告，但您可以通过让 Gitea 重新创建这些表来停止这些警告，使用以下命令： -- cgit v1.2.3