From 36870d17972b130c7d5ec4b299d6c77f4e5d3650 Mon Sep 17 00:00:00 2001 From: qwerty287 <80460567+qwerty287@users.noreply.github.com> Date: Fri, 2 Jun 2023 14:39:29 +0200 Subject: [PATCH] Drop `step_machine` column (#1806) Bug 3 in #1712 Was changed in f13ffc2c8f668b945c0c72451568625c599aaca3 --- .../migration/017_remove_machine_col.go | 35 +++++++++++++++++++ server/store/datastore/migration/migration.go | 1 + 2 files changed, 36 insertions(+) create mode 100644 server/store/datastore/migration/017_remove_machine_col.go diff --git a/server/store/datastore/migration/017_remove_machine_col.go b/server/store/datastore/migration/017_remove_machine_col.go new file mode 100644 index 000000000..cf5285072 --- /dev/null +++ b/server/store/datastore/migration/017_remove_machine_col.go @@ -0,0 +1,35 @@ +// Copyright 2023 Woodpecker Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package migration + +import ( + "xorm.io/xorm" +) + +type oldStep017 struct { + ID int64 `xorm:"pk autoincr 'step_id'"` + Machine string `xorm:"step_machine"` +} + +var removeMachineCol = task{ + name: "remove-machine-col", + fn: func(sess *xorm.Session) error { + // make sure step_machine column exists + if err := sess.Sync(new(oldStep017)); err != nil { + return err + } + return dropTableColumns(sess, "steps", "step_machine") + }, +} diff --git a/server/store/datastore/migration/migration.go b/server/store/datastore/migration/migration.go index 956abda08..6d51179b0 100644 --- a/server/store/datastore/migration/migration.go +++ b/server/store/datastore/migration/migration.go @@ -45,6 +45,7 @@ var migrationTasks = []*task{ &removeActiveFromUsers, &removeInactiveRepos, &dropFiles, + &removeMachineCol, } var allBeans = []interface{}{