Skip to content

Commit d4d7ca7

Browse files
authored
fix(api): missing column in environment (#5204)
1 parent 57d8b5b commit d4d7ca7

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

engine/api/environment/environment.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package environment
33
import (
44
"database/sql"
55
"fmt"
6+
"time"
67

78
"github.com/go-gorp/gorp"
89
"github.com/lib/pq"
@@ -247,15 +248,16 @@ func InsertEnvironment(db gorp.SqlExecutor, env *sdk.Environment) error {
247248
}
248249

249250
// UpdateEnvironment Update an environment
250-
func UpdateEnvironment(db gorp.SqlExecutor, environment *sdk.Environment) error {
251+
func UpdateEnvironment(db gorp.SqlExecutor, env *sdk.Environment) error {
251252
rx := sdk.NamePatternRegex
252-
if !rx.MatchString(environment.Name) {
253-
return sdk.NewError(sdk.ErrInvalidName, fmt.Errorf("Invalid environment name. It should match %s", sdk.NamePattern))
253+
if !rx.MatchString(env.Name) {
254+
return sdk.NewErrorFrom(sdk.ErrInvalidName, "environment name should match pattern %s", sdk.NamePattern)
254255
}
255256

256-
query := `UPDATE environment SET name=$1, from_repository=$3 WHERE id=$2`
257-
if _, err := db.Exec(query, environment.Name, environment.ID, environment.FromRepository); err != nil {
258-
return err
257+
env.LastModified = time.Now()
258+
query := `UPDATE environment SET name=$1, from_repository=$2, last_modified=$3 WHERE id=$4`
259+
if _, err := db.Exec(query, env.Name, env.FromRepository, env.LastModified, env.ID); err != nil {
260+
return sdk.WithStack(err)
259261
}
260262
return nil
261263
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- +migrate Up
2+
3+
ALTER TABLE "environment" ADD COLUMN IF NOT EXISTS created TIMESTAMP WITH TIME ZONE DEFAULT LOCALTIMESTAMP;
4+
UPDATE "environment" SET created = last_modified WHERE created > last_modified;
5+
6+
-- +migrate Down
7+
8+
SELECT 1;

0 commit comments

Comments
 (0)