这是indexloc提供的服务，不要输入任何密码
Skip to content

Make catalog metadata migrations work on all schema versions (fix #2826) #2379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 11, 2019
Merged

Make catalog metadata migrations work on all schema versions (fix #2826) #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6712d0a
Separate DB and metadata migrations
ajeetdsouza Jun 14, 2019
51fc5a8
wip: debug logging for migration problems in CI
lexi-lambda Sep 26, 2019
1414115
Refactor Migrate.hs to generate list of migrations at compile-time
lexi-lambda Oct 7, 2019
ebb3eba
wip: replace ginger with shakespeare
lexi-lambda Oct 9, 2019
18ba16e
wip: remove SCC pragmas
lexi-lambda Oct 9, 2019
5650bcc
wip: stylish-haskell
lexi-lambda Oct 9, 2019
cd73efc
wip: switch to shakespeare from hackage
lexi-lambda Oct 10, 2019
ab9d9d3
wip: improve migration log messages
lexi-lambda Oct 10, 2019
7b81703
wip: stylish-haskell
lexi-lambda Oct 10, 2019
a14ffef
Merge branch 'master' into migrations
lexi-lambda Oct 10, 2019
fe8fce2
Merge remote-tracking branch 'upstream/master' into migrations
lexi-lambda Oct 11, 2019
b9bfb06
wip: fix off-by-one error
lexi-lambda Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions server/graphql-engine.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ flag profile

library
hs-source-dirs: src-lib
, src-exec
default-language: Haskell2010
build-depends: base
, pg-client
Expand Down Expand Up @@ -108,8 +107,8 @@ library

-- Templating
, mustache
, ginger
, file-embed
, shakespeare >= 2.0.22

--
, data-has
Expand Down Expand Up @@ -289,8 +288,6 @@ library
, Hasura.SQL.Types
, Hasura.SQL.Value
, Network.URI.Extended
, Ops
, Migrate

other-modules: Hasura.Server.Auth.JWT.Internal
, Hasura.Server.Auth.JWT.Logging
Expand Down Expand Up @@ -395,6 +392,7 @@ executable graphql-engine

other-modules: Ops
, Migrate
, Migrate.Version

if flag(developer)
ghc-prof-options: -rtsopts -fprof-auto -fno-prof-count-entries
Expand Down
15 changes: 8 additions & 7 deletions server/src-exec/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ import Hasura.Logging
import Hasura.Prelude
import Hasura.RQL.DDL.Metadata (fetchMetadata)
import Hasura.RQL.Types (SQLGenCtx (..), SchemaCache (..),
adminUserInfo, emptySchemaCache)
SystemDefined (..), adminUserInfo,
emptySchemaCache)
import Hasura.Server.App (HasuraApp (..),
SchemaCacheRef (..), getSCFromRef,
logInconsObjs, mkWaiApp)
import Hasura.Server.Auth
import Hasura.Server.CheckUpdates (checkForUpdates)
import Hasura.Server.Init
import Hasura.Server.Logging
import Hasura.Server.Query (peelRun)
import Hasura.Server.Query (RunCtx (..), peelRun)
import Hasura.Server.SchemaUpdate
import Hasura.Server.Telemetry
import Hasura.Server.Version (currentVersion)
Expand Down Expand Up @@ -234,8 +235,9 @@ main = do
runExceptT $ Q.runTx pool (Q.Serializable, Nothing) tx

runAsAdmin pool sqlGenCtx httpManager m = do
res <- runExceptT $ peelRun emptySchemaCache adminUserInfo
httpManager sqlGenCtx (PGExecCtx pool Q.Serializable) m
res <- runExceptT $ peelRun emptySchemaCache
(RunCtx adminUserInfo httpManager sqlGenCtx $ SystemDefined True)
(PGExecCtx pool Q.Serializable) m
return $ fmap fst res

procConnInfo rci =
Expand All @@ -254,9 +256,8 @@ main = do
either printErrJExit (logger . mkGenericStrLog LevelInfo "db_init") initRes

-- migrate catalog if necessary
migRes <- runAsAdmin pool sqlGenCtx httpMgr $
migrateCatalog currentTime
either printErrJExit (logger . mkGenericStrLog LevelInfo "db_migrate") migRes
migRes <- runAsAdmin pool sqlGenCtx httpMgr $ migrateCatalog currentTime
either printErrJExit logger migRes

-- retrieve database id
eDbId <- runTx pool getDbId
Expand Down
Loading