Repository navigation
Check the dev database for pending migrations after compiling #5426
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.
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
Open
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,13 +10,12 @@ module Wasp.Generator.Setup | |
| ) | ||
| where | ||
|
|
||
| import Control.Monad (forM_, when) | ||
| import Control.Monad (forM_) | ||
| import Control.Monad.Except (ExceptT, runExceptT, throwError) | ||
| import Control.Monad.IO.Class (liftIO) | ||
| import Control.Monad.Writer.Strict (WriterT, runWriterT, tell) | ||
| import Control.Monad.Writer.Strict (WriterT, runWriterT) | ||
| import Data.Either (fromLeft) | ||
| import Data.List (nub) | ||
| import Data.Maybe (maybeToList) | ||
| import StrongPath (Abs, Dir, Path') | ||
| import System.Exit (ExitCode (..)) | ||
| import Wasp.AppSpec (AppSpec) | ||
|
|
@@ -30,12 +29,10 @@ import Wasp.Generator.NpmInstall (installNpmDependenciesWithInstallRecord) | |
| import qualified Wasp.Generator.SdkGenerator as SdkGenerator | ||
| import qualified Wasp.Job as J | ||
| import qualified Wasp.Message as Msg | ||
| import Wasp.Project.Db.Dev (devDatabaseEnvVars, findDevDatabaseUrl) | ||
|
|
||
| -- | Something a command needs from the generated app, after code generation. | ||
| data SetupGoal | ||
| = PrismaCliReady | ||
| | DbMigrationsChecked | ||
| | SdkReady | ||
| | UserCodeTypeChecked | ||
| deriving (Eq, Show, Enum, Bounded) | ||
|
|
@@ -48,7 +45,6 @@ allSetupGoals = [minBound .. maxBound] | |
| data SetupStep | ||
| = InstallNpmDeps | ||
| | FormatPrismaSchema | ||
| | WarnIfDbNeedsMigration | ||
| | GeneratePrismaClient | ||
| | BuildSdk | ||
| | TypeCheckUserCode | ||
|
|
@@ -65,7 +61,6 @@ allSetupSteps = [minBound .. maxBound] | |
| prerequisites :: SetupStep -> [SetupStep] | ||
| prerequisites InstallNpmDeps = [] | ||
| prerequisites FormatPrismaSchema = [InstallNpmDeps] | ||
| prerequisites WarnIfDbNeedsMigration = [InstallNpmDeps, FormatPrismaSchema] | ||
| prerequisites GeneratePrismaClient = [InstallNpmDeps, FormatPrismaSchema] | ||
| -- Runs `tsc`, and the SDK imports the Prisma client. | ||
| prerequisites BuildSdk = [InstallNpmDeps, GeneratePrismaClient] | ||
|
|
@@ -92,7 +87,6 @@ resolveSetupSteps = withPrerequisites . concatMap stepsForGoal | |
|
|
||
| stepsForGoal :: SetupGoal -> [SetupStep] | ||
| stepsForGoal PrismaCliReady = [InstallNpmDeps, FormatPrismaSchema] | ||
| stepsForGoal DbMigrationsChecked = [WarnIfDbNeedsMigration] | ||
| stepsForGoal SdkReady = [BuildSdk] | ||
| stepsForGoal UserCodeTypeChecked = [TypeCheckUserCode] | ||
|
|
||
|
|
@@ -107,9 +101,6 @@ runSetupStep :: SetupStep -> AppSpec -> Path' Abs (Dir GeneratedAppDir) -> Msg.S | |
| runSetupStep step spec generatedAppDir sendMessage = case step of | ||
| InstallNpmDeps -> installDependencies spec generatedAppDir sendMessage | ||
| FormatPrismaSchema -> formatPrismaSchema generatedAppDir | ||
| -- A production build is deployed elsewhere, so there is no local database | ||
| -- to check for pending migrations. | ||
| WarnIfDbNeedsMigration -> when (AS.isDevelopment spec) $ warnIfDbNeedsMigration spec generatedAppDir | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removes the migration check from the compile setup so compile can be "static". |
||
| GeneratePrismaClient -> generatePrismaClient spec generatedAppDir sendMessage | ||
| -- todo(filip): Should we consider building SDK as part of code generation? | ||
| -- todo(filip): Avoid building on each setup if we don't need to. | ||
|
|
@@ -123,13 +114,6 @@ installDependencies spec generatedAppDir sendMessage = do | |
| Left npmInstallError -> throwError [npmInstallError] | ||
| Right () -> liftIO $ sendMessage $ Msg.Success "Successfully completed npm install." | ||
|
|
||
| warnIfDbNeedsMigration :: AppSpec -> Path' Abs (Dir GeneratedAppDir) -> Setup () | ||
| warnIfDbNeedsMigration spec generatedAppDir = do | ||
| warning <- liftIO $ do | ||
| envVars <- devDatabaseEnvVars <$> findDevDatabaseUrl spec | ||
| DbGenerator.warnIfDbNeedsMigration envVars spec generatedAppDir | ||
| tell $ maybeToList warning | ||
|
|
||
| formatPrismaSchema :: Path' Abs (Dir GeneratedAppDir) -> Setup () | ||
| formatPrismaSchema generatedAppDir = do | ||
| result <- liftIO $ DbGenerator.formatPrismaSchema generatedAppDir | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might look a big heavy, but it's to preserve the current behaviour. We drop this change in a later PR because it mostly always fails (
wasp compilewon't auto start the database): #5427