pogi 3.0.0-beta2 → 3.0.0-beta3

package/src/queryAbleInterface.ts

@@ -1,104 +0,0 @@
-import { PgDbLogger } from "./pgDbLogger";
-import { IPgSchema } from "./pgSchemaInterface";
-import * as stream from "stream";
-import { ResultFieldType, IPgDb } from "./pgDbInterface";
-import { ForceEscapeColumnsOptions } from "./connectionOptions";
-
-export interface QueryOptions {
-    limit?: number;
-    offset?: number;
-    orderBy?: string | string[] | { [fieldName: string]: 'asc' | 'desc' };//free text or column list
-    /** 
-     * only used with orderBy
-     * true -> nulls first, 
-     * false -> nulls last 
-     */
-    orderByNullsFirst?: boolean;
-    groupBy?: string | string[];//free text or column list
-    fields?: string | string[];//free text or column list
-    logger?: PgDbLogger;
-    forUpdate?: boolean;
-    distinct?: boolean;
-    skipUndefined?: boolean;
-    forceEscapeColumns?: boolean | ForceEscapeColumnsOptions
-}
-
-export interface SqlQueryOptions {
-    logger?: PgDbLogger;
-}
-
-
-
-export interface ResultType {
-    command: 'SELECT' | 'UPDATE' | 'DELETE',
-    rowCount: number,
-    oid: number,
-    rows: any[],
-    fields: ResultFieldType[],
-    _parsers: Function[][],
-    RowCtor: Function[],
-    rowsAsArray: boolean,
-    _getTypeParser: Function[]
-}
-
-export interface PgRowResult {
-    columns: string[],
-    rows: any[]
-}
-
-let defaultLogger = {
-    log: () => { },
-    error: () => { }
-};
-
-
-
-export interface IQueryAble {
-    db: IPgDb & IQueryAble;  // assigned in async init
-    schema: IPgSchema;
-    logger: PgDbLogger;
-
-    /*connectionErrorListener : () => { }*/
-
-    setLogger(logger: PgDbLogger): void
-
-    getLogger(useConsoleAsDefault: boolean): PgDbLogger
-
-    /** alias to {@link query} */
-    run(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>
-
-    /**
-     * Params can be
-     * 1) array, then sql should have $1 $2 for placeholders
-     * 2) object, then sql should have:
-     *    :example -> for params in statements (set/where), will be transformed to $1 $2 ...
-     *    :!example -> for DDL names (schema, table, column), will be replaced in the query
-     * e.g. query('select * from a.b where id=$1;',['the_stage_is_set']);
-     * e.g. query('select * from :!schema.:!table where id=:id;',{schema:'a',table:'b', id:'the_stage_is_set'});
-     */
-    query(sql: string, params?: any[] | {} | null, options?: SqlQueryOptions): Promise<any[]>
-
-    /**
-     * Same as query but response is two array: columns and rows and rows are arrays also not objects
-     * This is useful for queries which have colliding column names
-     */
-    queryAsRows(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<PgRowResult>
-
-    /**
-     * If the callback function return true, the connection will be closed.
-     */
-    queryWithOnCursorCallback(sql: string, params: any[] | Record<string, any> | null, options: SqlQueryOptions | null, callback: (res: any) => any): Promise<void>
-
-    queryAsStream(sql: string, params?: any[] | Record<string, any> | null, options?: SqlQueryOptions | null): Promise<stream.Readable>
-
-    queryOne(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>
-
-    queryFirst(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>
-
-    /** @return one record's one field */
-    queryOneField(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>
-
-    /** @return one column for the matching records */
-    queryOneColumn(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>
-
-}

package/src/queryWhere.ts

@@ -1,325 +0,0 @@
-import operationsMap from "./pgDbOperators";
-import { FieldType } from "./pgDb";
-import _ = require("lodash");
-import util = require("util");
-import { pgUtils } from "./pgUtils";
-
-interface FieldAndOperator {
-    field: string;
-    quotedField: string;
-    operator: string;
-    originalOp: string;
-    mutator?: Function;
-}
-
-interface Result {
-    params: any[],
-    predicates: string[],
-    offset: number
-}
-
-/** public */
-function generateWhere(conditions: Record<string, any>, fieldTypes: { [index: string]: FieldType }, tableName: string, placeholderOffset = 0, skipUndefined?: boolean): { where: string, params: Array<any> } {
-    let result = generate({
-        params: [],
-        predicates: [],
-        offset: placeholderOffset,
-    }, conditions, fieldTypes, tableName, skipUndefined);
-
-    return {
-        where: result.predicates.length > 0 ? ' WHERE ' + result.predicates.join(' AND ') : '',
-        params: result.params
-    };
-}
-
-/** private */
-function generate(result: Result, conditions: Record<string, any>, fieldTypes: { [index: string]: FieldType }, tableName: string, skipUndefined?: boolean): Result {
-    _.each(conditions, (value, key) => {
-        //get the column field and the operator if specified
-        let fieldAndOperator = parseKey(key);
-
-        if (value === undefined) { //null is ok, but undefined is skipped if requested
-            if (skipUndefined === true) return;
-            throw new Error('Invalid conditions! Field value undefined: "' + fieldAndOperator.field + '". Either delete the field, set it to null or use the options.skipUndefined parameter.');
-        }
-        else if (fieldAndOperator.field === 'or' || fieldAndOperator.field === 'and') {
-            result = handleOrAnd(result, fieldAndOperator, value, fieldTypes, tableName, skipUndefined);
-        }
-        else if (value === null) {
-            result = handleNullValue(result, fieldAndOperator, value);
-        }
-        else if (Array.isArray(value)) {
-            result = handleArrayValue(result, fieldAndOperator, value, fieldTypes);
-        }
-        else {
-            result = handleSingleValue(result, fieldAndOperator, value, fieldTypes, tableName);
-        }
-    });
-
-    return result;
-}
-
-function handleOrAnd(result: Result, fieldAndOperator: FieldAndOperator, value: any, fieldTypes: { [index: string]: FieldType }, tableName: string, skipUndefined?: boolean): Result {
-    if (!Array.isArray(value)) {
-        value = [value];
-    }
-
-    let groupResult = _.reduce(value, (acc, v) => {
-        // assemble predicates for each subgroup in this 'or' array
-        let subResult = generate({
-            params: [],
-            predicates: [],
-            offset: result.params.length + acc.offset   // ensure the offset from predicates outside the subgroup is counted
-        }, v, fieldTypes, tableName, skipUndefined);
-
-        // encapsulate and join the individual predicates with AND to create the complete subgroup predicate
-        acc.predicates.push('(' + subResult.predicates.join(' AND ') + ')');
-        acc.params = acc.params.concat(subResult.params);
-        acc.offset += subResult.params.length;
-
-        return acc;
-    }, <Result>{
-        params: [],
-        predicates: [],
-        offset: result.offset
-    });
-
-    // join the compiled subgroup predicates with OR, encapsulate, and push the
-    // complex predicate ("((x = $1 AND y = $2) OR (z = $3))") onto the result object
-    result.params = result.params.concat(groupResult.params);
-    if (groupResult.predicates.length) {
-        if (fieldAndOperator.field === 'and') {
-            result.predicates.push(util.format('(%s)', groupResult.predicates.join(' AND ')));
-        } else {
-            result.predicates.push(util.format('(%s)', groupResult.predicates.join(' OR ')));
-        }
-    }
-    return result;
-}
-
-function handleNullValue(result: Result, fieldAndOperator: FieldAndOperator, value: any): Result {
-    fieldAndOperator.operator = fieldAndOperator.operator === '=' ? 'IS' : 'IS NOT';
-    result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, value));
-    return result;
-}
-
-function handleArrayValue(result: Result, fieldAndOperator: FieldAndOperator, value: any[], fieldTypes: { [index: string]: FieldType }): Result {
-    if (fieldAndOperator.mutator) {
-        value = value.map((v: any) => fieldAndOperator.mutator!(v));
-    }
-    let fieldType = fieldTypes[fieldAndOperator.field];
-
-    let position = '$' + (result.params.length + 1 + result.offset);
-    if (fieldType == FieldType.JSON &&
-        ['?|', '?&'].indexOf(fieldAndOperator.operator) != -1) {
-        result.params.push(value);
-        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
-        return result;
-    }
-    else if (fieldType == FieldType.JSON &&
-        ['@>', '<@', '&&'].indexOf(fieldAndOperator.operator) != -1) {
-        result.params.push(JSON.stringify(value));
-        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
-        return result;
-    }
-    else if ((!fieldType || fieldType == FieldType.TIME) &&
-        ['=', '<>', 'IN', 'NOT IN'].includes(fieldAndOperator.operator)) {
-        if (fieldAndOperator.operator === '=' || fieldAndOperator.operator === 'IN') {
-            fieldAndOperator.operator = '= ANY';
-        } else {
-            fieldAndOperator.operator = '<> ALL';
-        }
-
-        if (value.length === 0) {  // avoid empty "[NOT] IN ()"
-            throw new Error('Invalid conditions! empty array for field:"' + fieldAndOperator.field + '" and operator:"' + fieldAndOperator.operator + '"');
-            //return result;
-        }
-
-        result.params.push(value
-            .map(v => (fieldType == FieldType.TIME && !(v instanceof Date)) ? new Date(v) : v)
-        );
-        result.predicates.push(util.format('%s %s (%s)', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
-        return result;
-    }
-    else if (!fieldType && ['LIKE', 'ILIKE', 'SIMILAR TO', '~', '~*'].indexOf(fieldAndOperator.operator) != -1) {
-        //defaults to any
-        result.params.push(value);
-        result.predicates.push(util.format('%s %s ANY(%s)', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
-        return result;
-    }
-    else if (!fieldType && ['NOT LIKE', 'NOT ILIKE', 'NOT SIMILAR TO', '!~', '!~*'].indexOf(fieldAndOperator.operator) != -1) {
-        //defaults to all
-        result.params.push(value);
-        result.predicates.push(util.format('%s %s ALL(%s)', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
-        return result;
-    }
-    else if (fieldType == FieldType.ARRAY &&
-        ['=', '<>', '<', '>', '<=', '>=', '@>', '<@', '&&'].indexOf(fieldAndOperator.operator) != -1) {
-        result.params.push(value);
-        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
-        return result;
-    }
-
-    throw new Error('[325] Not implemented operator: "' + fieldAndOperator.operator + '" for field ' + fieldAndOperator.field + ' with type ' + fieldType);
-}
-
-
-function handleSingleValue(result: Result, fieldAndOperator: FieldAndOperator, value: any, fieldTypes: { [index: string]: FieldType }, tableName: string): Result {
-    if (fieldAndOperator.mutator) {
-        value = fieldAndOperator.mutator(value);
-    }
-    let fieldType = fieldTypes[fieldAndOperator.field];
-    if (fieldAndOperator.operator === '@@') {
-        /**
-         * field can be string -> to_tsquery(string)
-         * or object {lang:'english', txt:string} -> to_tsquery(o.lang, o.txt)
-         */
-        if (typeof value == 'object') {
-            if (!(value.lang || value.language) || !(value.query || value.plainquery)) {
-                throw new Error('[499] only "lang"/"language" and "query/plainquery" properties are supported!');
-            }
-            if (fieldType == FieldType.TSVECTOR) {
-                //language is already set
-                result.params.push(value.lang || value.language);
-                result.params.push(value.query || value.plainquery);
-                let template = value.query ? "%s %s to_tsquery($%s, $%s)" : "%s %s plainto_tsquery($%s, $%s)";
-                result.predicates.push(util.format(template,
-                    fieldAndOperator.quotedField,
-                    fieldAndOperator.operator,
-                    result.params.length - 1 + result.offset, //lang
-                    result.params.length + result.offset //query
-                ));
-            } else {
-                result.params.push(value.lang || value.language);
-                result.params.push(value.lang || value.language);
-                result.params.push(value.query || value.plainquery);
-                let template = value.query ? "to_tsvector($%s, %s) %s to_tsquery($%s, $%s)" : "to_tsvector($%s, %s) %s plainto_tsquery($%s, $%s)";
-                result.predicates.push(util.format(template,
-                    result.params.length - 2 + result.offset, //lang
-                    fieldAndOperator.quotedField,
-                    fieldAndOperator.operator,
-                    result.params.length - 1 + result.offset, //lang
-                    result.params.length + result.offset //query
-                ));
-            }
-        } else {
-            result.params.push(value);
-            let template = fieldType == FieldType.TSVECTOR ? "%s %s plainto_tsquery($%s)" : "to_tsvector(%s) %s plainto_tsquery($%s)";
-            result.predicates.push(util.format(template, fieldAndOperator.quotedField, fieldAndOperator.operator, result.params.length + result.offset));
-        }
-    }
-    else if (fieldType == FieldType.ARRAY) {
-        if (['=', '<>'].indexOf(fieldAndOperator.operator) != -1) {
-            if (fieldAndOperator.originalOp == '=*') {
-                result.params.push([value]);
-                value = util.format("$%s", result.params.length + result.offset);
-                result.predicates.push(util.format('%s && %s', fieldAndOperator.quotedField, value));
-            } else {
-                result.params.push(value);
-                value = util.format("$%s", result.params.length + result.offset);
-                result.predicates.push(util.format('%s %s ANY(%s)', value, fieldAndOperator.operator, fieldAndOperator.quotedField));
-            }
-        }
-        else if (['LIKE', 'ILIKE', 'NOT LIKE', 'NOT ILIKE', 'SIMILAR TO', 'NOT SIMILAR TO'].indexOf(fieldAndOperator.operator) != -1) {
-            result.params.push(value);
-            value = util.format("$%s", result.params.length + result.offset);
-
-            let q = 'EXISTS (SELECT * FROM (SELECT UNNEST(' + tableName + '.%s) _el) _arr WHERE _arr._el %s %s)';
-            result.predicates.push(util.format(q, fieldAndOperator.quotedField, fieldAndOperator.operator, value));
-        } else {
-            throw new Error('[326] Not implemented operator: "' + fieldAndOperator.operator + '" for type ' + fieldType);
-        }
-    } else {
-        result.params.push((fieldType == FieldType.TIME && !(value instanceof Date)) ? new Date(value) : value);
-        value = util.format("$%s", result.params.length + result.offset);
-        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, value));
-    }
-    return result;
-}
-
-
-function strip(arr: string[]): string[] {
-    return arr.map((s) => s.trim()).filter(v => v != '');
-}
-
-function getOp(str: string): string {
-    for (let i = 0; i < str.length; i++) {
-        if (operationsMap[str.substr(i)]) {
-            return str.substr(i);
-        }
-    }
-    return '';
-}
-
-/**
- * Parse out a criterion key into something more intelligible. Supports quoted
- * field names and whitespace between components. If a function is applied on the field
- * it takes the first quoted string to assume to be the column. (e.g. max("score") -> field: "score"
- * in order to be able to recognize the field type)
- *
- * 'createdTs >' => {
- *                   field:       'createdTs',
- *                   quotedField: '"createdTs"',
- *                   operator:'>',
- *                   mutator:null
- *                   }
- *
- * @param  {String} key Key in a format resembling "field [JSON operation+path] operation"
- * @return {Object}     [description]
- */
-function parseKey(key: string): FieldAndOperator {
-    key = key.trim();
-
-    let userOp = getOp(key);
-    if (userOp) {
-        key = key.substr(0, key.length - userOp.length)
-    }
-    let operation = operationsMap[userOp] || {};
-    let jsonRegexp = /(->[^>]|->>|#>[^>]|#>>)/;
-
-    let field: string | undefined;
-    let quotedField: string;
-
-    let quotedByUser = key.indexOf('"') > -1; //key[0]=='"'; -> lets make it possible to write transformed columns, e.g. LOWER("field")
-    if (quotedByUser) {
-        quotedField = key;
-        //field is used for find out the type of the field, so lets restore it if possible, grab the first quoted string
-        field = /[^"]*"([^"]*)".*/.exec(key)?.[1];
-        if (!quotedField || !field) {
-            throw new Error('Invalid field:' + key);
-        }
-    } else {
-        let parts = strip(key.split(jsonRegexp));
-        field = parts.shift();
-        if (!field) {
-            throw new Error('Invalid field:' + key);
-        }
-        quotedField = pgUtils.quoteFieldName(field);
-
-        if (parts.length > 1) {
-            let jsonOp = parts.shift()!;
-            let jsonKey = parts.shift()!;
-
-            jsonKey = pgUtils.quoteFieldNameJsonbOrPosition(jsonKey);
-            quotedField = util.format('%s%s%s', quotedField, jsonOp, jsonKey);
-        }
-    }
-
-
-    if (operation.fieldMutator) {
-        quotedField = operation.fieldMutator(field, quotedField);
-    }
-
-
-    return {
-        field: field,
-        quotedField: quotedField,
-        operator: (operation.operator || '=').toUpperCase(),
-        mutator: operation.mutator,
-        originalOp: userOp
-    };
-}
-
-
-export default generateWhere;
-

package/src/test/init.sql

@@ -1,122 +0,0 @@
-SET search_path TO __SCHEMA__;
-DROP FUNCTION IF EXISTS list_gold_users();
-DROP FUNCTION IF EXISTS increment();
-
--- drop tables
-DROP VIEW IF EXISTS "users_view";
-DROP TABLE IF EXISTS "users";
-DROP TABLE IF EXISTS "groups";
-DROP TABLE IF EXISTS "types";
--- drop sequences
-DROP SEQUENCE IF EXISTS "users_id_seq";
--- drop types
-DROP TYPE IF EXISTS __SCHEMA__."membershipType";
-DROP TYPE IF EXISTS __SCHEMA__."categoryType";
-DROP TYPE IF EXISTS __SCHEMA__."permissionForResourceType";
-DROP TYPE IF EXISTS __SCHEMA__."permissionType";
-
-DROP FUNCTION IF EXISTS update_tsv();
-
-
-CREATE TYPE __SCHEMA__."membershipType" AS ENUM ('bronze', 'silver', 'gold');
-CREATE TYPE __SCHEMA__."categoryType" AS ENUM ('sport', 'food', 'tech', 'music');
-CREATE TYPE __SCHEMA__."permissionType" AS ENUM ('read', 'write', 'admin');
-CREATE TYPE __SCHEMA__."permissionForResourceType" AS (
-    "permission"    "permissionType",
-    "resource"      "text"
-);
-
-CREATE TABLE IF NOT EXISTS "groups" (
-	"id" SERIAL PRIMARY KEY,
-	"name" varchar UNIQUE NOT NULL
-);
-
-CREATE SEQUENCE "users_id_seq";
-CREATE TABLE IF NOT EXISTS "users" (
-	"id" varchar PRIMARY KEY NOT NULL DEFAULT ('us' || nextval('users_id_seq')::text || (LPAD(floor(random()*100)::text, 2, '0'))),
-	"name" varchar UNIQUE NOT NULL,
-    "aCategory" varchar,
-
-	"textList" text[],
-	"jsonbList" jsonb[],
-	"numberList" integer[], -- int4
-	"bigNumberList" bigInt[],  -- int8
-	"timestamptzList" timestamptz[],
-
-	"membership" "membershipType",
-    "favourites" "categoryType"[],
-
-	"jsonList" jsonb,
-	"jsonObject" jsonb,
-    "mainGroup" integer REFERENCES groups(id),
-	"permission" "permissionForResourceType",
-	"permissionList" "permissionForResourceType"[],
-
-	"tsv" tsvector,
-	"updated" timestamp with time zone,
-	"created" timestamp,
-	"createdtz" timestamptz
-);
-
-CREATE TABLE IF NOT EXISTS "types" (
-	"text" varchar,
-	"int" integer,
-	"bigInt" bigInt,
-	"real" real,
-	"double" float8,
-	"bool" boolean,
-	"json" json,
-	"jsonB" jsonb,
-	"timestamptz" timestamptz,
-
-	"arrayText" varchar[],
-	"arrayInt" integer[],
-	"arrayBigInt" bigInt[],
-	"arrayReal" real[],
-	"arrayDouble" float8[],
-	"arrayBool" boolean[],
-	"arrayJson" json[],
-	"arrayJsonB" jsonb[],
-	"arrayTimestamptz" timestamptz[]
-);
-
-
-CREATE OR REPLACE FUNCTION update_updated_column() RETURNS TRIGGER AS $$
-BEGIN
-    NEW.updated = now();
-    RETURN NEW;
-END;
-$$ language 'plpgsql';
-
-CREATE TRIGGER "update_users_updated" BEFORE INSERT ON "users" FOR EACH ROW EXECUTE PROCEDURE __SCHEMA__.update_updated_column();
-
-CREATE OR REPLACE FUNCTION list_gold_users()
-RETURNS SETOF varchar AS $$
-    SELECT name FROM __SCHEMA__.users WHERE membership = 'gold';
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION increment(i INT)
-RETURNS INT AS $$
-BEGIN
-  RETURN i + 1;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE FUNCTION update_tsv() RETURNS trigger AS $$
-begin
-  new.tsv :=
-     setweight(to_tsvector('pg_catalog.english', coalesce(new.name,'')), 'A') ||
-     setweight(to_tsvector('pg_catalog.english', coalesce(new."aCategory",'')), 'B') ||
-     setweight(to_tsvector('pg_catalog.english', coalesce(new."jsonList"::text,'')), 'C');
-  return new;
-end
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER update_tsv BEFORE INSERT OR UPDATE ON __SCHEMA__."users" FOR EACH ROW EXECUTE PROCEDURE update_tsv();
-
-CREATE OR REPLACE FUNCTION LOWER(text[]) RETURNS text[] LANGUAGE SQL IMMUTABLE AS
-$$
-    SELECT array_agg(LOWER(value)) FROM unnest($1) value;
-$$;
-
-CREATE OR REPLACE VIEW users_view AS SELECT * FROM users;