fix(client): do not duplicate equals

Related #3342
prisma · Aug 20, 2020 · c0bc0a8 · c0bc0a8
1 parent 8e8412d
commit c0bc0a8
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 7 deletions.
diff --git a/src/packages/client/src/__tests__/minimalWhereTransformation.test.ts b/src/packages/client/src/__tests__/minimalWhereTransformation.test.ts
@@ -149,6 +149,86 @@ describe('minimal where transformation', () => {
       }"
     `)
   })
+
+  test('implicit many-to-many relation: select date equals (implicit)', () => {
+    const transformedDocument = getTransformedDocument({
+      select: {
+        posts: {
+          where: {
+            OR: [
+              {
+                createdAt: '2020-08-19T10:02:43.353Z',
+              },
+            ],
+          },
+        },
+      },
+    })
+
+    expect(transformedDocument).toMatchInlineSnapshot(`
+      "query {
+        findManyUser {
+          posts(where: {
+            OR: [
+              {
+                createdAt: {
+                  equals: \\"2020-08-19T10:02:43.353Z\\"
+                }
+              }
+            ]
+          }) {
+            id
+            createdAt
+            updatedAt
+            published
+            title
+            content
+            authorId
+          }
+        }
+      }"
+    `)
+  })
+
+  test('implicit many-to-many relation: select date equals (explicit)', () => {
+    const transformedDocument = getTransformedDocument({
+      select: {
+        posts: {
+          where: {
+            OR: [
+              {
+                createdAt: { equals: '2020-08-19T10:02:43.353Z' },
+              },
+            ],
+          },
+        },
+      },
+    })
+
+    expect(transformedDocument).toMatchInlineSnapshot(`
+      "query {
+        findManyUser {
+          posts(where: {
+            OR: [
+              {
+                createdAt: {
+                  equals: \\"2020-08-19T10:02:43.353Z\\"
+                }
+              }
+            ]
+          }) {
+            id
+            createdAt
+            updatedAt
+            published
+            title
+            content
+            authorId
+          }
+        }
+      }"
+    `)
+  })
 })
 
 function getTransformedDocument(select) {

diff --git a/src/packages/client/src/fixtures/blog.ts b/src/packages/client/src/fixtures/blog.ts
@@ -34,7 +34,7 @@ model Post {
 
 model Category {
   id        String   @default(cuid()) @id
-  posts Post[]  @relation("MyPostCatRelationTable")
+  posts     Post[]  @relation("MyPostCatRelationTable")
 }
 
 model NoRelations {

diff --git a/src/packages/client/src/runtime/query.ts b/src/packages/client/src/runtime/query.ts
@@ -986,12 +986,15 @@ export function transformDocument(document: Document): Document {
         }
         if ((ar.isEnum || (typeof ar.argType === 'string' && isScalar(ar.argType)))) {
           if (typeof ar.value !== 'object' || ar.argType === 'DateTime' || ar.argType === 'Json' || ar.value === null) {
-            ar.value = new Args([new Arg({
-              key: 'equals',
-              value: ar.value,
-              argType: ar.argType, // probably wrong but fine
-              schemaArg: ar.schemaArg // probably wrong but fine
-            })])
+            // if it's already an equals { X } do not add equals
+            if (!(ar.value instanceof Args)) {
+              ar.value = new Args([new Arg({
+                key: 'equals',
+                value: ar.value,
+                argType: ar.argType, // probably wrong but fine
+                schemaArg: ar.schemaArg // probably wrong but fine
+              })])
+            } 
           }
         } else if (