From 49fe5fbf3db56fc466b8997b182ee135d7a4365d Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 25 Sep 2017 09:11:25 -0500 Subject: Move sql store code into store/sqlstore package (#7502) * move sql store code into store/sqlstore package * move non-sql constants back up to store * fix api test * derp --- cmd/platform/jobserver.go | 3 ++- cmd/platform/version.go | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go index 24a229552..6d4e828bd 100644 --- a/cmd/platform/jobserver.go +++ b/cmd/platform/jobserver.go @@ -10,6 +10,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/jobs" "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/spf13/cobra" ) @@ -36,7 +37,7 @@ func jobserverCmdF(cmd *cobra.Command, args []string) { } defer l4g.Close() - jobs.Srv.Store = store.NewLayeredStore(a.Metrics, a.Cluster) + jobs.Srv.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(a.Metrics), a.Metrics, a.Cluster) defer jobs.Srv.Store.Close() jobs.Srv.LoadLicense() diff --git a/cmd/platform/version.go b/cmd/platform/version.go index c34254c45..9616be1d7 100644 --- a/cmd/platform/version.go +++ b/cmd/platform/version.go @@ -6,6 +6,7 @@ import ( "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/spf13/cobra" ) @@ -32,5 +33,7 @@ func printVersion(a *app.App) { CommandPrintln("Build Date: " + model.BuildDate) CommandPrintln("Build Hash: " + model.BuildHash) CommandPrintln("Build Enterprise Ready: " + model.BuildEnterpriseReady) - CommandPrintln("DB Version: " + a.Srv.Store.(*store.LayeredStore).DatabaseLayer.GetCurrentSchemaVersion()) + if supplier, ok := a.Srv.Store.(*store.LayeredStore).DatabaseLayer.(*sqlstore.SqlSupplier); ok { + CommandPrintln("DB Version: " + supplier.GetCurrentSchemaVersion()) + } } -- cgit v1.2.3-1-g7c22