@oino-ts/db-postgresql 0.3.3 → 0.4.0

package/dist/cjs/OINODbPostgresql.js

@@ -186,9 +186,18 @@ class OINODbPostgresql extends db_1.OINODb {
             return "\'" + cellValue.toISOString() + "\'";
         }
         else {
-            return "\'" + cellValue?.toString().replaceAll("'", "''") + "\'";
+            return this.printSqlString(cellValue.toString());
         }
     }
+    /**
+     * Print a single string value as valid sql literal
+     *
+     * @param sqlString string value
+     *
+     */
+    printSqlString(sqlString) {
+        return "\'" + sqlString.replaceAll("'", "''") + "\'";
+    }
     /**
      * Parse a single SQL result value for serialization using the context of the native data
      * type.
@@ -201,7 +210,7 @@ class OINODbPostgresql extends db_1.OINODb {
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null;
         }
-        else if ((sqlValue === undefined)) {
+        else if (sqlValue === undefined) {
             return undefined;
         }
         else if (((sqlType == "date")) && (typeof (sqlValue) == "string")) {
@@ -269,28 +278,28 @@ class OINODbPostgresql extends db_1.OINODb {
         return result;
     }
     _getSchemaSql(dbName, tableName) {
-        const sql = `SELECT 
-    col.column_name, 
-    col.data_type, 
-    col.character_maximum_length, 
-    col.is_nullable, 
-    con.constraint_type,
-    col.numeric_precision,
-    col.numeric_scale,
-    col.column_default
-FROM information_schema.columns col
-LEFT JOIN LATERAL
-    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
-    from 
-        information_schema.table_constraints tco,
-        information_schema.key_column_usage kcu 	 
-    where 
-        kcu.constraint_name = tco.constraint_name
-        and kcu.constraint_schema = tco.constraint_schema
-		and tco.table_catalog = col.table_catalog
-		and tco.table_name = col.table_name
-        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
-	group by kcu.column_name) con on col.column_name = con.column_name
+        const sql = `SELECT 
+    col.column_name, 
+    col.data_type, 
+    col.character_maximum_length, 
+    col.is_nullable, 
+    con.constraint_type,
+    col.numeric_precision,
+    col.numeric_scale,
+    col.column_default
+FROM information_schema.columns col
+LEFT JOIN LATERAL
+    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
+    from 
+        information_schema.table_constraints tco,
+        information_schema.key_column_usage kcu 	 
+    where 
+        kcu.constraint_name = tco.constraint_name
+        and kcu.constraint_schema = tco.constraint_schema
+		and tco.table_catalog = col.table_catalog
+		and tco.table_name = col.table_name
+        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
+	group by kcu.column_name) con on col.column_name = con.column_name
 WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`;
         return sql;
     }

package/dist/esm/OINODbPostgresql.js

@@ -183,9 +183,18 @@ export class OINODbPostgresql extends OINODb {
             return "\'" + cellValue.toISOString() + "\'";
         }
         else {
-            return "\'" + cellValue?.toString().replaceAll("'", "''") + "\'";
+            return this.printSqlString(cellValue.toString());
         }
     }
+    /**
+     * Print a single string value as valid sql literal
+     *
+     * @param sqlString string value
+     *
+     */
+    printSqlString(sqlString) {
+        return "\'" + sqlString.replaceAll("'", "''") + "\'";
+    }
     /**
      * Parse a single SQL result value for serialization using the context of the native data
      * type.
@@ -198,7 +207,7 @@ export class OINODbPostgresql extends OINODb {
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null;
         }
-        else if ((sqlValue === undefined)) {
+        else if (sqlValue === undefined) {
             return undefined;
         }
         else if (((sqlType == "date")) && (typeof (sqlValue) == "string")) {
@@ -266,28 +275,28 @@ export class OINODbPostgresql extends OINODb {
         return result;
     }
     _getSchemaSql(dbName, tableName) {
-        const sql = `SELECT 
-    col.column_name, 
-    col.data_type, 
-    col.character_maximum_length, 
-    col.is_nullable, 
-    con.constraint_type,
-    col.numeric_precision,
-    col.numeric_scale,
-    col.column_default
-FROM information_schema.columns col
-LEFT JOIN LATERAL
-    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
-    from 
-        information_schema.table_constraints tco,
-        information_schema.key_column_usage kcu 	 
-    where 
-        kcu.constraint_name = tco.constraint_name
-        and kcu.constraint_schema = tco.constraint_schema
-		and tco.table_catalog = col.table_catalog
-		and tco.table_name = col.table_name
-        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
-	group by kcu.column_name) con on col.column_name = con.column_name
+        const sql = `SELECT 
+    col.column_name, 
+    col.data_type, 
+    col.character_maximum_length, 
+    col.is_nullable, 
+    con.constraint_type,
+    col.numeric_precision,
+    col.numeric_scale,
+    col.column_default
+FROM information_schema.columns col
+LEFT JOIN LATERAL
+    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
+    from 
+        information_schema.table_constraints tco,
+        information_schema.key_column_usage kcu 	 
+    where 
+        kcu.constraint_name = tco.constraint_name
+        and kcu.constraint_schema = tco.constraint_schema
+		and tco.table_catalog = col.table_catalog
+		and tco.table_name = col.table_name
+        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
+	group by kcu.column_name) con on col.column_name = con.column_name
 WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`;
         return sql;
     }

package/dist/types/OINODbPostgresql.d.ts

@@ -36,6 +36,13 @@ export declare class OINODbPostgresql extends OINODb {
      *
      */
     printCellAsSqlValue(cellValue: OINODataCell, sqlType: string): string;
