openreader: correctly handle filter with null value in thegraph diale…

…ct (#320)
subsquid · Jul 23, 2024 · 79fbfe5 · 79fbfe5
1 parent c91a92c
commit 79fbfe5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...graph-compatebility_2024-07-11-14-20.json → ...graph-compatebility_2024-07-23-14-07.json b/...graph-compatebility_2024-07-11-14-20.json → ...graph-compatebility_2024-07-23-14-07.json
diff --git a/graphql/openreader/src/dialect/thegraph/where.ts b/graphql/openreader/src/dialect/thegraph/where.ts
@@ -13,12 +13,20 @@ export function parseWhere(whereArg?: any): Where | undefined {
         let arg = fields[key]
         let {field, op} = parseWhereKey(key)
         switch (op) {
-            case 'SELF':
-                conj.push({op: 'eq', field, value: arg})
+            case 'EQ':
+                if (arg === null) {
+                    conj.push({op: 'isNull', field, yes: true})
+                } else {
+                    conj.push({op: 'eq', field, value: arg})
+                }
                 break
             case '_': {
-                let where = parseWhere(arg)
-                where && conj.push({op: 'REF', field, where})
+                if (arg === null) {
+                    conj.push({op: 'isNull', field, yes: true})
+                } else {
+                    let where = parseWhere(arg)
+                    where && conj.push({op: 'REF', field, where})
+                }
                 break
             }
             case '_every': {
@@ -140,12 +148,12 @@ export function parseWhere(whereArg?: any): Where | undefined {
     }
 }
 
-export function parseWhereKey(key: string): {op: (typeof WHERE_OPS)[number] | 'SELF'; field: string} {
+export function parseWhereKey(key: string): {op: (typeof WHERE_OPS)[number] | 'EQ'; field: string} {
     let m = WHERE_KEY_REGEX.exec(key)
     if (m) {
         return {op: m[2] as (typeof WHERE_OPS)[number], field: m[1]}
     } else {
-        return {op: 'SELF', field: key}
+        return {op: 'EQ', field: key}
     }
 }