fix(relations): add test cases for relations

Author: marcjulian

__tests__/fixtures/datamodels.ts

@@ -0,0 +1,79 @@
+export const datamodelOneToOne = /* Prisma */ `
+  model User {
+    id Int @id @default(autoincrement())
+    name String
+    profile   Profile?
+  }
+  model Profile {
+    id Int @id @default(autoincrement())
+    name String
+    user   User    @relation(fields: [userId], references: [id])
+    userId Int
+  }
+`;
+
+export const datamodelOneToOneAndManyToOne = /* Prisma */ `
+  model User {
+    id Int @id @default(autoincrement())
+    name String
+    profile   Profile?
+    posts Post[]
+  }
+  model Profile {
+    id Int @id @default(autoincrement())
+    name String
+    user   User    @relation(fields: [userId], references: [id])
+    userId Int
+  }
+  model Post {
+    id Int @id @default(autoincrement())
+    name String
+    author User @relation(fields: [authorId], references: [id])
+    authorId Int
+  }
+`;
+
+export const datamodelManyToOne = /* Prisma */ `
+  model User {
+    id Int @id @default(autoincrement())
+    name String
+    posts   Post[]
+  }
+  model Post {
+    id Int @id @default(autoincrement())
+    name String
+    author   User    @relation(fields: [authorId], references: [id])
+    authorId Int
+  }
+`;
+
+export const datamodelManyToOneSecond = /* Prisma */ `
+  model User {
+    id Int @id @default(autoincrement())
+    name String
+    organizationPermissions OrganizationPermission[]
+  }
+  model Organization {
+    id        Int      @id @default(autoincrement())
+    createdAt DateTime @default(now())
+    updatedAt DateTime @updatedAt
+    name      String
+
+    permissions OrganizationPermission[]
+  }
+
+  model OrganizationPermission {
+    id        Int              @id @default(autoincrement())
+    createdAt DateTime         @default(now())
+    updatedAt DateTime         @updatedAt
+
+    organization   Organization @relation(fields: [organizationId], references: [id])
+    organizationId Int
+
+    user   User @relation(fields: [userId], references: [id])
+    userId Int
+
+    accepted Boolean @default(false)
+    @@unique([userId, organizationId])
+  }
+`;

__tests__/fixtures/relations.datamodel.ts

@@ -1,5 +1,10 @@
 import { generateDMMF } from './utils/generateDMMF';
-import { datamodelOneToOne, datamodelManyToOne } from './fixtures/datamodels';
+import {
+  datamodelOneToOne,
+  datamodelManyToOne,
+  datamodelManyToOneSecond,
+  datamodelOneToOneAndManyToOne,
+} from './fixtures/relations.datamodel';
 import { generateRelations } from '../src/generator/relations';
 
 describe('Relations', () => {
@@ -12,6 +17,17 @@ describe('Relations', () => {
     expect(relations[0]).toMatch(expected);
   });
 
+  test('generating one-to-one and many-to-one relationship', async () => {
+    const dmmf = await generateDMMF(datamodelOneToOneAndManyToOne);
+
+    const expected = 'Ref: Profile.userId - User.id';
+    const expectedSecond = 'Ref: Post.authorId > User.id';
+
+    const relations = generateRelations(dmmf.datamodel.models);
+    expect(relations[0]).toMatch(expected);
+    expect(relations[1]).toMatch(expectedSecond);
+  });
+
   test('generating many-to-one relationship', async () => {
     const dmmf = await generateDMMF(datamodelManyToOne);
 
@@ -20,4 +36,16 @@ describe('Relations', () => {
     const relations = generateRelations(dmmf.datamodel.models);
     expect(relations[0]).toMatch(expected);
   });
+
+  test('generating many-to-one relationship second', async () => {
+    const dmmf = await generateDMMF(datamodelManyToOneSecond);
+
+    const expected =
+      'Ref: OrganizationPermission.organizationId > Organization.id';
+    const expectedSecond = 'Ref: OrganizationPermission.userId > User.id';
+
+    const relations = generateRelations(dmmf.datamodel.models);
+    expect(relations[0]).toMatch(expected);
+    expect(relations[1]).toMatch(expectedSecond);
+  });
 });

__tests__/relations.test.ts

@@ -5,6 +5,7 @@
   "bin": "./dist/generator.js",
   "scripts": {
     "build": "tsc -p .",
+    "dev:watch": "tsc -p . --watch",
     "dev": "tsc -p . && npm run prisma:generate",
     "prisma:save": "npx prisma migrate save --experimental",
     "prisma:up": "npx prisma migrate up --experimental",

package.json

@@ -10,7 +10,7 @@ export async function generate(options: GeneratorOptions) {
     try {
       await mkdir(options.generator.output, { recursive: true });
 
-      // await writeFile('./test.json', JSON.stringify(options.dmmf.datamodel));
+      await writeFile('./test.json', JSON.stringify(options.dmmf.datamodel));
 
       const dbmlSchema = generateDBMLSchema(options.dmmf);
 

src/cli/dbml-generator.ts

@@ -15,26 +15,34 @@ export function generateRelations(models: DMMF.Model[]): string[] {
           field.relationFromFields?.length
       )
       .forEach((field) => {
-        const relatedTables = field.relationName!!.split('To');
+        const relationFrom = model.name;
+        const relationTo = field.type;
+
+        const relationOperator = getRelationOperator(
+          models,
+          relationFrom,
+          relationTo
+        );
+
         refs.push(
-          `Ref: ${relatedTables[0]}.${combineKeys(
+          `Ref: ${relationFrom}.${combineKeys(
             field.relationFromFields!
-          )} ${getRefOperator(models, relatedTables[1], relatedTables[0])} ${
-            relatedTables[1]
-          }.${combineKeys(field.relationToFields!!)}`
+          )} ${relationOperator} ${relationTo}.${combineKeys(
+            field.relationToFields!!
+          )}`
         );
       });
   });
   return refs;
 }
 
-const getRefOperator = (
+const getRelationOperator = (
   models: DMMF.Model[],
   from: string,
   to: string
 ): string => {
-  const model = models.find((model) => model.name === from);
-  const field = model?.fields.find((field) => field.type === to);
+  const model = models.find((model) => model.name === to);
+  const field = model?.fields.find((field) => field.type === from);
   return field?.isList ? manyToOne : oneToOne;
 };