+    /**
+     * Print a single string value as valid sql literal
+     *
+     * @param sqlString string value
+     *
+     */
+    printSqlString(sqlString: string): string;
     /**
      * Parse a single SQL result value for serialization using the context of the native data
      * type.

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "@oino-ts/db-postgresql",
-  "version": "0.3.3",
-  "description": "OINO TS package for using Postgresql databases.",
-  "author": "Matias Kiviniemi (pragmatta)",
-  "license": "MPL-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/pragmatta/oino-ts.git"
-  },
-  "keywords": [
-    "sql",
-    "database",
-    "rest-api",
-    "typescript",
-    "library",
-    "postgresql"
-  ],
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "dependencies": {
-    "@oino-ts/db": "0.3.3",
-    "pg": "^8.11.3"
-  },
-  "devDependencies": {
-    "@types/node": "^20.12.7",
-    "@types/pg": "^8.11.5",
-    "@types/bun": "latest"
-  },
-  "files": [
-    "src/*.ts",
-    "dist/cjs/*.js",
-    "dist/esm/*.js",
-    "dist/types/*.d.ts"
-  ]
-}
+{
+  "name": "@oino-ts/db-postgresql",
+  "version": "0.4.0",
+  "description": "OINO TS package for using Postgresql databases.",
+  "author": "Matias Kiviniemi (pragmatta)",
+  "license": "MPL-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pragmatta/oino-ts.git"
+  },
+  "keywords": [
+    "sql",
+    "database",
+    "rest-api",
+    "typescript",
+    "library",
+    "postgresql"
+  ],
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "dependencies": {
+    "@oino-ts/db": "0.4.0",
+    "pg": "^8.11.3"
+  },
+  "devDependencies": {
+    "@types/node": "^20.12.7",
+    "@types/pg": "^8.11.5",
+    "@types/bun": "latest"
+  },
+  "files": [
+    "src/*.ts",
+    "dist/cjs/*.js",
+    "dist/esm/*.js",
+    "dist/types/*.d.ts"
+  ]
+}

package/src/OINODbPostgresql.ts

@@ -1,385 +1,396 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINOLog } from "@oino-ts/db";
-
-import { Pool, QueryResult } from "pg";
-
-const EMPTY_ROW:string[] = []
-
-/**
- * Implmentation of OINODbDataSet for Postgresql.
- * 
- */
-class OINOPostgresqlData extends OINODbDataSet {
-    private _rows:OINODataRow[]
-    
-    /**
-     * OINOPostgresqlData constructor
-     * @param params database parameters
-     */
-    constructor(data: unknown, messages:string[]=[]) {
-        super(data, messages)
-
-        if ((data != null) && !(Array.isArray(data))) {
-            throw new Error(OINO_ERROR_PREFIX + ": Invalid Posgresql data type!") // TODO: maybe check all rows
-        }
-        this._rows = data as OINODataRow[]
-        if (this.isEmpty()) {
-            this._currentRow = -1
-            this._eof = true
-        } else {
-            this._currentRow = 0
-            this._eof = false
-        }
-    }
-    private _currentRow: number
-    private _eof: boolean
-
-    /**
-     * Is data set empty.
-     *
-     */
-    isEmpty():boolean {
-        return (this._rows.length == 0)
-    }
-
-    /**
-     * Is there no more content, i.e. either dataset is empty or we have moved beyond last line
-     *
-     */
-    isEof():boolean {
-        return (this._eof)
-    }
-
-    /**
-     * Attempts to moves dataset to the next row, possibly waiting for more data to become available. Returns !isEof().
-     *
-     */
-    async next():Promise<boolean> {
-        // OINOLog.debug("OINODbDataSet.next", {currentRow:this._currentRow, length:this.sqlResult.data.length})
-        if (this._currentRow < this._rows.length-1) {
-            this._currentRow = this._currentRow + 1
-        } else {
-            this._eof = true
-        }
-        return Promise.resolve(!this._eof)
-    }
-
-    /**
-     * Gets current row of data.
-     *
-     */
-    getRow(): OINODataRow {
-        if ((this._currentRow >=0) && (this._currentRow < this._rows.length)) {
-            return this._rows[this._currentRow]
-        } else {
-            return EMPTY_ROW
-        }
-    }
-}
-
-/**
- * Implementation of Postgresql-database.
- * 
- */
-export class OINODbPostgresql extends OINODb {
-    
-    private _pool:Pool
-
-    /**
-     * Constructor of `OINODbPostgresql`
-     * @param params database paraneters
-     */
-    constructor(params:OINODbParams) {
-        super(params)
-
-        // OINOLog.debug("OINODbPostgresql.constructor", {params:params})
-        if (this._params.type !== "OINODbPostgresql") {
-            throw new Error(OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this._params.type)
-        } 
-        const ssl_enabled:boolean = !(params.url == "localhost" || params.url == "127.0.0.1")
-        this._pool = new Pool({ host: params.url, database: params.database, port: params.port, user: params.user, password: params.password, ssl: ssl_enabled })
-        this._pool.on("error", (err: any) => {
-            OINOLog.error("OINODbPostgresql error", {err:err})
-        })
-        this._pool.on("connect", (message: any) => {
-            // OINOLog.info("OINODbPostgresql connect")
-        })
-        this._pool.on("release", (message: any) => {
-            // OINOLog.info("OINODbPostgresql notice")
-        })
-        this._pool.on("acquire", () => {
-            // OINOLog.info("OINODbPostgresql end")
-        })
-    }
-
-    private _parseFieldLength(fieldLength:OINODataCell):number {
-        let result:number = parseInt((fieldLength || "0").toString())
-        if (Number.isNaN(result)) {
-            result = 0
-        }
-        return result
-    }
-
-    private async _query(sql:string):Promise<OINODataRow[]> {
-        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
-        const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
-        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
-        return Promise.resolve(query_result.rows)
-    }
-
-    private async _exec(sql:string):Promise<OINODataRow[]> {
-        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
-        const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
-        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
-        return Promise.resolve(query_result.rows)
-    }
-
-    /**
-     * Print a table name using database specific SQL escaping.
-     * 
-     * @param sqlTable name of the table
-     *
-     */
-    printSqlTablename(sqlTable:string): string {
-        return "\""+sqlTable.toLowerCase()+"\""
-    }
-
-    /**
-     * Print a column name with correct SQL escaping.
-     * 
-     * @param sqlColumn name of the column
-     *
-     */
-    printSqlColumnname(sqlColumn:string): string {
-        return "\""+sqlColumn+"\""
-    }
-
-    /**
-     * Print a single data value from serialization using the context of the native data
-     * type with the correct SQL escaping.
-     * 
-     * @param cellValue data from sql results
-     * @param sqlType native type name for table column
-     *
-     */
-    printCellAsSqlValue(cellValue:OINODataCell, sqlType: string): string {
-        if (cellValue === null) {
-            return "NULL"
-
-        } else if (cellValue === undefined) {
-            return "UNDEFINED"
-
-        } else if ((sqlType == "integer") || (sqlType == "smallint") || (sqlType == "real")) {
-            return cellValue.toString()
-
-        } else if (sqlType == "bytea") {
-            if (cellValue instanceof Buffer) {
-                return "'\\x" + (cellValue as Buffer).toString("hex") + "'"
-            } else if (cellValue instanceof Uint8Array) {
-                return "'\\x" + Buffer.from(cellValue as Uint8Array).toString("hex") + "'"
-            } else {
-                return "\'" + cellValue?.toString() + "\'"
-            }
-
-        } else if (sqlType == "boolean") {
-            if (cellValue == null || cellValue == "" || cellValue.toString().toLowerCase() == "false" || cellValue == "0") { 
-                return "false"
-            } else {
-                return "true"
-            }
-
-        } else if ((sqlType == "date") && (cellValue instanceof Date)) {
-            return "\'" + cellValue.toISOString() + "\'"
-
-        } else {
-            return "\'" + cellValue?.toString().replaceAll("'", "''") + "\'"
-        }
-    }
-
-    /**
-     * Parse a single SQL result value for serialization using the context of the native data
-     * type.
-     * 
-     * @param sqlValue data from serialization
-     * @param sqlType native type name for table column
-     * 
-     */
-    parseSqlValueAsCell(sqlValue:OINODataCell, sqlType: string): OINODataCell {
-        if ((sqlValue === null) || (sqlValue == "NULL")) {
-            return null
-
-        } else if ((sqlValue === undefined)) {
-            return undefined
-
-        } else if (((sqlType == "date")) && (typeof(sqlValue) == "string")) {
-            return new Date(sqlValue)
-
-        } else {
-            return sqlValue
-        }
-
-    }
-
-    /**
-     * Connect to database.
-     *
-     */
-    async connect(): Promise<boolean> {
-        try {
-            // make sure that any items are correctly URL encoded in the connection string
-            // OINOLog.debug("OINODbPostgresql.connect")
-            // await this._pool.connect()
-            // await this._client.connect()
-            return Promise.resolve(true)
-        } catch (err) {
-            // ... error checks
-            throw new Error(OINO_ERROR_PREFIX + ": Error connecting to Postgresql server: " + err)
-        }        
-    }
-
-    /**
-     * Execute a select operation.
-     * 
-     * @param sql SQL statement.
-     *
-     */
-    async sqlSelect(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.start("OINODb", "sqlSelect")
-        let result:OINODbDataSet
-        try {
-            const rows:OINODataRow[] = await this._query(sql)
-            // OINOLog.debug("OINODbPostgresql.sqlSelect", {rows:rows})
-            result = new OINOPostgresqlData(rows, [])
-
-        } catch (e:any) {
-            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"])
-        }
-        OINOBenchmark.end("OINODb", "sqlSelect")
-        return result
-    }
-
-    /**
-     * Execute other sql operations.
-     * 
-     * @param sql SQL statement.
-     *
-     */
-    async sqlExec(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.start("OINODb", "sqlExec")
-        let result:OINODbDataSet
-        try {
-            const rows:OINODataRow[] = await this._exec(sql)
-            // OINOLog.debug("OINODbPostgresql.sqlExec", {rows:rows})
-            result = new OINOPostgresqlData(rows, [])
-
-        } catch (e:any) {
-            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
-        }
-        OINOBenchmark.end("OINODb", "sqlExec")
-        return result
-    }
-
-    private _getSchemaSql(dbName:string, tableName:string):string {
-        const sql = 
-`SELECT 
-    col.column_name, 
-    col.data_type, 
-    col.character_maximum_length, 
-    col.is_nullable, 
-    con.constraint_type,
-    col.numeric_precision,
-    col.numeric_scale,
-    col.column_default
-FROM information_schema.columns col
-LEFT JOIN LATERAL
-    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
-    from 
-        information_schema.table_constraints tco,
-        information_schema.key_column_usage kcu 	 
-    where 
-        kcu.constraint_name = tco.constraint_name
-        and kcu.constraint_schema = tco.constraint_schema
-		and tco.table_catalog = col.table_catalog
-		and tco.table_name = col.table_name
-        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
-	group by kcu.column_name) con on col.column_name = con.column_name
-WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`
-        return sql
-    }
-
-    /**
-     * Initialize a data model by getting the SQL schema and populating OINODbDataFields of 
-     * the model.
-     * 
-     * @param api api which data model to initialize.
-     *
-     */
-    async initializeApiDatamodel(api:OINODbApi): Promise<void> {
-        
-        const res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()))
-        // OINOLog.debug("OINODbPostgresql.initializeApiDatamodel: table description ", {res: res })
-        while (!res.isEof()) {
-            const row:OINODataRow = res.getRow()
-            // OINOLog.debug("OINODbPostgresql.initializeApiDatamodel: next row ", {row: row })
-            const field_name:string = row[0]?.toString() || ""
-            const sql_type:string = row[1]?.toString() || ""
-            const field_length:number = this._parseFieldLength(row[2])
-            const constraints = row[4]?.toString() || ""
-            const numeric_precision:number = this._parseFieldLength(row[5])
-            const numeric_scale:number = this._parseFieldLength(row[6])
-            const default_val:string = row[7]?.toString() || ""
-            const field_params:OINODbDataFieldParams = {
-                isPrimaryKey: constraints.indexOf('PRIMARY KEY') >= 0 || false,
-                isForeignKey: constraints.indexOf('FOREIGN KEY') >= 0 || false,
-                isNotNull: row[3] == "NO",
-                isAutoInc: default_val.startsWith("nextval(")
-            }            
-            if (api.isFieldIncluded(field_name) == false) {
-                OINOLog.info("OINODbPostgresql.initializeApiDatamodel: field excluded in API parameters.", {field:field_name})
-                if (field_params.isPrimaryKey) {
-                    throw new Error(OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name)
-                }
-
-            } else {
-                // OINOLog.debug("OINODbPostgresql.initializeApiDatamodel: next field ", {field_name: field_name, sql_type:sql_type, field_length:field_length, field_params:field_params })
-                if ((sql_type == "integer") || (sql_type == "smallint") || (sql_type == "real")) {
-                    api.datamodel.addField(new OINONumberDataField(this, field_name, sql_type, field_params ))
-
-                } else if ((sql_type == "date")) {
-                    if (api.params.useDatesAsString) {
-                        api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
-                    } else {
-                        api.datamodel.addField(new OINODatetimeDataField(this, field_name, sql_type, field_params))
-                    }
-
-                } else if ((sql_type == "character") || (sql_type == "character varying") || (sql_type == "varchar") || (sql_type == "text")) {
-                    api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, field_length))
-
-                } else if ((sql_type == "bytea")) {
-                    api.datamodel.addField(new OINOBlobDataField(this, field_name, sql_type, field_params, field_length))
-
-                } else if ((sql_type == "boolean")) {
-                    api.datamodel.addField(new OINOBooleanDataField(this, field_name, sql_type, field_params))
-
-                } else if ((sql_type == "decimal") || (sql_type == "numeric")) {
-                    api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, numeric_precision + numeric_scale + 1))
-
-                } else {
-                    OINOLog.info("OINODbPostgresql.initializeApiDatamodel: unrecognized field type treated as string", {field_name: field_name, sql_type:sql_type, field_length:field_length, field_params:field_params })
-                    api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
-                }
-            }
-            await res.next()
-        }
-        OINOLog.debug("OINODbPostgresql.initializeDatasetModel:\n" + api.datamodel.printDebug("\n"))
-        return Promise.resolve()
-    }
-}
-
-
-
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINOLog } from "@oino-ts/db";
+
+import { Pool, QueryResult } from "pg";
+
+const EMPTY_ROW:string[] = []
+
+/**
+ * Implmentation of OINODbDataSet for Postgresql.
+ * 
+ */
+class OINOPostgresqlData extends OINODbDataSet {
+    private _rows:OINODataRow[]
+    
+    /**
+     * OINOPostgresqlData constructor
+     * @param params database parameters
+     */
+    constructor(data: unknown, messages:string[]=[]) {
+        super(data, messages)
+
+        if ((data != null) && !(Array.isArray(data))) {
+            throw new Error(OINO_ERROR_PREFIX + ": Invalid Posgresql data type!") // TODO: maybe check all rows
+        }
+        this._rows = data as OINODataRow[]
+        if (this.isEmpty()) {
+            this._currentRow = -1
+            this._eof = true
+        } else {
+            this._currentRow = 0
+            this._eof = false
+        }
+    }
+    private _currentRow: number
+    private _eof: boolean
+
+    /**
+     * Is data set empty.
+     *
+     */
+    isEmpty():boolean {
+        return (this._rows.length == 0)
+    }
+
+    /**
+     * Is there no more content, i.e. either dataset is empty or we have moved beyond last line
+     *
+     */
+    isEof():boolean {
+        return (this._eof)
+    }
+
+    /**
+     * Attempts to moves dataset to the next row, possibly waiting for more data to become available. Returns !isEof().
+     *
+     */
+    async next():Promise<boolean> {
+        // OINOLog.debug("OINODbDataSet.next", {currentRow:this._currentRow, length:this.sqlResult.data.length})
+        if (this._currentRow < this._rows.length-1) {
+            this._currentRow = this._currentRow + 1
+        } else {
+            this._eof = true
+        }
+        return Promise.resolve(!this._eof)
+    }
+
+    /**
+     * Gets current row of data.
+     *
+     */
+    getRow(): OINODataRow {
+        if ((this._currentRow >=0) && (this._currentRow < this._rows.length)) {
+            return this._rows[this._currentRow]
+        } else {
+            return EMPTY_ROW
+        }
+    }
+}
+
+/**
+ * Implementation of Postgresql-database.
+ * 
+ */
+export class OINODbPostgresql extends OINODb {
+    
+    private _pool:Pool
+
+    /**
+     * Constructor of `OINODbPostgresql`
+     * @param params database paraneters
+     */
+    constructor(params:OINODbParams) {
+        super(params)
+
+        // OINOLog.debug("OINODbPostgresql.constructor", {params:params})
+        if (this._params.type !== "OINODbPostgresql") {
+            throw new Error(OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this._params.type)
+        } 
+        const ssl_enabled:boolean = !(params.url == "localhost" || params.url == "127.0.0.1")
+        this._pool = new Pool({ host: params.url, database: params.database, port: params.port, user: params.user, password: params.password, ssl: ssl_enabled })
+        this._pool.on("error", (err: any) => {
+            OINOLog.error("OINODbPostgresql error", {err:err})
+        })
+        this._pool.on("connect", (message: any) => {
+            // OINOLog.info("OINODbPostgresql connect")
+        })
+        this._pool.on("release", (message: any) => {
+            // OINOLog.info("OINODbPostgresql notice")
+        })
+        this._pool.on("acquire", () => {
+            // OINOLog.info("OINODbPostgresql end")
+        })
+    }
+
+    private _parseFieldLength(fieldLength:OINODataCell):number {
+        let result:number = parseInt((fieldLength || "0").toString())
+        if (Number.isNaN(result)) {
+            result = 0
+        }
+        return result
+    }
+
+    private async _query(sql:string):Promise<OINODataRow[]> {
+        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
+        const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
+        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
+        return Promise.resolve(query_result.rows)
+    }
+
+    private async _exec(sql:string):Promise<OINODataRow[]> {
+        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
+        const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
+        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
+        return Promise.resolve(query_result.rows)
+    }
+
+    /**
+     * Print a table name using database specific SQL escaping.
+     * 
+     * @param sqlTable name of the table
+     *
+     */
+    printSqlTablename(sqlTable:string): string {
+        return "\""+sqlTable.toLowerCase()+"\""
+    }
+
+    /**
+     * Print a column name with correct SQL escaping.
+     * 
+     * @param sqlColumn name of the column
+     *
+     */
+    printSqlColumnname(sqlColumn:string): string {
+        return "\""+sqlColumn+"\""
+    }
+
+    /**
+     * Print a single data value from serialization using the context of the native data
+     * type with the correct SQL escaping.
+     * 
+     * @param cellValue data from sql results
+     * @param sqlType native type name for table column
+     *
+     */
+    printCellAsSqlValue(cellValue:OINODataCell, sqlType: string): string {
+        if (cellValue === null) {
+            return "NULL"
+
+        } else if (cellValue === undefined) {
+            return "UNDEFINED"
+
+        } else if ((sqlType == "integer") || (sqlType == "smallint") || (sqlType == "real")) {
+            return cellValue.toString()
+
+        } else if (sqlType == "bytea") {
+            if (cellValue instanceof Buffer) {
+                return "'\\x" + (cellValue as Buffer).toString("hex") + "'"
+            } else if (cellValue instanceof Uint8Array) {
+                return "'\\x" + Buffer.from(cellValue as Uint8Array).toString("hex") + "'"
+            } else {
+                return "\'" + cellValue?.toString() + "\'"
+            }
+
+        } else if (sqlType == "boolean") {
+            if (cellValue == null || cellValue == "" || cellValue.toString().toLowerCase() == "false" || cellValue == "0") { 
+                return "false"
+            } else {
+                return "true"
+            }
+
+        } else if ((sqlType == "date") && (cellValue instanceof Date)) {
+            return "\'" + cellValue.toISOString() + "\'"
+
+        } else {
+            return this.printSqlString(cellValue.toString())
+        }
+    }
+
+    /**
+     * Print a single string value as valid sql literal
+     * 
+     * @param sqlString string value
+     *
+     */
+    printSqlString(sqlString:string): string {
+        return "\'" + sqlString.replaceAll("'", "''") + "\'"
+    }
+
+
+    /**
+     * Parse a single SQL result value for serialization using the context of the native data
+     * type.
+     * 
+     * @param sqlValue data from serialization
+     * @param sqlType native type name for table column
+     * 
+     */
+    parseSqlValueAsCell(sqlValue:OINODataCell, sqlType: string): OINODataCell {
+        if ((sqlValue === null) || (sqlValue == "NULL")) {
+            return null
+
+        } else if (sqlValue === undefined) {
+            return undefined
+
+        } else if (((sqlType == "date")) && (typeof(sqlValue) == "string")) {
+            return new Date(sqlValue)
+
+        } else {
+            return sqlValue
+        }
+
+    }
+
+    /**
+     * Connect to database.
+     *
+     */
+    async connect(): Promise<boolean> {
+        try {
+            // make sure that any items are correctly URL encoded in the connection string
+            // OINOLog.debug("OINODbPostgresql.connect")
+            // await this._pool.connect()
+            // await this._client.connect()
+            return Promise.resolve(true)
+        } catch (err) {
+            // ... error checks
+            throw new Error(OINO_ERROR_PREFIX + ": Error connecting to Postgresql server: " + err)
+        }        
+    }
+
+    /**
+     * Execute a select operation.
+     * 
+     * @param sql SQL statement.
+     *
+     */
+    async sqlSelect(sql:string): Promise<OINODbDataSet> {
+        OINOBenchmark.start("OINODb", "sqlSelect")
+        let result:OINODbDataSet
+        try {
+            const rows:OINODataRow[] = await this._query(sql)
+            // OINOLog.debug("OINODbPostgresql.sqlSelect", {rows:rows})
+            result = new OINOPostgresqlData(rows, [])
+
+        } catch (e:any) {
+            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"])
+        }
+        OINOBenchmark.end("OINODb", "sqlSelect")
+        return result
+    }
+
+    /**
+     * Execute other sql operations.
+     * 
+     * @param sql SQL statement.
+     *
+     */
+    async sqlExec(sql:string): Promise<OINODbDataSet> {
+        OINOBenchmark.start("OINODb", "sqlExec")
+        let result:OINODbDataSet
+        try {
+            const rows:OINODataRow[] = await this._exec(sql)
+            // OINOLog.debug("OINODbPostgresql.sqlExec", {rows:rows})
+            result = new OINOPostgresqlData(rows, [])
+
+        } catch (e:any) {
+            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
+        }
+        OINOBenchmark.end("OINODb", "sqlExec")
+        return result
+    }
+
+    private _getSchemaSql(dbName:string, tableName:string):string {
+        const sql = 
+`SELECT 
+    col.column_name, 
+    col.data_type, 
+    col.character_maximum_length, 
+    col.is_nullable, 
+    con.constraint_type,
+    col.numeric_precision,
+    col.numeric_scale,
+    col.column_default
+FROM information_schema.columns col
+LEFT JOIN LATERAL
+    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
+    from 
+        information_schema.table_constraints tco,
+        information_schema.key_column_usage kcu 	 
+    where 
+        kcu.constraint_name = tco.constraint_name
+        and kcu.constraint_schema = tco.constraint_schema
+		and tco.table_catalog = col.table_catalog
+		and tco.table_name = col.table_name
+        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
+	group by kcu.column_name) con on col.column_name = con.column_name
+WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`
+        return sql
+    }
+
+    /**
+     * Initialize a data model by getting the SQL schema and populating OINODbDataFields of 
+     * the model.
+     * 
+     * @param api api which data model to initialize.
+     *
+     */
+    async initializeApiDatamodel(api:OINODbApi): Promise<void> {
+        
+        const res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()))
+        // OINOLog.debug("OINODbPostgresql.initializeApiDatamodel: table description ", {res: res })
+        while (!res.isEof()) {
+            const row:OINODataRow = res.getRow()
+            // OINOLog.debug("OINODbPostgresql.initializeApiDatamodel: next row ", {row: row })
+            const field_name:string = row[0]?.toString() || ""
+            const sql_type:string = row[1]?.toString() || ""
+            const field_length:number = this._parseFieldLength(row[2])
+            const constraints = row[4]?.toString() || ""
+            const numeric_precision:number = this._parseFieldLength(row[5])
+            const numeric_scale:number = this._parseFieldLength(row[6])
+            const default_val:string = row[7]?.toString() || ""
+            const field_params:OINODbDataFieldParams = {
+                isPrimaryKey: constraints.indexOf('PRIMARY KEY') >= 0 || false,
+                isForeignKey: constraints.indexOf('FOREIGN KEY') >= 0 || false,
+                isNotNull: row[3] == "NO",
+                isAutoInc: default_val.startsWith("nextval(")
+            }            
+            if (api.isFieldIncluded(field_name) == false) {
+                OINOLog.info("OINODbPostgresql.initializeApiDatamodel: field excluded in API parameters.", {field:field_name})
+                if (field_params.isPrimaryKey) {
+                    throw new Error(OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name)
+                }
+
+            } else {
+                // OINOLog.debug("OINODbPostgresql.initializeApiDatamodel: next field ", {field_name: field_name, sql_type:sql_type, field_length:field_length, field_params:field_params })
+                if ((sql_type == "integer") || (sql_type == "smallint") || (sql_type == "real")) {
+                    api.datamodel.addField(new OINONumberDataField(this, field_name, sql_type, field_params ))
+
+                } else if ((sql_type == "date")) {
+                    if (api.params.useDatesAsString) {
+                        api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
+                    } else {
+                        api.datamodel.addField(new OINODatetimeDataField(this, field_name, sql_type, field_params))
+                    }
+
+                } else if ((sql_type == "character") || (sql_type == "character varying") || (sql_type == "varchar") || (sql_type == "text")) {
+                    api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, field_length))
+
+                } else if ((sql_type == "bytea")) {
+                    api.datamodel.addField(new OINOBlobDataField(this, field_name, sql_type, field_params, field_length))
+
+                } else if ((sql_type == "boolean")) {
+                    api.datamodel.addField(new OINOBooleanDataField(this, field_name, sql_type, field_params))
+
+                } else if ((sql_type == "decimal") || (sql_type == "numeric")) {
+                    api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, numeric_precision + numeric_scale + 1))
+
+                } else {
+                    OINOLog.info("OINODbPostgresql.initializeApiDatamodel: unrecognized field type treated as string", {field_name: field_name, sql_type:sql_type, field_length:field_length, field_params:field_params })
+                    api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
+                }
+            }
+            await res.next()
+        }
+        OINOLog.debug("OINODbPostgresql.initializeDatasetModel:\n" + api.datamodel.printDebug("\n"))
+        return Promise.resolve()
+    }
+}
+
+
+

