add support for schema.prisma

prisma · Jul 9, 2019 · edf7e4a · edf7e4a
1 parent b1204a3
commit edf7e4a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 8 deletions.
diff --git a/cli/src/getCwd.ts b/cli/src/getCwd.ts
@@ -6,6 +6,7 @@ const exists = promisify(fs.exists)
 const readFile = promisify(fs.readFile)
 
 const datamodelFile = 'project.prisma'
+const schemaFile = 'schema.prisma'
 
 /**
  * Prefer the folder that has the project.prisma.
@@ -20,8 +21,10 @@ export async function getCwd(): Promise<string> {
     prismaDatamodelExists,
   ] = await Promise.all([
     exists(path.join(cwd, datamodelFile)),
+    exists(path.join(cwd, schemaFile)),
     exists(path.join(cwd, 'prisma/')),
     exists(path.join(cwd, 'prisma/', datamodelFile)),
+    exists(path.join(cwd, 'prisma/', schemaFile)),
   ])
 
   if (datamodelCwdExists) {
@@ -37,9 +40,11 @@ export async function getCwd(): Promise<string> {
 
 export async function getDatamodel(): Promise<string> {
   const cwd = await getCwd()
-  const datamodelPath = path.join(cwd, datamodelFile)
-  const datamodelExists = await exists(datamodelPath)
-  if (!datamodelExists) {
+  let datamodelPath = path.join(cwd, datamodelFile)
+  if (!(await exists(datamodelPath))) {
+    let datamodelPath = path.join(cwd, schemaFile)
+  }
+  if (!(await exists(datamodelPath))) {
     throw new Error(`Could not find ${datamodelPath}`)
   }
   return readFile(datamodelPath, 'utf-8')

diff --git a/introspection/src/commands/Init.ts b/introspection/src/commands/Init.ts
@@ -45,6 +45,13 @@ export class Init implements Command {
 Please run ${chalk.bold('prisma2 init')} in an empty directory.`)
     }
 
+    if (existsSync(join(outputDir, 'schema.prisma'))) {
+      throw new Error(`Can't start ${chalk.bold('prisma2 init')} as ${chalk.redBright(
+        join(outputDir, 'schema.prisma'),
+      )} exists.
+Please run ${chalk.bold('prisma2 init')} in an empty directory.`)
+    }
+
     if (existsSync(join(outputDir, 'project.prisma'))) {
       throw new Error(`Can't start ${chalk.bold('prisma2 init')} as ${chalk.redBright(
         join(outputDir, 'project.prisma'),
@@ -84,7 +91,7 @@ Please run ${chalk.bold('prisma2 init')} in an empty directory.`)
       return
     }
     mkdirpSync(join(outputDir, 'prisma'))
-    writeFileSync(join(outputDir, 'prisma/project.prisma'), result.introspectionResult.sdl)
+    writeFileSync(join(outputDir, 'prisma/schema.prisma'), result.introspectionResult.sdl)
   }
 
   help() {

diff --git a/introspection/src/commands/Introspect.ts b/introspection/src/commands/Introspect.ts
@@ -150,7 +150,10 @@ ${chalk.bold('Created 1 new file:')} Prisma DML datamodel (derived from existing
   }
 
   getExistingDatamodel(): string | undefined {
-    const datamodelPath = path.join(this.env.cwd, 'project.prisma')
+    let datamodelPath = path.join(this.env.cwd, 'project.prisma')
+    if (!fs.existsSync(datamodelPath)) {
+      datamodelPath = path.join(this.env.cwd, 'schema.prisma')
+    }
     if (!fs.existsSync(datamodelPath)) {
       return undefined
     }

diff --git a/introspection/src/introspect/util.ts b/introspection/src/introspect/util.ts
@@ -136,12 +136,23 @@ export async function getDatabaseSchemas(connector: IConnector): Promise<string[
   }
 }
 
+function getSchemaPath(cwd: string): string | undefined {
+  if (existsSync(join(cwd, 'project.prisma'))) {
+    return join(cwd, 'project.prisma')
+  }
+  if (existsSync(join(cwd, 'schema.prisma'))) {
+    return join(cwd, 'schema.prisma')
+  }
+  return undefined
+}
+
 export async function getCredentialsFromExistingDatamodel(
   env: Env,
   lift: LiftEngine,
 ): Promise<undefined | DatabaseCredentials> {
-  if (existsSync(join(env.cwd, 'project.prisma'))) {
-    const datamodel = readFileSync(join(env.cwd, 'project.prisma'), 'utf-8')
+  const schemaPath = getSchemaPath(env.cwd)
+  if (schemaPath) {
+    const datamodel = readFileSync(schemaPath, 'utf-8')
     const { datasources } = await lift.getConfig({
       datamodel,
     })

diff --git a/prisma2/src/getConfig.ts b/prisma2/src/getConfig.ts
@@ -13,7 +13,10 @@ export async function getConfig(cwd: string) {
 }
 
 export async function getDatamodel(cwd: string): Promise<string> {
-  const datamodelPath = path.join(cwd, 'project.prisma')
+  let datamodelPath = path.join(cwd, 'project.prisma')
+  if (!(await exists(datamodelPath))) {
+    datamodelPath = path.join(cwd, 'schema.prisma')
+  }
   if (!(await exists(datamodelPath))) {
     throw new Error(`Could not find ${datamodelPath}`)
   }