fix(*): dmmf: add uniqueIndexes on Model & default, hasDefaultValue o…

…n Field
prisma · Jun 5, 2020 · 500f06b · 500f06b
1 parent abda193
commit 500f06b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/src/packages/client/src/runtime/dmmf-types.ts b/src/packages/client/src/runtime/dmmf-types.ts
@@ -17,15 +17,21 @@ export namespace DMMF {
     enums: Enum[]
   }
 
+  export interface uniqueIndex {
+    name: string
+    fields: string[]
+  }
+
   export interface Model {
     name: string
     isEmbedded: boolean
     dbName: string | null
     fields: Field[]
     uniqueFields: string[][]
+    uniqueIndexes: uniqueIndex[]
     documentation?: string
-    [key: string]: any // safe net for additional new props
     idFields: string[]
+    [key: string]: any // safe net for additional new props
   }
 
   export type FieldKind = 'scalar' | 'object' | 'enum'
@@ -40,17 +46,17 @@ export namespace DMMF {
     type: string
     dbNames: string[] | null
     isGenerated: boolean
+    hasDefaultValue: boolean
+    default?: FieldDefault | string | boolean | number
     relationToFields?: any[]
     relationOnDelete?: string
     relationName?: string
     documentation?: string
-    default?: FieldDefault | string | boolean
     [key: string]: any // safe net for additional new props
   }
 
   export interface FieldDefault {
     name: string
-    returnType: string
     args: any[]
   }
 

diff --git a/src/packages/client/src/runtime/transformDmmf.ts b/src/packages/client/src/runtime/transformDmmf.ts
@@ -96,7 +96,10 @@ function getFieldType(field: DMMF.Field): string {
       if (field.default === 'uuid') {
         return 'UUID'
       }
-    } else if (typeof field.default === 'boolean') {
+    } else if (
+      typeof field.default === 'boolean' ||
+      typeof field.default === 'number'
+    ) {
       return field.type
     } else if (field.default.name === 'uuid') {
       return 'UUID'

diff --git a/src/packages/generator-helper/src/types.ts b/src/packages/generator-helper/src/types.ts
@@ -28,12 +28,18 @@ export namespace DMMF {
     enums: DatamodelEnum[]
   }
 
+  export interface uniqueIndex {
+    name: string
+    fields: string[]
+  }
+
   export interface Model {
     name: string
     isEmbedded: boolean
     dbName: string | null
     fields: Field[]
     uniqueFields: string[][]
+    uniqueIndexes: uniqueIndex[]
     idFields: string[]
   }
 
@@ -50,11 +56,18 @@ export namespace DMMF {
     type: string
     dbNames: string[] | null
     isGenerated: boolean
+    hasDefaultValue: boolean
+    default?: FieldDefault | string | boolean | number
     relationToFields?: any[]
     relationOnDelete?: string
     relationName?: string
   }
 
+  export interface FieldDefault {
+    name: string
+    args: any[]
+  }
+
   export interface Schema {
     rootQueryType?: string
     rootMutationType?: string

diff --git a/src/packages/introspection/src/prompt/utils/templates/__tests__/sortModels.test.ts b/src/packages/introspection/src/prompt/utils/templates/__tests__/sortModels.test.ts
@@ -7,6 +7,7 @@ test('sortModels', () => {
       name: 'Car',
       fields: [],
       uniqueFields: [],
+      uniqueIndexes: [],
       isEmbedded: false,
       dbName: null,
       idFields: [],
@@ -15,6 +16,7 @@ test('sortModels', () => {
       name: 'Bike',
       fields: [],
       uniqueFields: [],
+      uniqueIndexes: [],
       isEmbedded: false,
       dbName: null,
       idFields: [],
@@ -23,13 +25,15 @@ test('sortModels', () => {
       name: 'Post',
       fields: [],
       uniqueFields: [],
+      uniqueIndexes: [],
       isEmbedded: false,
       dbName: null,
       idFields: [],
     },
     {
       name: 'User',
       uniqueFields: [],
+      uniqueIndexes: [],
       fields: [],
       isEmbedded: false,
       dbName: null,
@@ -46,6 +50,7 @@ test('sortModels', () => {
         "isEmbedded": false,
         "name": "User",
         "uniqueFields": Array [],
+        "uniqueIndexes": Array [],
       },
       Object {
         "dbName": null,
@@ -54,6 +59,7 @@ test('sortModels', () => {
         "isEmbedded": false,
         "name": "Post",
         "uniqueFields": Array [],
+        "uniqueIndexes": Array [],
       },
       Object {
         "dbName": null,
@@ -62,6 +68,7 @@ test('sortModels', () => {
         "isEmbedded": false,
         "name": "Bike",
         "uniqueFields": Array [],
+        "uniqueIndexes": Array [],
       },
       Object {
         "dbName": null,
@@ -70,6 +77,7 @@ test('sortModels', () => {
         "isEmbedded": false,
         "name": "Car",
         "uniqueFields": Array [],
+        "uniqueIndexes": Array [],
       },
     ]
   `)