package/src/index.ts

@@ -1 +1 @@
-export { OINODbPostgresql } from "./OINODbPostgresql.js"
+export { OINODbPostgresql } from "./OINODbPostgresql.js"

package/README.md

@@ -1,190 +0,0 @@
-# OINO TS
- OINO Is Not an ORM but it's trying to solve a similar problem for API development. Instead of mirroring your DB schema in code that needs manual updates, OINO will get the data schema from DBMS using SQL in real time. Every time your app starts, it has an updated data model which enables automatic (de)serialize SQL results to JSON/CSV and back. OINO works on the level below routing where you pass the method, URL ID, body and request parameters to the API-object. OINO will parse and validate the data against the data model and generate proper SQL for your DB. Because OINO knows how data is serialized (e.g. JSON), what column it belongs to (e.g. floating point number) and what the target database is, it knows how to parse, format and escape the value as valid SQL.
- 
- ```
- const result:OINOApiResult = await api_orderdetails.doRequest("GET", id, body, params)
- return new Response(result.modelset.writeString(OINOContentType.json))
- ```
- 
-
- # GETTING STARTED
- 
- ### Setup
- Install the `@oino-ts/db` npm package and necessary database packages and import them in your code.
- ```
- bun install @oino-ts/db
- bun install @oino-ts/db-bunsqlite
- ```
- 
- ```
- import { OINODb, OINOApi, OINOFactory } from "@oino-ts/db";
- import { OINODbBunSqlite } from "@oino-ts/db-bunsqlite"
- ```
- 
- ### Register database and logger
- Register your database implementation and logger (see [`OINOConsoleLog`](https://pragmatta.github.io/oino-ts/classes/types_src.OINOConsoleLog.html) how to implement your own)
-
- ```
- OINOLog.setLogger(new OINOConsoleLog())
- OINOFactory.registerDb("OINODbBunSqlite", OINODbBunSqlite)
- ```
-
- ### Create a database
- Creating a database connection [`OINODb`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODb.html) is done by passing [`OINODbParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbParams.html) to the factory method. For [`OINODbBunSqlite`](https://pragmatta.github.io/oino-ts/classes/db_bunsqlite_src.OINODbBunSqlite.html) that means a file url for the database file, for others network host, port, credentials etc.
- ```
- const db:OINODb = await OINOFactory.createDb( { type: "OINODbBunSqlite", url: "file://../localDb/northwind.sqlite" } )
- ```
-
- ### Create an API
- From a database you can create an [`OINOApi`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbApi.html) by passing [`OINOApiParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbApiParams.html) with table name and preferences to the factory method.
- ```
- const api_employees:OINOApi = await OINOFactory.createApi(db, { tableName: "Employees", excludeFields:["BirthDate"] })
- ```
-
- ### Pass HTTP requests to API
- When you receive a HTTP request, just pass the method, URL ID, body and params to the correct API, which will parse and validate input and return results.
-
- ```
- const result:OINOApiResult = await api_orderdetails.doRequest("GET", id, body, params)
- ```
-
- ### Write results back to HTTP Response
- The results for a GET request will contain [`OINOModelSet`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbModelSet.html) data that can be written out as JSON or CSV as needed. For other requests result is just success or error with messages.
- ```
- return new Response(result.data.writeString(OINOContentType.json))
- ```
- 
- 
- # FEATURES
- 
- ## RESTfull
- OINO maps HTTP methods GET/POST/PUT/DELETE to SQL operations SELECT/INSERT/UPDATE/DELETE. The GET/POST requests can be made without URL ID to get all rows or insert new ones and others target a single row using URL ID. 
-
- For example HTTP POST 
- ```
- Request and response:
- > curl.exe -X POST http://localhost:3001/orderdetails -H "Content-Type: application/json" --data '[{\"OrderID\":11077,\"ProductID\":99,\"UnitPrice\":19,\"Quantity\":1,\"Discount\":0}]'
- {"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
-
- SQL:
- INSERT INTO [OrderDetails] ("OrderID","ProductID","UnitPrice","Quantity","Discount") VALUES (11077,99,19,1,0);
- ```
-
-
- ## Universal Serialization
- OINO handles serialization of data to JSON/CSV/etc. and back based on the data model. It knows what columns exist, what is their data type and how to convert each to JSON/CSV and back. This allows also partial data to be sent, i.e. you can send only columns that need updating or even send extra columns and have them ignored.
-
- ### Features
- - Files can be sent to BLOB fields using BASE64 or MIME multipart encoding. Also supports standard HTML form file submission to blob fields and returning them data url images.
- - Datetimes are (optionally) normalized to ISO 8601 format.
- - Extended JSON-encoding
-   - Unquoted literal `undefined` can be used to represent non-existent values (leaving property out works too but preserving structure might be easier e.g. when translating data).
- - CSV
-   - Comma-separated, doublequotes.
-   - Unquoted literal `null` represents null values.
-   - Unquoted empty string represents undefined values.
- - Form data
-   - Multipart-mixed and binary files not supported.
-   - Non-existent value line (i.e. nothing after the empty line) treated as a null value.
- - Url-encoded
-   - No null values, missing properties treated as undefined.
-   - Multiple lines could be used to post multiple rows.
-
-
- ## Database Abstraction
- OINO functions as a database abstraction, providing a consistent interface for working with different databases. It abstracts out different conventions in connecting, making queries and formatting data.
-
- Currently supported databases:
- - Bun Sqlite through Bun native implementation
- - Postgresql through [pg](https://www.npmjs.com/package/pg)-package
- - Mariadb / Mysql-support through [mariadb](https://www.npmjs.com/package/mariadb)-package
- - Sql Server through [mssql](https://www.npmjs.com/package/mssql)-package
-
- ## Composite Keys
- To support tables with multipart primary keys OINO generates a composite key `_OINOID_` that is included in the result and can be used as the REST ID. For example in the example above table `OrderDetails` has two primary keys `OrderID` and `ProductID` making the `_OINOID_` of form `11077:99`. 
-
- ## Power Of SQL
- Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINOSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html), order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html) and limits/paging with [`OINOSqlLimit`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlLimit.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
-
- ## Swagger Support
- Swagger is great as long as the definitions are updated and with OINO you can automatically get a Swagger definition including a data model schema.
- ```
- if (url.pathname == "/swagger.json") {
-    return new Response(JSON.stringify(OINOSwagger.getApiDefinition(api_array)))
- }
- ```
- ![Swagger definition with a data model schema](img/readme-swagger.png)
-
- ## Node support
- OINO is developped Typescript first but compiles to standard CommonJS and the NPM packages should work on either ESM / CommonJS. Checkout sample apps `readmeApp` (ESM) and `nodeApp` (CommonJS).
-
- ## HTMX support
- OINO is [htmx.org](https://htmx.org) friendly, allowing easy translation of [`OINODataRow`](https://pragmatta.github.io/oino-ts/types/db_src.OINODataRow.html) to HTML output using templates (cf. the [htmx sample app](https://github.com/pragmatta/oino-ts/tree/main/samples/htmxApp)).
-
- ## Hashids
- Autoinc numeric id's are very pragmatic and fit well with OINO (e.g. using a form without primary key fields to insert new rows with database assigned ids). However it's not always sensible to share information about the sequence. Hashids solve this by masking the original values by encrypting the ids using AES-128 and some randomness. Length of the hashid can be chosen from 12-32 characters where longer ids provide more security. However this should not be considereded a cryptographic solution for keeping ids secret but rather making it infeasible to iterate all ids.
-
-
- # STATUS
- OINO is currently a hobby project which should and should considered in alpha status. That also means compatibility breaking changes can be made without prior notice when architectual issues are discovered.
-
- ## Beta 
- For a beta status following milestones are planned:
-
- ### Realistic app
- There needs to be a realistic app built on top of OINO to get a better grasp of the edge cases.
- 
- ## Roadmap
- Things that need to happen in some order before beta-status are at least following:
- 
- ### Support for views
- Simple cases of views would work already in some databases but edge cases might get complicated. For example 
- - How to handle a view which does not have a complete private key?
- - What edge cases exist in updating views?
-
- ### Batch updates
- Supporting batch updates similar to batch inserts is slightly bending the RESTfull principles but would still be a useful optional feature.
-
- ### Aggregation
- Similar to filtering, ordering and limits, aggregation could be implemented as HTTP request parameters telling what column is aggregated or used for ordering or how many results to return.
-
- ### Streaming
- One core idea is to be efficient in not making unnecessary copies of the data and minimizing garbage collection debt. This can be taken further by implementing streaming, allowing large dataset to be written to HTTP response as SQL result rows are received.
-
- ### SQL generation callbacks
- It would be useful to allow developer to validate / override SQL generation to cover cases OINO does not support or even workaround issues.
-
- ### Transactions
- Even though the basic case for OINO is executing SQL operations on individual rows, having an option to use SQL transactions could make sense at least for batch operations.
-
-
- # HELP
- 
- ## Bug reports
- Fixing bugs is a priority and getting good quality bug reports helps. It's recommended to use the sample Northwind database included with project to replicate issues or make an SQL script export of the relevant table.
-  
- ## Feedback
- Understanding and prioritizing the use cases for OINO is also important and feedback about how you'd use OINO is interesting. Feel free to raise issues and feature requests in Github, but understand that short term most of the effort goes towards reaching the beta stage.
-
- ## Typescript / Javascript architecture
- Typescript building with different targets and module-systemts and a ton of configuration is a complex domain and something I have little experience un so help in fixing problems and how thing ought to be done is appreciated.
- 
- # LINKS
- - [Github repository](https://github.com/pragmatta/oino-ts)
- - [NPM repository](https://www.npmjs.com/org/oino-ts) 
- 
- 
- # ACKNOWLEDGEMENTS
- 
- ## Libraries
- OINO uses the following open source libraries and npm packages and I would like to thank everyone for their contributions:
- - Postgresql [node-postgres package](https://www.npmjs.com/package/pg)
- - Mariadb / Mysql [mariadb package](https://www.npmjs.com/package/mariadb)
- - Sql Server [mssql package](https://www.npmjs.com/package/mssql)
- - Custom base encoding [base-x package](https://www.npmjs.com/package/base-x)
-
- ## Bun
- OINO has been developed using the Bun runtime, not because of the speed improvements but for the first class Typescript support and integrated developper experience. Kudos on the bun team for making Typescript work more exiting again.
- 
- ## SQL Scripts
- The SQL scripts for creating the sample Northwind database are based on [Google Code archive](https://code.google.com/archive/p/northwindextended/downloads) and have been further customized to ensure they would have identical data (in the scope of the automated testing).