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

@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/aws-lambda": "^0.0.17",
     "@types/fs-extra": "^5.0.0",
-    "@types/graphql": "^14.0.3",
+    "@types/graphql": "14.0.3",
     "@types/node": "^8.0.22",
     "@types/semver": "^5.5.0",
     "faker": "^4.1.0",

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

@@ -38,7 +38,7 @@ export default class Delete extends Command {
       this.definition.getWorkspace(),
     )
 
-    const prettyName = `${chalk.bold(serviceName)}@${stage}`
+    const prettyName = `${chalk.bold(this.definition.endpoint!)}`
 
     if (!force) {
       await this.askForConfirmation(prettyName)

cli/packages/prisma-cli-engine/src/StatusChecker.ts

@@ -51,7 +51,7 @@ export class StatusChecker {
       globalBin,
       hashDate,
     })
-    const secret = 'epiGheezoh5eogoachiu9tie9'
+    const secret = 'loTheeChaxaiPhahsa8Aifiel'
 
     const hash = crypto
       .createHmac('sha256', secret)

cli/packages/prisma-datamodel/__tests__/parser/directives.ts

@@ -213,7 +213,7 @@ for (const parser of parsersToTest) {
       lastName: String!
     }
     
-    type UserToUser @linkTable {
+    type UserToUser @relationTable {
       A: User!
       B: User!
     }
@@ -222,10 +222,10 @@ for (const parser of parsersToTest) {
       const { types } = parser.instance.parseFromSchemaString(model)
 
       const userType = SdlExpect.type(types, 'User')
-      expect(userType.isLinkTable).toBe(false)
+      expect(userType.isRelationTable).toBe(false)
 
       const linkType = SdlExpect.type(types, 'UserToUser')
-      expect(linkType.isLinkTable).toBe(true)
+      expect(linkType.isRelationTable).toBe(true)
     })
   })
 }

cli/packages/prisma-datamodel/__tests__/renderer/base.ts

@@ -61,7 +61,7 @@ describe(`Renderer test`, () => {
       ],
       name: 'User',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       isEnum: false,
       indices: [],
       directives: [],
@@ -118,7 +118,7 @@ describe(`Renderer test`, () => {
     const type: IGQLType = {
       name: 'Test',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       directives: typeDirectives,
       isEnum: false,
       fields: [scalarField, arrayField],

cli/packages/prisma-datamodel/__tests__/renderer/baseV2.ts

@@ -34,7 +34,7 @@ describe(`Renderer datamodel v1.1 test`, () => {
     const type: IGQLType = {
       name: 'Test',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       isEnum: false,
       fields: [field1, field2, field3, field4],
       comments: [],

cli/packages/prisma-datamodel/__tests__/renderer/builtinDirectives.ts

@@ -36,7 +36,7 @@ describe(`Renderer directives test`, () => {
     const type: IGQLType = {
       name: 'Test',
       isEmbedded: true,
-      isLinkTable: false,
+      isRelationTable: false,
       // This will be ignored since we are dealing with an embedded type
       databaseName: 'testType',
       isEnum: false,
@@ -80,7 +80,7 @@ describe(`Renderer directives test`, () => {
     const type: IGQLType = {
       name: 'Test',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       databaseName: 'testType',
       isEnum: false,
       fields: [field1, field2, field3, field4],
@@ -130,7 +130,7 @@ describe(`Renderer directives test`, () => {
     const type: IGQLType = {
       name: 'User',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       isEnum: false,
       fields: [
         idField,
@@ -192,7 +192,7 @@ describe(`Renderer directives test`, () => {
     const type: IGQLType = {
       name: 'User',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       isEnum: false,
       fields: [
         idField,
@@ -226,7 +226,7 @@ describe(`Renderer directives test`, () => {
         lastName: String!
       }
       
-      type UserToUser @linkTable {
+      type UserToUser @relationTable {
         A: User!
         B: User!
       }`)
@@ -238,7 +238,7 @@ describe(`Renderer directives test`, () => {
     const type: IGQLType = {
       name: 'User',
       isEmbedded: false,
-      isLinkTable: false,
+      isRelationTable: false,
       isEnum: false,
       fields: [idField, lastNameField],
       indices: [],
@@ -250,7 +250,7 @@ describe(`Renderer directives test`, () => {
     const linkType: IGQLType = {
       name: 'UserToUser',
       isEmbedded: false,
-      isLinkTable: true,
+      isRelationTable: true,
       isEnum: false,
       fields: [
         new GQLOneRelationField('A', type, true),

cli/packages/prisma-datamodel/src/datamodel/directives.ts

@@ -6,7 +6,7 @@ export abstract class DirectiveKeys {
   public static index = 'index'
   public static indexes = 'indexes'
   public static sequence = 'sequence'
-  public static linkTable = 'linkTable'
+  public static relationTable = 'relationTable'
   public static scalarList = 'scalarList'
 
   public static isId = 'id'

cli/packages/prisma-datamodel/src/datamodel/model.ts

@@ -170,7 +170,7 @@ export interface IGQLType {
    * the two foreign key fields. The indices are hidden
    * when introspecting.
    */
-  isLinkTable: boolean
+  isRelationTable: boolean
 
   /**
    * The name of this type.