Using Prisma file alongside Wasp

waspc/cli/src/Wasp/Cli/Command/Info.hs

@@ -14,7 +14,6 @@ import Wasp.Cli.Command.Common (readWaspCompileInfo)
 import Wasp.Cli.Command.Compile (analyze)
 import Wasp.Cli.Command.Message (cliSendMessageC)
 import Wasp.Cli.Command.Require (InWaspProject (InWaspProject), require)
-import Wasp.Cli.Command.Start.Db (getDbSystem)
 import Wasp.Cli.Terminal (title)
 import qualified Wasp.Message as Msg
 import Wasp.Project (WaspProjectDir)
@@ -29,15 +28,15 @@ info = do
   projectSize <- liftIO $ readDirectorySizeMB waspDir
 
   appSpec <- analyze waspDir
-  let (appName, app) = ASV.getApp appSpec
+  let (appName, _) = ASV.getApp appSpec
 
   cliSendMessageC $
     Msg.Info $
       unlines
         [ "",
           title "Project information",
           printInfo "Name" appName,
-          printInfo "Database system" $ show $ getDbSystem app,
+          printInfo "Database system" $ show $ ASV.getValidDbSystem appSpec,
           printInfo "Last compile" compileInfo,
           printInfo "Project dir size" projectSize
         ]

waspc/cli/src/Wasp/Cli/Command/Start/Db.hs

@@ -1,20 +1,18 @@
 module Wasp.Cli.Command.Start.Db
   ( start,
-    getDbSystem,
     waspDevDbDockerVolumePrefix,
   )
 where
 
 import Control.Monad (when)
 import qualified Control.Monad.Except as E
 import Control.Monad.IO.Class (liftIO)
-import Data.Maybe (fromMaybe, isJust)
+import Data.Maybe (isJust)
 import StrongPath (Abs, Dir, File', Path', Rel, fromRelFile)
 import System.Environment (lookupEnv)
 import System.Process (callCommand)
 import Text.Printf (printf)
 import qualified Wasp.AppSpec as AS
-import qualified Wasp.AppSpec.App as AS.App
 import qualified Wasp.AppSpec.App.Db as AS.App.Db
 import qualified Wasp.AppSpec.Valid as ASV
 import Wasp.Cli.Command (Command, CommandError (CommandError))
@@ -42,8 +40,8 @@ start = do
 
   throwIfCustomDbAlreadyInUse appSpec
 
-  let (appName, app) = ASV.getApp appSpec
-  case getDbSystem app of
+  let (appName, _) = ASV.getApp appSpec
+  case ASV.getValidDbSystem appSpec of
     AS.App.Db.SQLite -> noteSQLiteDoesntNeedStart
     AS.App.Db.PostgreSQL -> startPostgreDevDb waspProjectDir appName
   where
@@ -85,10 +83,6 @@ throwIfCustomDbAlreadyInUse spec = do
     throwCustomDbAlreadyInUseError msg =
       E.throwError $ CommandError "You are using custom database already" msg
 
-getDbSystem :: AS.App.App -> AS.App.Db.DbSystem
-getDbSystem app =
-  fromMaybe AS.App.Db.SQLite (AS.App.db app >>= AS.App.Db.system)
-
 startPostgreDevDb :: Path' Abs (Dir WaspProjectDir) -> String -> Command ()
 startPostgreDevDb waspProjectDir appName = do
   throwIfExeIsNotAvailable

waspc/cli/src/Wasp/Cli/Command/Studio.hs

@@ -18,7 +18,6 @@ import qualified Wasp.AppSpec as AS
 import qualified Wasp.AppSpec.Api as AS.Api
 import qualified Wasp.AppSpec.App as AS.App
 import qualified Wasp.AppSpec.App.Auth as AS.App.Auth
-import qualified Wasp.AppSpec.App.Db as AS.App.Db
 import qualified Wasp.AppSpec.Job as AS.Job
 import Wasp.AppSpec.Operation (Operation (..))
 import qualified Wasp.AppSpec.Operation as Operation
@@ -117,7 +116,7 @@ studio = do
               .= object
                 [ "name" .= (appName :: String),
                   "auth" .= getAuthInfo appSpec app,
-                  "db" .= getDbInfo app
+                  "db" .= getDbInfo appSpec
                 ]
                 -- TODO: Add CRUDs.
           ]
