@subsquid/openreader 0.3.3 → 0.5.0

package/src/queryBuilder.ts

@@ -1,6 +1,5 @@
 import {toSnakeCase} from "@subsquid/util"
 import assert from "assert"
-import type {ClientBase, QueryArrayResult} from "pg"
 import {Database} from "./db"
 import type {Entity, JsonObject, Model} from "./model"
 import {getEntity, getFtsQuery, getObject, getUnionProps} from "./model.tools"
@@ -81,7 +80,7 @@ export class QueryBuilder {
                 break
             default:
                 if (columns.size()) {
-                    out += `SELECT ${columns.render()}\n`
+                    out += `SELECT ${columns.render(true)}\n`
                 }
         }
 
@@ -304,6 +303,15 @@ export class QueryBuilder {
 
     private addPropCondition(exps: string[], cursor: Cursor, field: string, op: WhereOp, arg: any): void {
         let propType = cursor.object.properties[field].type
+        if (op == 'isNull') {
+            let lhs = propType.kind == 'fk' ? cursor.fk(field) : cursor.field(field)
+            if (arg) {
+                exps.push(`${lhs} IS NULL`)
+            } else {
+                exps.push(`${lhs} IS NOT NULL`)
+            }
+            return
+        }
         switch(propType.kind) {
             case 'scalar':
             case 'enum': {
@@ -724,8 +732,12 @@ class ColumnSet {
         return idx
     }
 
-    render(): string {
-        return Array.from(this.columns.keys()).join(', ')
+    render(withAliases?: boolean): string {
+        let cols = Array.from(this.columns.keys())
+        if (withAliases) {
+            cols = cols.map((col, idx) => `${col} AS _c${idx}`)
+        }
+        return cols.join(', ')
     }
 
     size(): number {

package/src/test/isNull.test.ts

@@ -0,0 +1,79 @@
+import {useDatabase, useServer} from "./util/setup"
+
+
+describe('isNull operator', function() {
+    useDatabase([
+        `create table meta (id text primary key)`,
+        `create table entity (id text primary key, scalar text, json jsonb, meta_id text)`,
+        `insert into meta (id) values ('1')`,
+        `insert into entity (id, json, meta_id) values ('1', '{"a": 1}', '1')`,
+        `insert into entity (id, scalar, meta_id) values ('2', 'foo', '1')`,
+        `insert into entity (id, scalar, json) values ('3', 'foo', '{"a": 2}')`,
+        `insert into entity (id, scalar, json, meta_id) values ('4', 'foo', '{}', '1')`,
+    ])
+
+    const client = useServer(`
+        type Meta @entity {
+            id: ID!
+        }
+        
+        type Entity @entity {
+            id: ID!
+            scalar: String
+            json: JsonObject
+            meta: Meta
+        }
+        
+        type JsonObject {
+            a: Int
+        }
+    `)
+
+    it("on scalar", function() {
+        return client.test(`
+            query {
+                entities(where: {scalar_isNull: true}) {
+                    id
+                }
+            }
+        `, {
+            entities: [{id: '1'}]
+        })
+    })
+
+    it("on json", function() {
+        return client.test(`
+            query {
+                entities(where: {json_isNull: true}) {
+                    id
+                }
+            }
+        `, {
+            entities: [{id: '2'}]
+        })
+    })
+
+    it("on nested json prop", function() {
+        return client.test(`
+            query {
+                entities(where: {json: {a_isNull: true}} orderBy: id_ASC) {
+                    id
+                }
+            }
+        `, {
+            entities: [{id: '2'}, {id: '4'}]
+        })
+    })
+
+    it("on fk", function() {
+        return client.test(`
+            query {
+                entities(where: {meta_isNull: true}) {
+                    id
+                }
+            }
+        `, {
+            entities: [{id: '3'}]
+        })
+    })
+})

package/src/where.ts

@@ -1,6 +1,7 @@
 
 export type WhereOp =
     '-' | // no operator
+    'isNull' |
     'eq' | 'not_eq' |
     'gt' |
     'gte' |
@@ -19,6 +20,7 @@ export type WhereOp =
 
 
 const ENDINGS = [
+    'isNull',
     'eq',
     'not_eq',
     'gt',