From d08ab7be9c7e196f8fb4c815614a2520643a0dfe Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Mon, 31 Jul 2023 01:54:22 +0200 Subject: [PATCH] Fix typo in metadata (#26207) https://github.com/go-gitea/gitea/pull/26194#discussion_r1277094525 There is no need to backport because these names are just used internal. --- models/migrations/migrations.go | 2 ++ models/migrations/v1_21/v270.go | 26 ++++++++++++++++++++++++++ modules/packages/conda/metadata.go | 2 +- modules/packages/rpm/metadata.go | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 models/migrations/v1_21/v270.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 2b090a9132..b2140a1eb1 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -521,6 +521,8 @@ var migrations = []Migration{ NewMigration("Update Action Ref", v1_21.UpdateActionsRefIndex), // v269 -> v270 NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable), + // v270 -> v271 + NewMigration("Fix PackageProperty typo", v1_21.FixPackagePropertyTypo), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_21/v270.go b/models/migrations/v1_21/v270.go new file mode 100644 index 0000000000..b9cc84d3ac --- /dev/null +++ b/models/migrations/v1_21/v270.go @@ -0,0 +1,26 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package v1_21 //nolint + +import ( + "xorm.io/xorm" +) + +func FixPackagePropertyTypo(x *xorm.Engine) error { + sess := x.NewSession() + defer sess.Close() + + if err := sess.Begin(); err != nil { + return err + } + + if _, err := sess.Exec(`UPDATE package_property SET name = 'rpm.metadata' WHERE name = 'rpm.metdata'`); err != nil { + return err + } + if _, err := sess.Exec(`UPDATE package_property SET name = 'conda.metadata' WHERE name = 'conda.metdata'`); err != nil { + return err + } + + return sess.Commit() +} diff --git a/modules/packages/conda/metadata.go b/modules/packages/conda/metadata.go index 02dbf313ba..5eb72b8e38 100644 --- a/modules/packages/conda/metadata.go +++ b/modules/packages/conda/metadata.go @@ -27,7 +27,7 @@ const ( PropertyName = "conda.name" PropertyChannel = "conda.channel" PropertySubdir = "conda.subdir" - PropertyMetadata = "conda.metdata" + PropertyMetadata = "conda.metadata" ) // Package represents a Conda package diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index 607ea42ea0..f019a8dde1 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -15,7 +15,7 @@ import ( ) const ( - PropertyMetadata = "rpm.metdata" + PropertyMetadata = "rpm.metadata" SettingKeyPrivate = "rpm.key.private" SettingKeyPublic = "rpm.key.public"