@@ -155,12 +154,10 @@ studio = do
     resolveEntities spec entityRefs =
       AS.resolveRef spec <$> fromMaybe [] entityRefs
 
-    getDbInfo app = do
-      db <- AS.App.db app
-      return $
-        object
-          [ "system" .= (show <$> AS.App.Db.system db)
-          ]
+    getDbInfo spec =
+      object
+        [ "system" .= show (ASV.getValidDbSystem spec)
+        ]
 
     getAuthInfo spec app = do
       auth <- AS.App.auth app

waspc/data/Cli/templates/basic/schema.prisma

@@ -0,0 +1,12 @@
+datasource db {
+  provider = "sqlite"
+  // Wasp requires that the url is set to the DATABASE_URL environment variable.
+  url      = env("DATABASE_URL")
+}
+
+// Wasp requires the `prisma-client-js` generator to be present.
+generator client {
+  provider = "prisma-client-js"
+}
+
+// Define your Prisma schema below

waspc/data/Generator/templates/db/schema.prisma

@@ -1,20 +1,16 @@
 {{={= =}=}}
 
-datasource db {
-  provider = "{= datasourceProvider =}"
-  url      = {=& datasourceUrl =}
-  {=# dbExtensions =}
-  extensions = {=& . =}
-  {=/ dbExtensions =}
-}
+{=& datasourceSchema =}
 
-generator client {
-  provider = "prisma-client-js"
-  {=# prismaPreviewFeatures =}
-  previewFeatures = {=& . =}
-  {=/ prismaPreviewFeatures =}
-}
+{=# generatorSchemas =}
+{=& . =}
+{=/ generatorSchemas =}
 
 {=# modelSchemas =}
 {=& . =}
+
 {=/ modelSchemas =}
+{=# enumSchemas =}
+{=& . =}
+
+{=/ enumSchemas =}

waspc/examples/crud-testing/main.wasp

@@ -1,6 +1,6 @@
 app crudTesting {
   wasp: {
-    version: "^0.13.0"
+    version: "^0.14.0"
   },
   head: [
     "<link rel=\"stylesheet\" href=\"https://unpkg.com/[email protected]/mvp.css\">"
@@ -16,7 +16,6 @@ app crudTesting {
     onAuthFailedRedirectTo: "/login",
   },
   db: {
-    system: PostgreSQL,
     seeds: [
       import { migrateAuth } from "@src/seeds/migrateAuth.js"
     ]
@@ -45,21 +44,6 @@ page DetailPage {
   authRequired: true,
 }
 
-entity User {=psl
-  id Int @id @default(autoincrement())
-  address String?
-  tasks Task[]
-psl=}
-
-// TODO: validate the fields
-// Maybe delegate to Prisma
-entity Task {=psl
-  id Int @id @default(autoincrement())
-  title String
-  userId Int
-  user User @relation(fields: [userId], references: [id])
-psl=}
-
 crud tasks {
   entity: Task,
   operations: {

waspc/examples/crud-testing/schema.prisma

@@ -0,0 +1,24 @@
+datasource db {
+  provider = "sqlite"
+  // Wasp requires that the url is set to the DATABASE_URL environment variable.
+  url      = env("DATABASE_URL")
+}
+
+// Wasp requires the `prisma-client-js` generator to be present.
+generator client {
+  provider = "prisma-client-js"
+}
+
+// Define your Prisma schema below
+model User {
+  id      Int     @id @default(autoincrement())
+  address String?
+  tasks   Task[]
+}
+
+model Task {
+  id     Int    @id @default(autoincrement())
+  title  String
+  userId Int
+  user   User   @relation(fields: [userId], references: [id])
+}

waspc/examples/pg-vector-example/main.wasp

@@ -1,21 +1,11 @@
 app pgVectorExample {
   wasp: {
-    version: "^0.13.0"
+    version: "^0.14.0"
   },
   title: "PG Vector Example",
   client: {
     rootComponent: import { Layout } from "@src/Layout.tsx",
   },
-  db: {
-    system: PostgreSQL,
-    prisma: {
-      clientPreviewFeatures: ["postgresqlExtensions"],
-      dbExtensions: [{
-        name: "pgvector",
-        map: "vector"
-      }]
-    }
-  }
 }
 
 route RootRoute { path: "/", to: MainPage }
@@ -52,13 +42,3 @@ action deleteDocument {
   fn: import { deleteDocument } from "@src/documents.js",
   entities: [Document]
 }
-
-entity Document {=psl
-  id String @id @default(uuid())
-  title String
-  url String @unique
-  content String
-  embedding Unsupported("vector(1536)")
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-psl=}

waspc/examples/pg-vector-example/schema.prisma

@@ -0,0 +1,23 @@
+datasource db {
+  provider   = "postgresql"
+  // Wasp requires that the url is set to the DATABASE_URL environment variable.
+  url        = env("DATABASE_URL")
+  extensions = [pgvector(map: "vector")]
+}
+
+// Wasp requires the `prisma-client-js` generator to be present.
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["postgresqlExtensions"]
+}
+
+// Define your Prisma schema below
+model Document {
+  id        String                      @id @default(uuid())
+  title     String
+  url       String                      @unique
+  content   String
+  embedding Unsupported("vector(1536)")
+  createdAt DateTime                    @default(now())
+  updatedAt DateTime                    @updatedAt
+}

waspc/examples/todo-typescript/main.wasp

@@ -38,7 +38,6 @@ app TodoTypescript {
     seeds: [
       import { seedMyDb } from "@src/db/seeds.js"
     ],
-    system: PostgreSQL
   },
   webSocket: {
     fn: import { webSocketFn } from "@src/websocket/index",
@@ -53,23 +52,6 @@ app TodoTypescript {
   }
 }
 
-// Use Prisma Schema Language (PSL) to define our entities: https://www.prisma.io/docs/concepts/components/prisma-schema
-// Run `wasp db migrate-dev` in the CLI to create the database tables
-// Then run `wasp db studio` to open Prisma Studio and view your db models
-entity User {=psl
-  id          Int     @id @default(autoincrement())
-  address     String
-  tasks       Task[]
-psl=}
-
-entity Task {=psl
-  id          Int     @id @default(autoincrement())
-  description String
-  isDone      Boolean @default(false)
-  user        User   @relation(fields: [userId], references: [id])
-  userId      Int
-psl=}
-
 crud Tasks {
   entity: Task,
   operations: {

waspc/examples/todo-typescript/schema.prisma

@@ -0,0 +1,25 @@
+datasource db {
+  provider = "postgresql"
+  // Wasp requires that the url is set to the DATABASE_URL environment variable.
+  url      = env("DATABASE_URL")
+}
+
+// Wasp requires the `prisma-client-js` generator to be present.
+generator client {
+  provider = "prisma-client-js"
+}
+
+// Define your Prisma schema below
+model User {
+  id      Int    @id @default(autoincrement())
+  address String
+  tasks   Task[]
+}
+
+model Task {
+  id          Int     @id @default(autoincrement())
+  description String
+  isDone      Boolean @default(false)
+  user        User    @relation(fields: [userId], references: [id])
+  userId      Int
+}

waspc/examples/todo-typescript/src/Todo.test.tsx

@@ -41,8 +41,8 @@ const { mockQuery } = mockServer()
 
 const mockUser = {
   identities: {
-    username: { 
-      id: 'Elon' 
+    username: {
+      id: 'Elon',
     },
   },
 } as AuthUser

waspc/examples/todoApp/main.wasp

@@ -54,7 +54,6 @@ app todoApp {
     setupFn: import setup from "@src/clientSetup"
   },
   db: {
-    system: PostgreSQL,
     seeds: [
       import { devSeedSimple } from "@src/dbSeeds",
       import { prodSeed } from "@src/dbSeeds"
@@ -68,21 +67,6 @@ app todoApp {
   },
 }
 
-entity User {=psl
-    id                        Int           @id @default(autoincrement())
-    // Business logic
-    tasks                     Task[]
-    address                   String?
-psl=}
-
-entity Task {=psl
-    id          Int     @id @default(autoincrement())
-    description String
-    isDone      Boolean @default(false)
-    user        User    @relation(fields: [userId], references: [id])
-    userId      Int
-psl=}
-
 route SignupRoute { path: "/signup", to: SignupPage }
 page SignupPage {
   component: import Signup from "@src/pages/auth/Signup"

waspc/examples/todoApp/migrations/20240516082146_add_votes/migration.sql

@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "TaskVote" (
+    "id" TEXT NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "taskId" INTEGER NOT NULL,
+
+    CONSTRAINT "TaskVote_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "TaskVote" ADD CONSTRAINT "TaskVote_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "TaskVote" ADD CONSTRAINT "TaskVote_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "Task"("id") ON DELETE RESTRICT ON UPDATE CASCADE;