@subsquid/openreader 0.2.1 → 0.3.1

package/README.md

@@ -1,7 +1,7 @@
 # OpenReader
 
-GraphQL server for Hydra. Given [hydra schema](https://docs.subsquid.io/schema-spec) 
-and compatible database it serves "read part" of [OpenCRUD spec](https://www.opencrud.org).
+GraphQL server for squid framework. Given [data schema](https://docs.subsquid.io/schema-spec) 
+and compatible Postgres database it serves "read part" of [OpenCRUD spec](https://www.opencrud.org).
 
 ## Usage
 
@@ -19,16 +19,3 @@ DB_HOST
 DB_PORT
 GRAPHQL_SERVER_PORT
 ```
-
-## Compatibility
-
-OpenReader is mostly compatible with previous warthog based implementation. 
-Below is possibly incomplete list of edge cases where it differs.
-
-1. If two object types participate in a same union, 
-then their properties must have either different names or have a same type (modulo nullability).
-2. Only camel case names of types and properties are allowed.
-3. Filtering on typed json fields works without `_json` operator.
-4. `orderBy` argument of relay connection is required, only forward pagination is supported.
-5. `RelayConnection.edges`, `RelayConnection.edges.node` and `FulltextSearch.item` fields
-do not support multiple aliases in GraphQL queries.

package/bin/main.js

@@ -0,0 +1,2 @@
+
+require('./dist/main')()

package/dist/db.d.ts

@@ -0,0 +1,27 @@
+import type { ClientBase, Pool, PoolConfig } from "pg";
+export interface Database {
+    query(sql: string, parameters?: any[]): Promise<any[][]>;
+    escapeIdentifier(name: string): string;
+}
+/**
+ * This is an interface OpenReader uses to interact with underling database.
+ */
+export interface Transaction {
+    get(): Promise<Database>;
+}
+export declare class PgDatabase implements Database {
+    private client;
+    constructor(client: ClientBase);
+    query(sql: string, parameters?: any[]): Promise<any[]>;
+    escapeIdentifier(name: string): string;
+}
+export declare class PoolTransaction implements Transaction {
+    private pool;
+    private tx;
+    private closed;
+    constructor(pool: Pool);
+    get(): Promise<Database>;
+    private startTransaction;
+    close(): Promise<void>;
+}
+export declare function createPoolConfig(): PoolConfig;

package/dist/db.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPoolConfig = exports.PoolTransaction = exports.PgDatabase = void 0;
+class PgDatabase {
+    constructor(client) {
+        this.client = client;
+    }
+    query(sql, parameters) {
+        return this.client.query({ text: sql, rowMode: 'array' }, parameters).then(result => result.rows);
+    }
+    escapeIdentifier(name) {
+        return this.client.escapeIdentifier(name);
+    }
+}
+exports.PgDatabase = PgDatabase;
+class PoolTransaction {
+    constructor(pool) {
+        this.pool = pool;
+        this.closed = false;
+    }
+    async get() {
+        if (this.closed) {
+            throw new Error('Too late to request transaction');
+        }
+        this.tx = this.tx || this.startTransaction();
+        let { db } = await this.tx;
+        return db;
+    }
+    async startTransaction() {
+        let client = await this.pool.connect();
+        try {
+            await client.query('START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY');
+            return {
+                client,
+                db: new PgDatabase(client)
+            };
+        }
+        catch (e) {
+            client.release();
+            throw e;
+        }
+    }
+    close() {
+        this.closed = true;
+        return this.tx?.then(async ({ client }) => {
+            try {
+                await client.query('COMMIT');
+            }
+            catch (e) {
+                // ignore
+            }
+            finally {
+                client.release();
+            }
+        }) || Promise.resolve();
+    }
+}
+exports.PoolTransaction = PoolTransaction;
+function createPoolConfig() {
+    return {
+        host: process.env.DB_HOST || 'localhost',
+        port: process.env.DB_PORT ? parseInt(process.env.DB_PORT) : 5432,
+        database: process.env.DB_NAME || 'postgres',
+        user: process.env.DB_USER || 'postgres',
+        password: process.env.DB_PASS || 'postgres'
+    };
+}
+exports.createPoolConfig = createPoolConfig;
+//# sourceMappingURL=db.js.map

package/dist/db.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":";;;AAiBA,MAAa,UAAU;IACnB,YAAoB,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;IAE1C,KAAK,CAAC,GAAW,EAAE,UAAkB;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAC,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACnG,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IAC7C,CAAC;CACJ;AAVD,gCAUC;AAGD,MAAa,eAAe;IAIxB,YAAoB,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;QAFtB,WAAM,GAAG,KAAK,CAAA;IAEW,CAAC;IAElC,KAAK,CAAC,GAAG;QACL,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACrD;QACD,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC5C,IAAI,EAAC,EAAE,EAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAA;QACxB,OAAO,EAAE,CAAA;IACb,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC1B,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QACtC,IAAI;YACA,MAAM,MAAM,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAA;YAC9E,OAAO;gBACH,MAAM;gBACN,EAAE,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;aAC7B,CAAA;SACJ;QAAC,OAAM,CAAM,EAAE;YACZ,MAAM,CAAC,OAAO,EAAE,CAAA;YAChB,MAAM,CAAC,CAAA;SACV;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,OAAO,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,EAAC,MAAM,EAAC,EAAE,EAAE;YACpC,IAAI;gBACA,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;aAC/B;YAAC,OAAM,CAAM,EAAE;gBACZ,SAAS;aACZ;oBAAS;gBACN,MAAM,CAAC,OAAO,EAAE,CAAA;aACnB;QACL,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;IAC3B,CAAC;CACJ;AAzCD,0CAyCC;AAGD,SAAgB,gBAAgB;IAC5B,OAAO;QACH,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW;QACxC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;QAChE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;QAC3C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;QACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU;KAC9C,CAAA;AACL,CAAC;AARD,4CAQC"}

package/dist/gql/opencrud.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildServerSchema = exports.generateOpenCrudQueries = void 0;
+const util_1 = require("@subsquid/util");
 const assert_1 = __importDefault(require("assert"));
 const graphql_1 = require("graphql");
 const orderBy_1 = require("../orderBy");
 const scalars_1 = require("../scalars");
-const util_1 = require("../util");
+const util_2 = require("../util");
 function generateOpenCrudQueries(model) {
     let out = new util_1.Output();
     generatePageInfoType();
@@ -47,10 +48,10 @@ function generateOpenCrudQueries(model) {
         for (let name in model) {
             let item = model[name];
             if (item.kind == 'entity') {
-                out.line(`${(0, util_1.lowerCaseFirst)(name)}ById(id: ID!): ${name}`);
-                out.line(`${(0, util_1.lowerCaseFirst)(name)}ByUniqueInput(where: ${name}WhereUniqueInput!): ${name} @deprecated(reason: "Use \`${(0, util_1.lowerCaseFirst)(name)}ById\`")`);
-                out.line(`${(0, util_1.lowerCaseFirst)((0, util_1.pluralize)(name))}${manyArguments(name)}: [${name}!]!`);
-                out.line(`${(0, util_1.lowerCaseFirst)((0, util_1.pluralize)(name))}Connection${connectionArguments(name)}: ${(0, util_1.pluralize)(name)}Connection!`);
+                out.line(`${(0, util_1.toCamelCase)(name)}ById(id: ID!): ${name}`);
+                out.line(`${(0, util_1.toCamelCase)(name)}ByUniqueInput(where: ${name}WhereUniqueInput!): ${name} @deprecated(reason: "Use \`${(0, util_1.toCamelCase)(name)}ById\`")`);
+                out.line(`${(0, util_2.toQueryListField)(name)}${manyArguments(name)}: [${name}!]!`);
+                out.line(`${(0, util_2.toQueryListField)(name)}Connection${connectionArguments(name)}: ${(0, util_1.toPlural)(name)}Connection!`);
             }
             if (item.kind == 'fts') {
                 generateFtsQuery(name, item);
@@ -261,7 +262,7 @@ function generateOpenCrudQueries(model) {
             out.line(`cursor: String!`);
         });
         out.line();
-        out.block(`type ${(0, util_1.pluralize)(name)}Connection`, () => {
+        out.block(`type ${(0, util_1.toPlural)(name)}Connection`, () => {
             out.line(`edges: [${name}Edge!]!`);
             out.line(`pageInfo: PageInfo!`);
             out.line(`totalCount: Int!`);
@@ -269,10 +270,10 @@ function generateOpenCrudQueries(model) {
         out.line();
     }
     function generateFtsTypes(name, query) {
-        let itemType = (0, util_1.upperCaseFirst)(name) + '_Item';
+        let itemType = name + '_Item';
         out.line(`union ${itemType} = ${query.sources.map(s => s.entity).join(' | ')}`);
         out.line();
-        out.block(`type ${(0, util_1.upperCaseFirst)(name)}Output`, () => {
+        out.block(`type ${name}_Output`, () => {
             out.line(`item: ${itemType}!`);
             out.line(`rank: Float!`);
             out.line(`highlight: String!`);
@@ -283,7 +284,7 @@ function generateOpenCrudQueries(model) {
         let where = query.sources.map(src => {
             return `where${src.entity}: ${src.entity}WhereInput`;
         });
-        out.line(`${name}(text: String! ${where.join(' ')} limit: Int offset: Int): [${(0, util_1.upperCaseFirst)(name)}Output!]!`);
+        out.line(`${name}(text: String! ${where.join(' ')} limit: Int offset: Int): [${name}_Output!]!`);
     }
     function generateDescription(description) {
         if (description) {

package/dist/gql/opencrud.js.map

@@ -1 +1 @@
-{"version":3,"file":"opencrud.js","sourceRoot":"","sources":["../../src/gql/opencrud.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opencrud.js","sourceRoot":"","sources":["../../src/gql/opencrud.ts"],"names":[],"mappings":"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"}

package/dist/main.d.ts

@@ -1,3 +1 @@
-#!/usr/bin/env node
-import { PoolConfig } from "pg";
-export declare function readDbConfig(): PoolConfig;
+export {};

package/dist/main.js

@@ -1,11 +1,10 @@
-#!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readDbConfig = void 0;
 const pg_1 = require("pg");
+const db_1 = require("./db");
 const server_1 = require("./server");
 const tools_1 = require("./tools");
-function main() {
+module.exports = function main() {
     let args = process.argv.slice(2);
     if (args.indexOf('--help') >= 0) {
         help();
@@ -16,7 +15,7 @@ function main() {
         process.exit(1);
     }
     let model = (0, tools_1.loadModel)(args[0]);
-    let db = new pg_1.Pool(readDbConfig());
+    let db = new pg_1.Pool((0, db_1.createPoolConfig)());
     let port = process.env.GRAPHQL_SERVER_PORT || 3000;
     (0, server_1.serve)({ model, db, port }).then(() => {
         console.log('OpenReader is listening on port ' + port);
@@ -24,34 +23,14 @@ function main() {
         console.error(err);
         process.exit(1);
     });
-}
-function readDbConfig() {
-    let db = {};
-    if (process.env.DB_HOST) {
-        db.host = process.env.DB_HOST;
-    }
-    if (process.env.DB_PORT) {
-        db.port = parseInt(process.env.DB_PORT);
-    }
-    if (process.env.DB_NAME) {
-        db.database = process.env.DB_NAME;
-    }
-    if (process.env.DB_USER) {
-        db.user = process.env.DB_USER;
-    }
-    if (process.env.DB_PASS) {
-        db.password = process.env.DB_PASS;
-    }
-    return db;
-}
-exports.readDbConfig = readDbConfig;
+};
 function help() {
     console.error(`
 Usage:  openreader SCHEMA
 
-OpenCRUD compatible GraphQL server.
+OpenCRUD GraphQL server.
 
-Can be configured using hydra environment variables:
+Can be configured using the following environment variables:
 
     DB_NAME
     DB_USER
@@ -61,7 +40,4 @@ Can be configured using hydra environment variables:
     GRAPHQL_SERVER_PORT
 `);
 }
-if (require.main === module) {
-    main();
-}
 //# sourceMappingURL=main.js.map

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;AAEA,2BAAmC;AACnC,qCAA8B;AAC9B,mCAAiC;AAGjC,SAAS,IAAI;IACT,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAEhC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC7B,IAAI,EAAE,CAAA;QACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IAED,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QAClB,IAAI,EAAE,CAAA;QACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IAED,IAAI,KAAK,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,IAAI,EAAE,GAAG,IAAI,SAAI,CAAC,YAAY,EAAE,CAAC,CAAA;IACjC,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAA;IAElD,IAAA,cAAK,EAAC,EAAC,KAAK,EAAE,EAAE,EAAE,IAAI,EAAC,CAAC,CAAC,IAAI,CACzB,GAAG,EAAE;QACD,OAAO,CAAC,GAAG,CAAC,kCAAkC,GAAG,IAAI,CAAC,CAAA;IAC1D,CAAC,EACD,GAAG,CAAC,EAAE;QACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,CACJ,CAAA;AACL,CAAC;AAGD,SAAgB,YAAY;IACxB,IAAI,EAAE,GAAe,EAAE,CAAA;IACvB,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACrB,EAAE,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAA;KAChC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACrB,EAAE,CAAC,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;KAC1C;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACrB,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAA;KACpC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACrB,EAAE,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAA;KAChC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACrB,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAA;KACpC;IACD,OAAO,EAAE,CAAA;AACb,CAAC;AAlBD,oCAkBC;AAGD,SAAS,IAAI;IACT,OAAO,CAAC,KAAK,CAAC;;;;;;;;;;;;;CAajB,CAAC,CAAA;AACF,CAAC;AAGD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IACzB,IAAI,EAAE,CAAA;CACT"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,2BAAuB;AACvB,6BAAqC;AACrC,qCAA8B;AAC9B,mCAAiC;AAGjC,MAAM,CAAC,OAAO,GAAG,SAAS,IAAI;IAC1B,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAEhC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC7B,IAAI,EAAE,CAAA;QACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IAED,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QAClB,IAAI,EAAE,CAAA;QACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IAED,IAAI,KAAK,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,IAAI,EAAE,GAAG,IAAI,SAAI,CAAC,IAAA,qBAAgB,GAAE,CAAC,CAAA;IACrC,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAA;IAElD,IAAA,cAAK,EAAC,EAAC,KAAK,EAAE,EAAE,EAAE,IAAI,EAAC,CAAC,CAAC,IAAI,CACzB,GAAG,EAAE;QACD,OAAO,CAAC,GAAG,CAAC,kCAAkC,GAAG,IAAI,CAAC,CAAA;IAC1D,CAAC,EACD,GAAG,CAAC,EAAE;QACF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,CACJ,CAAA;AACL,CAAC,CAAA;AAGD,SAAS,IAAI;IACT,OAAO,CAAC,KAAK,CAAC;;;;;;;;;;;;;CAajB,CAAC,CAAA;AACF,CAAC"}

package/dist/queryBuilder.d.ts

@@ -1,4 +1,4 @@
-import type { ClientBase } from "pg";
+import { Database } from "./db";
 import type { Model } from "./model";
 import { OpenCrudOrderByValue } from "./orderBy";
 import type { FtsRequestedFields, RequestedFields } from "./requestedFields";
@@ -13,7 +13,7 @@ export declare class QueryBuilder {
     private db;
     private params;
     private aliases;
-    constructor(model: Model, db: ClientBase);
+    constructor(model: Model, db: Database);
     private param;
     private ident;
     select(entityName: string, args: ListArgs, fields?: RequestedFields, variant?: SelectVariant): string;

package/dist/queryBuilder.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBuilder = void 0;
+const util_1 = require("@subsquid/util");
 const assert_1 = __importDefault(require("assert"));
 const model_tools_1 = require("./model.tools");
 const orderBy_1 = require("./orderBy");
 const scalars_1 = require("./scalars");
-const util_1 = require("./util");
+const util_2 = require("./util");
 const where_1 = require("./where");
 class QueryBuilder {
     constructor(model, db) {
@@ -25,7 +26,7 @@ class QueryBuilder {
     }
     select(entityName, args, fields, variant) {
         let entity = (0, model_tools_1.getEntity)(this.model, entityName);
-        let table = (0, util_1.toTable)(entityName);
+        let table = (0, util_2.toTable)(entityName);
         let alias = this.aliases.add(table);
         let join = new JoinSet(this.aliases);
         let cursor = new Cursor(this.model, this.ident.bind(this), this.aliases, join, entityName, entity, alias, '');
@@ -68,7 +69,7 @@ class QueryBuilder {
         if (variant?.kind == 'fts') {
             whereExps.push(`phraseto_tsquery('english', ${variant.textParam}) @@ ${cursor.tsv(variant.queryName)}`);
         }
-        let orderByInput = args.orderBy && (0, util_1.ensureArray)(args.orderBy);
+        let orderByInput = args.orderBy && (0, util_2.ensureArray)(args.orderBy);
         if (orderByInput?.length) {
             let orderBy = (0, orderBy_1.parseOrderBy)(this.model, entityName, orderByInput);
             this.populateOrderBy(orderByExps, cursor, orderBy);
@@ -113,7 +114,7 @@ class QueryBuilder {
                     this.populateOrderBy(exps, cursor.child(key), spec);
                     break;
                 default:
-                    throw (0, util_1.unsupportedCase)(propType.kind);
+                    throw (0, util_2.unsupportedCase)(propType.kind);
             }
         }
     }
@@ -152,7 +153,7 @@ class QueryBuilder {
                         }) + ')');
                         break;
                     default:
-                        throw (0, util_1.unsupportedCase)(field.propType.kind);
+                        throw (0, util_2.unsupportedCase)(field.propType.kind);
                 }
             }
         }
@@ -194,7 +195,7 @@ class QueryBuilder {
         }
         if (AND) {
             // We are getting objects here, although we have array in schema
-            (0, util_1.ensureArray)(AND).forEach((andWhere) => {
+            (0, util_2.ensureArray)(AND).forEach((andWhere) => {
                 if ((0, where_1.hasConditions)(andWhere)) {
                     exps.push(this.generateWhere(cursor, andWhere));
                 }
@@ -206,7 +207,7 @@ class QueryBuilder {
                 ors.push('(' + exps.join(' AND ') + ')');
             }
             // We are getting objects here, although we have array in schema
-            (0, util_1.ensureArray)(OR).forEach((orWhere) => {
+            (0, util_2.ensureArray)(OR).forEach((orWhere) => {
                 if ((0, where_1.hasConditions)(orWhere)) {
                     ors.push('(' + this.generateWhere(cursor, orWhere) + ')');
                 }
@@ -230,7 +231,7 @@ class QueryBuilder {
                         // 1. use array parameter and do: WHERE col IN (SELECT * FROM unnest($array_param))
                         // 2. use arg list
                         // Let's try second option first.
-                        let list = (0, util_1.ensureArray)(arg).map(a => this.param(a));
+                        let list = (0, util_2.ensureArray)(arg).map(a => this.param(a));
                         let param = `(${list.join(', ')})`;
                         exps.push(`${lhs} ${(0, where_1.whereOpToSqlOperator)(op)} ${param}`);
                         break;
@@ -279,7 +280,7 @@ class QueryBuilder {
                         exps.push(`NOT (${lhs} && ${param})`);
                         break;
                     default:
-                        throw (0, util_1.unsupportedCase)(op);
+                        throw (0, util_2.unsupportedCase)(op);
                 }
                 break;
             }
@@ -302,7 +303,7 @@ class QueryBuilder {
                 break;
             }
             default:
-                throw (0, util_1.unsupportedCase)(propType.kind);
+                throw (0, util_2.unsupportedCase)(propType.kind);
         }
     }
     toResult(rows, fields) {
@@ -354,7 +355,7 @@ class QueryBuilder {
                         rec[req.alias] = this.toResult(row[req.index], req.children);
                         break;
                     default:
-                        throw (0, util_1.unsupportedCase)(f.propType.kind);
+                        throw (0, util_2.unsupportedCase)(f.propType.kind);
                 }
             }
         }
@@ -362,21 +363,21 @@ class QueryBuilder {
     }
     async executeSelect(entityName, args, fields$) {
         let sql = this.select(entityName, args, fields$);
-        let result = await this.query(sql);
-        return this.toResult(result.rows, fields$);
+        let rows = await this.query(sql);
+        return this.toResult(rows, fields$);
     }
     async executeSelectCount(entityName, where) {
         let sql = `SELECT count(*) ${this.select(entityName, { where })}`;
-        let result = await this.query(sql);
-        return (0, util_1.toInt)(result.rows[0][0]);
+        let rows = await this.query(sql);
+        return (0, util_2.toInt)(rows[0][0]);
     }
     async executeListCount(entityName, args) {
         let sql = `SELECT count(*) FROM (SELECT true ${this.select(entityName, args)}) AS ${this.aliases.add('list')}`;
-        let result = await this.query(sql);
-        return (0, util_1.toInt)(result.rows[0][0]);
+        let rows = await this.query(sql);
+        return (0, util_2.toInt)(rows[0][0]);
     }
     query(sql) {
-        return this.db.query({ text: sql, rowMode: 'array' }, this.params);
+        return this.db.query(sql, this.params);
     }
     fulltextSearchSelect(queryName, args, $fields) {
         let query = (0, model_tools_1.getFtsQuery)(this.model, queryName);
@@ -436,8 +437,8 @@ class QueryBuilder {
     }
     async executeFulltextSearch(queryName, args, $fields) {
         let sql = this.fulltextSearchSelect(queryName, args, $fields);
-        let result = await this.query(sql);
-        return this.toFulltextSearchResult(result.rows, $fields);
+        let rows = await this.query(sql);
+        return this.toFulltextSearchResult(rows, $fields);
     }
 }
 exports.QueryBuilder = QueryBuilder;
@@ -479,7 +480,7 @@ class Cursor {
                     return (0, scalars_1.toOutputArrayCast)(itemType.name, this.column(propName));
                 }
             default:
-                throw (0, util_1.unsupportedCase)(prop.type.kind);
+                throw (0, util_2.unsupportedCase)(prop.type.kind);
         }
     }
     native(propName) {
@@ -519,17 +520,17 @@ class Cursor {
             case 'fk':
                 name = prop.type.foreignEntity;
                 object = (0, model_tools_1.getEntity)(this.model, name);
-                alias = this.join.add((0, util_1.toTable)(name), '"id"', this.fk(propName));
+                alias = this.join.add((0, util_2.toTable)(name), '"id"', this.fk(propName));
                 prefix = '';
                 break;
             case 'lookup':
                 name = prop.type.entity;
                 object = (0, model_tools_1.getEntity)(this.model, name);
-                alias = this.join.add((0, util_1.toTable)(name), this.ident((0, util_1.toFkColumn)(prop.type.field)), this.field('id'));
+                alias = this.join.add((0, util_2.toTable)(name), this.ident((0, util_2.toFkColumn)(prop.type.field)), this.field('id'));
                 prefix = '';
                 break;
             default:
-                throw (0, util_1.unsupportedCase)(prop.type.kind);
+                throw (0, util_2.unsupportedCase)(prop.type.kind);
         }
         return new Cursor(this.model, this.ident, this.aliases, this.join, name, object, alias, prefix);
     }
@@ -543,16 +544,16 @@ class Cursor {
     }
     column(name) {
         (0, assert_1.default)(this.object.kind == 'entity');
-        return this.ident(this.alias) + '.' + this.ident((0, util_1.toColumn)(name));
+        return this.ident(this.alias) + '.' + this.ident((0, util_2.toColumn)(name));
     }
     fk(propName) {
         return this.object.kind == 'entity'
-            ? this.ident(this.alias) + '.' + this.ident((0, util_1.toFkColumn)(propName))
+            ? this.ident(this.alias) + '.' + this.ident((0, util_2.toFkColumn)(propName))
             : (0, scalars_1.fromJsonCast)('ID', this.prefix, propName);
     }
     tsv(queryName) {
         (0, assert_1.default)(this.object.kind == 'entity');
-        return this.ident(this.alias) + '.' + this.ident((0, util_1.snakeCase)(queryName) + '_tsv');
+        return this.ident(this.alias) + '.' + this.ident((0, util_1.toSnakeCase)(queryName) + '_tsv');
     }
     doc(queryName) {
         (0, assert_1.default)(this.object.kind == 'entity');