Migrate database backend to Xorm

Makefile

@@ -69,7 +69,7 @@ test-lib:
 test: test-lib test-agent test-server
 
 build-frontend:
-	(cd web/; yarn; yarn build)
+	(cd web/; yarn install --frozen-lockfile; yarn build)
 
 build-server: build-frontend
 	$(DOCKER_RUN) go build -o dist/woodpecker-server github.com/woodpecker-ci/woodpecker/cmd/server

agent/runner.go

@@ -60,8 +60,7 @@ func NewRunner(workEngine rpc.Peer, f rpc.Filter, h string, state *State, backen
 }
 
 func (r *Runner) Run(ctx context.Context) error {
-	log.Debug().
-		Msg("request next execution")
+	log.Debug().Msg("request next execution")
 
 	meta, _ := metadata.FromOutgoingContext(ctx)
 	ctxmeta := metadata.NewOutgoingContext(context.Background(), meta)

cli/exec/exec.go

@@ -188,8 +188,8 @@ func metadataFromContext(c *cli.Context, axis matrix.Axis) frontend.Metadata {
 			Private: c.Bool("repo-private"),
 		},
 		Curr: frontend.Build{
-			Number:   c.Int("build-number"),
-			Parent:   c.Int("parent-build-number"),
+			Number:   c.Int64("build-number"),
+			Parent:   c.Int64("parent-build-number"),
 			Created:  c.Int64("build-created"),
 			Started:  c.Int64("build-started"),
 			Finished: c.Int64("build-finished"),
@@ -211,7 +211,7 @@ func metadataFromContext(c *cli.Context, axis matrix.Axis) frontend.Metadata {
 			},
 		},
 		Prev: frontend.Build{
-			Number:   c.Int("prev-build-number"),
+			Number:   c.Int64("prev-build-number"),
 			Created:  c.Int64("prev-build-created"),
 			Started:  c.Int64("prev-build-started"),
 			Finished: c.Int64("prev-build-finished"),

cmd/server/server.go

@@ -108,6 +108,11 @@ func loop(c *cli.Context) error {
 	if err != nil {
 		log.Fatal().Err(err).Msg("")
 	}
+	defer func() {
+		if err := store_.Close(); err != nil {
+			log.Error().Err(err).Msg("could not close store")
+		}
+	}()
 
 	setupEvilGlobals(c, store_, remote_)
 

cmd/server/setup.go

@@ -17,7 +17,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -50,20 +49,41 @@ func setupStore(c *cli.Context) (store.Store, error) {
 	datasource := c.String("datasource")
 	driver := c.String("driver")
 
-	if strings.ToLower(driver) == "sqlite3" {
+	if driver == "sqlite3" {
+		if datastore.SupportedDriver("sqlite3") {
+			log.Debug().Msgf("server has sqlite3 support")
+		} else {
+			log.Debug().Msgf("server was build with no sqlite3 support!")
+		}
+	}
+
+	if !datastore.SupportedDriver(driver) {
+		log.Fatal().Msgf("database driver '%s' not supported", driver)
+	}
+
+	if driver == "sqlite3" {
 		if new, err := fallbackSqlite3File(datasource); err != nil {
 			log.Fatal().Err(err).Msg("fallback to old sqlite3 file failed")
 		} else {
 			datasource = new
 		}
 	}
 
-	opts := &datastore.Opts{
+	opts := &store.Opts{
 		Driver: driver,
 		Config: datasource,
 	}
-	log.Trace().Msgf("setup datastore: %#v", opts)
-	return datastore.New(opts)
+	log.Trace().Msgf("setup datastore: %#v", *opts)
+	store, err := datastore.NewEngine(opts)
+	if err != nil {
+		log.Fatal().Err(err).Msg("could not open datastore")
+	}
+
+	if err := store.Migrate(); err != nil {
+		log.Fatal().Err(err).Msg("could not migrate datastore")
+	}
+
+	return store, nil
 }
 
 // TODO: convert it to a check and fail hard only function in v0.16.0 to be able to remove it in v0.17.0

go.mod

@@ -24,31 +24,24 @@ require (
 	github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
 	github.com/golang-jwt/jwt/v4 v4.1.0
 	github.com/google/go-github/v39 v39.2.0
-	github.com/gorilla/mux v1.7.3 // indirect
 	github.com/gorilla/securecookie v1.1.1
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
-	github.com/hashicorp/go-version v1.3.0 // indirect
 	github.com/joho/godotenv v1.4.0
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kr/pretty v0.3.0
 	github.com/lib/pq v1.10.3
-	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.9
 	github.com/moby/moby v20.10.10+incompatible
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450
 	github.com/prometheus/client_golang v1.11.0
 	github.com/rs/zerolog v1.25.0
-	github.com/russross/meddler v1.0.1
 	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/tevino/abool v1.2.0
 	github.com/ugorji/go v1.2.6 // indirect
 	github.com/urfave/cli/v2 v2.3.0
 	github.com/woodpecker-ci/expr v0.0.0-20210628233344-164b8b3d0915
-	github.com/woodpecker-ci/togo v0.0.0-20211018210511-a36120f299b0
 	github.com/xanzy/go-gitlab v0.51.1
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0
@@ -62,5 +55,8 @@ require (
 	google.golang.org/genproto v0.0.0-20211027162914-98a5263abeca // indirect
 	google.golang.org/grpc v1.41.0
 	google.golang.org/protobuf v1.27.1
+	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	xorm.io/builder v0.3.9
+	xorm.io/xorm v1.2.5
 )