pogi 3.0.0-beta → 3.0.0-beta5

package/src/bin/generateInterface.ts

@@ -1,54 +0,0 @@
-import {PgDb} from "../pgDb";
-import {PgSchema} from "../pgSchema";
-import {PgTable} from "../pgTable";
-
-(async function () {
-    try {
-        let pgdb = await PgDb.connect({
-            logger: {
-                log: () => {
-                }, error: console.error
-            }
-        }); //using PGUSER, PGPASSWORD + PGDATABASE env variables
-
-        console.log('import {PgDb, PgSchema, PgTable} from "pogi";\n');
-        console.log('export interface PgDbType extends PgDb {');
-
-        for (let schemaName in pgdb.schemas) {
-            if (!(pgdb[schemaName] instanceof PgSchema)) {
-                throw new Error('Already existing property: ' + schemaName + '!');
-            }
-            console.log(`    '${schemaName}': PgSchema_${schemaName};`); //need to add a PgSchema_ prefix in order to handle schemas starting with number
-        }
-
-        console.log(`    'schemas': {`);
-        for (let schemaName in pgdb.schemas) {
-            console.log(`        '${schemaName}': PgSchema_${schemaName};`);
-        }
-        console.log('    }');
-        console.log('}');
-
-        for (let schemaName in pgdb.schemas) {
-            console.log(`export interface PgSchema_${schemaName} extends PgSchema {`);
-            for (let tableName in pgdb.schemas[schemaName].tables) {
-                if (!(pgdb[schemaName][tableName] instanceof PgTable)) {
-                    throw new Error('Already existing property: ' + tableName + ' on schema:' + schemaName + '!');
-                }
-                console.log(`    '${tableName}': PgTable<any>;`);
-            }
-            console.log(`    tables: {`);
-            for (let tableName in pgdb.schemas[schemaName].tables) {
-                console.log(`        '${tableName}': PgTable<any>;`);
-            }
-            console.log('    }');
-
-            console.log('}');
-        }
-
-
-        pgdb.close();
-    } catch (e) {
-        console.error(e);
-    }
-    return Promise.resolve();
-})();

package/src/connectionOptions.ts

@@ -1,75 +0,0 @@
-import { PgDbLogger } from './pgDbLogger';
-
-/**
- * @property connectionString e.g.: "postgres://user@localhost/database"
- * @property host can be specified through PGHOST env variable
- * @property user can be specified through PGUSER env variable (defaults USER env var)
- * @property database can be specified through PGDATABASE env variable (defaults USER env var)
- * @property password can be specified through PGPASSWORD env variable
- * @property port can be specified through PGPORT env variable
- * @property idleTimeoutMillis how long a client is allowed to remain idle before being closed
- * @property skipUndefined if there is a undefined value in the condition, what should pogi do. Default is 'none', meaning raise error if a value is undefined.
- * @property logSQLDetailsOnError - log sql and params in case of sql error (this might contain sensitive information)
- */
-export interface ConnectionOptions {
-    /** host can be specified through PGHOST env variable (defaults USER env var) */
-    host?: string;
-    /** user can be specified through PGUSER env variable (defaults USER env var) */
-    user?: string;
-    /** can be specified through PGDATABASE env variable (defaults USER env var) */
-    database?: string;
-    /** can be specified through PGPASSWORD env variable */
-    password?: string;
-    /** can be specified through PGPORT env variable */
-    port?: number;
-    poolSize?: number;
-
-    /**
-     * Turn on some basic sql injection protection
-     */
-    forceEscapeColumns?: boolean | {
-        select?: boolean
-        where?: boolean
-        orderBy?: boolean
-        groupBy?: boolean
-        //warningOnly?: boolean
-    }
-
-    //number of rows to return at a time from a prepared statement's portal. 0 will return all rows at once
-    rows?: number;
-    /** set min pool size */
-    min?: number;
-    /** set pool max size */
-    max?: number;
-
-    binary?: boolean;
-    poolIdleTimeout?: number;
-    reapIntervalMillis?: number;
-    poolLog?: boolean;
-    client_encoding?: string;
-    ssl?: boolean | any; //| TlsOptions;
-    /** default:process.env.PGAPPNAME - name displayed in the pg_stat_activity view and included in CSV log entries */
-    application_name?: string;
-    fallback_application_name?: string;
-    parseInputDatesAsUTC?: boolean;
-    /** e.g.: "postgres://user@localhost/database" */
-    connectionString?: string;
-    /** how long a client is allowed to remain idle before being closed */
-    idleTimeoutMillis?: number;
-
-    logger?: PgDbLogger;
-    /** if there is a undefined value in the condition, what should pogi do. Default is 'none', meaning raise error if a value is undefined. */
-    skipUndefined?: 'all' | 'select' | 'none';
-
-    /** 
-     * escape all ddl parameter (select, from, where, order by, group by, ...), default: true 
-     * notes:
-     * - insert statements columns are always quoted
-     * - update statements "SET" columns are always quoted
-     * */
-    strictDdl?: boolean,
-    /** escape all "SELECT" ddl parameter, default: true */
-    strictDdlSelect?: boolean,
-    /** escape all "WHERE" ddl parameter, default: true */
-    strictDdlWhere?: boolean,
-}

