Small fixes in the generator

waspc/src/Wasp/AppSpec/Job.hs

@@ -28,8 +28,6 @@ data Job = Job
   }
   deriving (Show, Eq, Data)
 
-instance IsDecl Job
-
 data JobExecutor = PgBoss
   deriving (Show, Eq, Data, Ord, Enum, Bounded)
 
@@ -39,8 +37,6 @@ data Perform = Perform
   }
   deriving (Show, Eq, Data)
 
-instance IsDecl Perform
-
 -- Allows jobs to run via some cron schedule.
 data Schedule = Schedule
   { cron :: String, -- 5 field cron expression, exe: "*/5 * * * *".
@@ -49,13 +45,10 @@ data Schedule = Schedule
   }
   deriving (Show, Eq, Data)
 
-instance IsDecl Schedule
-
 -- These are optional executor-specific JSON options we pass
 -- directly through to the executor when submitting jobs.
 data ExecutorOptions = ExecutorOptions
   { pgBoss :: Maybe JSON,
-    simple :: Maybe JSON
   }
   deriving (Show, Eq, Data)
 

waspc/src/Wasp/Generator/DbGenerator.hs

@@ -258,7 +258,7 @@ generatePrismaClient spec projectRootDir = do
     generatePrismaClientIfEntitiesExist :: IO (Maybe GeneratorError)
     generatePrismaClientIfEntitiesExist
       | entitiesExist =
-          either (Just . GenericGeneratorError) (const Nothing) <$> DbOps.generatePrismaClient projectRootDir
+        either (Just . GenericGeneratorError) (const Nothing) <$> DbOps.generatePrismaClient projectRootDir
       | otherwise = return Nothing
 
     entitiesExist = not . null $ getEntities spec

waspc/src/Wasp/Generator/Setup.hs

@@ -22,8 +22,8 @@ runSetup spec projectRootDir sendMessage = do
         setUpDatabaseResults@(_warnings, _errors@[]) -> do
           -- 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.
-          buildsSdkResults <- buildSdk projectRootDir sendMessage
-          return $ setUpDatabaseResults <> buildsSdkResults
+          buildSdkResults <- buildSdk projectRootDir sendMessage
+          return $ setUpDatabaseResults <> buildSdkResults
         setUpDatabaseResults -> return setUpDatabaseResults
     Left npmInstallError -> return ([], [npmInstallError])