Merge branch 'beta'

Author: mavilein

cli/packages/prisma-cli-core/README.md

@@ -154,4 +154,3 @@ Prisma has a community of thousands of amazing developers and contributors. Welc
 
 Contributions are **welcome and extremely helpful** 🙌
 Please refer [to the contribution guide](https://github.com/graphcool/prisma/blob/master/CONTRIBUTING.md) for more information.
-

cli/packages/prisma-cli-core/package.json

@@ -97,6 +97,7 @@
     "lodash.differenceby": "^4.8.0",
     "mongodb": "^3.1.10",
     "multimatch": "^2.1.0",
+    "mysql": "^2.16.0",
     "node-forge": "^0.7.1",
     "npm-run": "4.1.2",
     "opn": "^5.1.0",

cli/packages/prisma-cli-core/src/commands/delete/index.ts

@@ -1,6 +1,6 @@
 import { Command, flags, Flags } from 'prisma-cli-engine'
 import chalk from 'chalk'
-import { prettyTime } from '../../util'
+import { prettyTime } from '../../utils/util'
 
 export default class Delete extends Command {
   static topic = 'delete'

cli/packages/prisma-cli-core/src/commands/deploy/deploy.ts

@@ -6,7 +6,7 @@ import * as path from 'path'
 import * as fs from 'fs-extra'
 import { Seeder } from '../seed/Seeder'
 const debug = require('debug')('deploy')
-import { prettyTime, concatName, defaultDockerCompose } from '../../util'
+import { prettyTime, concatName, defaultDockerCompose } from '../../utils/util'
 import * as sillyname from 'sillyname'
 import { EndpointDialog } from '../../utils/EndpointDialog'
 import { spawnSync } from 'npm-run'

cli/packages/prisma-cli-core/src/commands/generate/generate.ts

@@ -1,5 +1,5 @@
 import { Command, flags, Flags } from 'prisma-cli-engine'
-import { prettyTime } from '../../util'
+import { prettyTime } from '../../utils/util'
 import chalk from 'chalk'
 import * as fs from 'fs-extra'
 import * as path from 'path'

cli/packages/prisma-cli-core/src/commands/init/__snapshots__/index.test.ts.snap

@@ -0,0 +1,66 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`init choose local 1`] = `
+Object {
+  "datamodel.prisma": "type User {
+  id: ID! @unique
+  name: String!
+}
+",
+  "docker-compose.yml": "version: '3'
+services:
+  prisma:
+    restart: always
+    ports:
+    - \\"4466:4466\\"
+    environment:
+      PRISMA_CONFIG: |
+        port: 4466
+        # uncomment the next line and provide the env var PRISMA_MANAGEMENT_API_SECRET=my-secret to activate cluster security
+        # managementApiSecret: my-secret
+        databases:
+          default:
+            connector: postgres
+            host: postgres
+            rawAccess: true
+            port: 5432
+            migrations: true
+  postgres:
+    restart: always
+    environment:
+      POSTGRES_USER: prisma
+      POSTGRES_PASSWORD: prisma
+    volumes:
+      - postgres:/var/lib/postgresql/data
+volumes:
+  postgres:
+",
+  "prisma.yml": "endpoint: http://localhost:4466
+datamodel: datamodel.prisma",
+}
+`;
+
+exports[`init choose local 2`] = `
+"
+Created 3 new files:                                                                          
+
+  prisma.yml           Prisma service definition
+  datamodel.prisma    GraphQL SDL-based datamodel (foundation for database)
+  docker-compose.yml   Docker configuration file
+
+Next steps:
+
+  1. Start your Prisma server: docker-compose up -d
+  2. Deploy your Prisma service: prisma deploy
+  3. Read more about Prisma server:
+     http://bit.ly/prisma-server-overview
+"
+`;
+
+exports[`init choose local 3`] = `""`;
+
+exports[`init test project 1`] = `Object {}`;
+
+exports[`init test project 2`] = `""`;
+
+exports[`init test project 3`] = `""`;

cli/packages/prisma-cli-core/src/commands/init/__snapshots__/init.test.ts.snap

@@ -1,7 +1,7 @@
 // import * as nock from 'nock'
 import { mocki } from './inquirer-mock-prompt'
 import { Config } from 'prisma-cli-engine'
-import Init from './'
+import Init from './init'
 import { writeToStdIn, DOWN, ENTER } from '../../test/writeToStdin'
 import { getTmpDir } from '../../test/getTmpDir'
 import * as fs from 'fs-extra'

…cli-core/src/commands/init/index.test.ts …-cli-core/src/commands/init/init.test.tscli/packages/prisma-cli-core/src/commands/init/index.test.ts renamed to cli/packages/prisma-cli-core/src/commands/init/init.test.ts cli/packages/prisma-cli-core/src/commands/init/index.test.ts renamed to cli/packages/prisma-cli-core/src/commands/init/init.test.ts

@@ -25,6 +25,14 @@ export default class Init extends Command {
       description: 'Initial service endpoint (optional)',
       required: false,
     }),
+
+    /**
+     * Temporary flag needed to test Datamodel v2
+     */
+    ['prototype']: flags.boolean({
+      description:
+        'Output Datamodel v2. Note: This is a temporary flag for debugging',
+    }),
   }
 
   async run() {
@@ -107,10 +115,10 @@ datamodel: datamodel.prisma
 
       this.out.log(`
 ${chalk.bold(
-  `Created ${
-    endpointCreatedFiles.length
-  } new files:                                                                          `,
-)}
+        `Created ${
+          endpointCreatedFiles.length
+        } new files:                                                                          `,
+      )}
 
 ${endpointCreatedFiles.join('\n')}
 
@@ -128,6 +136,7 @@ ${endpointSteps.map((step, index) => `  ${index + 1}. ${step}`).join('\n')}`)
       config: this.config,
       definition: this.definition,
       shouldAskForGenerator: true,
+      prototype: this.flags.prototype,
     })
 
     const results = await endpointDialog.getEndpoint()
@@ -222,10 +231,10 @@ datamodel: datamodel.prisma${databaseTypeString}`
 
     this.out.log(`
 ${chalk.bold(
-  `Created ${
-    createdFiles.length
-  } new files:                                                                          `,
-)}
+      `Created ${
+        createdFiles.length
+      } new files:                                                                          `,
+    )}
 
 ${createdFiles.join('\n')}