package/src/index.d.ts

@@ -1,7 +0,0 @@
-import * as pg from 'pg';
-
-declare module 'pg' {
-    export interface PoolClient {
-        processID: string,
-    }
-}

package/src/index.ts

@@ -1,6 +0,0 @@
-export { PgDb } from './pgDb';
-export { ConnectionOptions } from './connectionOptions';
-export { PgDbLogger } from './pgDbLogger';
-export { PgTable } from './pgTable';
-export { PgSchema } from './pgSchema';
-export { QueryOptions } from './queryAble';

package/src/pgConverters.test.ts

@@ -1,10 +0,0 @@
-import { parseArray } from "./pgConverters";
-
-describe("pgConverters.test", () => {
-    it("parseArray", async () => {
-        expect(parseArray('{}')).toEqual([]);
-        expect(parseArray('{1,2}')).toEqual(['1', '2']);
-        expect(parseArray('{NULL,""}')).toEqual([null, '']);
-        expect(parseArray('{"\\\\","\\""}')).toEqual(['\\', '"']);
-    });
-});

package/src/pgConverters.ts

@@ -1,59 +0,0 @@
-import * as moment from 'moment';
-
-//--- add parsing for array types --------------------------------
-export function parseArray(s: string): (string | null)[] {
-    if (!s || s[0] !== '{' || s[s.length - 1] !== '}') throw new Error('Invalid array value:' + s);
-    if (s == "{}") return [];
-    s = s.slice(1, s.length - 1); //cut off {}
-    let e = /(?:("(?:[^"\\]|\\.)*")|([^,"]*))(?:,|$)/g; //has to be mutable because of exec
-    let valList: (string | null)[] = [];
-    let parsingResult;
-    do {
-        parsingResult = e.exec(s);
-        if (!parsingResult) throw new Error('Invalid array value:' + s);
-        let valStr = (parsingResult[2] === 'NULL') ? null :
-            (parsingResult[1] == null ? parsingResult[2] : unescapeString(parsingResult[1])); // for string parsing, escape \
-        valList.push(valStr);
-    } while (e.lastIndex < s.length);
-    return valList;
-};
-
-export function parseNumberWithValidation(s: string): number | null {
-    if (s === 'NULL') {
-        return null;
-    }
-    let v = +s;
-    if (v > Number.MAX_SAFE_INTEGER || v < Number.MIN_SAFE_INTEGER) {
-        throw new Error("Number can't be represented in javascript precisely: " + s);
-    }
-    return v;
-};
-
-export function parseNumberOrNull(s: string): number | null {
-    if (s === 'NULL') {
-        return null;
-    }
-    return +s;
-};
-
-export function parseBoolOrNull(s: string): boolean | null {
-    if (s === 'NULL') {
-        return null;
-    }
-    return s == 't';
-}
-
-export let parseBooleanArray = (s: string): (boolean | null)[] => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(parseBoolOrNull);
-export let parseNumberArray = (s: string): (number | null)[] => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(parseNumberOrNull);
-export let parseNumberArrayWithValidation = (s: string[]) => s.map(parseNumberWithValidation);
-export let parseDateArray = (s: string): (Date | null)[] => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(d => d == 'NULL' ? null : moment(d.substring(1, d.length - 1)).toDate());
-export let parseJsonArray = (s: string): (Object | null)[] => {
-    let vals = parseArray(s);
-    return vals.map(s2 => typeof s2 === 'string' ? JSON.parse(s2) : s2);
-};
-
-function unescapeString(s: string): string {
-    return s.slice(1, s.length - 1)    // cut the first and the last "
-        .replace(/\\"/g, '"')          // \" -> "
-        .replace(/\\\\/g, '\\')        // \\ -> \
-}