@oino-ts/db-mariadb 1.5.1 → 1.6.0

package/dist/cjs/OINODbMariadb.js

@@ -403,25 +403,27 @@ class OINODbMariadb extends db_1.OINODb {
         return result;
     }
     _getSchemaSql() {
-        const sql = `SELECT
-    C.COLUMN_NAME,
-    C.COLUMN_TYPE,
-    C.IS_NULLABLE,
-    C.COLUMN_KEY,
-    C.COLUMN_DEFAULT,
-    C.EXTRA,
-    KCU.CONSTRAINT_NAME AS ForeignKeyName
-FROM information_schema.COLUMNS C
-	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
-WHERE C.TABLE_SCHEMA = ? AND C.TABLE_NAME = ?
+        const sql = `SELECT
+    C.COLUMN_NAME,
+    C.COLUMN_TYPE,
+    C.IS_NULLABLE,
+    C.COLUMN_KEY,
+    C.COLUMN_DEFAULT,
+    C.EXTRA,
+    KCU.CONSTRAINT_NAME AS ForeignKeyName,
+    KCU.REFERENCED_TABLE_NAME,
+    KCU.REFERENCED_COLUMN_NAME
+FROM information_schema.COLUMNS C
+	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
+WHERE C.TABLE_SCHEMA = ? AND C.TABLE_NAME = ?
 ORDER BY C.ORDINAL_POSITION;`;
         return sql;
     }
     _getValidateSql() {
-        const sql = `SELECT
-    Count(C.COLUMN_NAME) AS COLUMN_COUNT
-FROM information_schema.COLUMNS C
-	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
+        const sql = `SELECT
+    Count(C.COLUMN_NAME) AS COLUMN_COUNT
+FROM information_schema.COLUMNS C
+	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
 WHERE C.TABLE_SCHEMA = ?;`;
         return sql;
     }
@@ -442,9 +444,13 @@ WHERE C.TABLE_SCHEMA = ?;`;
             const field_length1 = this._parseFieldLength(field_matches[3] || "0");
             const field_length2 = this._parseFieldLength(field_matches[4] || "0");
             const extra = row[5]?.toString() || "";
+            const fk_table = row[7]?.toString() || "";
+            const fk_column = row[8]?.toString() || "";
+            const foreign_key = fk_table ? { table: fk_table, column: fk_column } : null;
             const field_params = {
                 isPrimaryKey: row[3] == "PRI",
-                isForeignKey: row[6] != null,
+                isForeignKey: (row[6] != null) || (foreign_key != null),
+                foreignKey: foreign_key,
                 isAutoInc: extra.indexOf('auto_increment') >= 0,
                 isNotNull: row[2] == "NO"
             };

package/dist/esm/OINODbMariadb.js

@@ -400,25 +400,27 @@ export class OINODbMariadb extends OINODb {
         return result;
     }
     _getSchemaSql() {
-        const sql = `SELECT
-    C.COLUMN_NAME,
-    C.COLUMN_TYPE,
-    C.IS_NULLABLE,
-    C.COLUMN_KEY,
-    C.COLUMN_DEFAULT,
-    C.EXTRA,
-    KCU.CONSTRAINT_NAME AS ForeignKeyName
-FROM information_schema.COLUMNS C
-	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
-WHERE C.TABLE_SCHEMA = ? AND C.TABLE_NAME = ?
+        const sql = `SELECT
+    C.COLUMN_NAME,
+    C.COLUMN_TYPE,
+    C.IS_NULLABLE,
+    C.COLUMN_KEY,
+    C.COLUMN_DEFAULT,
+    C.EXTRA,
+    KCU.CONSTRAINT_NAME AS ForeignKeyName,
+    KCU.REFERENCED_TABLE_NAME,
+    KCU.REFERENCED_COLUMN_NAME
+FROM information_schema.COLUMNS C
+	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
+WHERE C.TABLE_SCHEMA = ? AND C.TABLE_NAME = ?
 ORDER BY C.ORDINAL_POSITION;`;
         return sql;
     }
     _getValidateSql() {
-        const sql = `SELECT
-    Count(C.COLUMN_NAME) AS COLUMN_COUNT
-FROM information_schema.COLUMNS C
-	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
+        const sql = `SELECT
+    Count(C.COLUMN_NAME) AS COLUMN_COUNT
+FROM information_schema.COLUMNS C
+	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
 WHERE C.TABLE_SCHEMA = ?;`;
         return sql;
     }
@@ -439,9 +441,13 @@ WHERE C.TABLE_SCHEMA = ?;`;
             const field_length1 = this._parseFieldLength(field_matches[3] || "0");
             const field_length2 = this._parseFieldLength(field_matches[4] || "0");
             const extra = row[5]?.toString() || "";
+            const fk_table = row[7]?.toString() || "";
+            const fk_column = row[8]?.toString() || "";
+            const foreign_key = fk_table ? { table: fk_table, column: fk_column } : null;
             const field_params = {
                 isPrimaryKey: row[3] == "PRI",
-                isForeignKey: row[6] != null,
+                isForeignKey: (row[6] != null) || (foreign_key != null),
+                foreignKey: foreign_key,
                 isAutoInc: extra.indexOf('auto_increment') >= 0,
                 isNotNull: row[2] == "NO"
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-mariadb",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "OINO TS package for using Mariadb databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -21,8 +21,8 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "^1.5.1",
-    "@oino-ts/db": "^1.5.1",
+    "@oino-ts/common": "^1.6.0",
+    "@oino-ts/db": "^1.6.0",
     "mariadb": "^3.2.3"
   },
   "devDependencies": {

package/src/OINODbMariadb.ts

@@ -1,553 +1,559 @@
-/*
- * 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 { OINO_ERROR_PREFIX, OINOBenchmark, OINO_INFO_PREFIX, OINOLog, OINOResult } from "@oino-ts/common";
-
-import { OINODataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODataField, OINODataFieldSchema, OINODataFieldParams, OINODataRow, OINODataCell, OINODatetimeDataField, OINOBlobDataField, OINO_EMPTY_ROW, OINO_EMPTY_ROWS } from "@oino-ts/common";
-
-import { OINODb, OINODbParams, OINODbSqlStatement } from "@oino-ts/db";
-
-import mariadb from "mariadb";
-
-/**
- * Implmentation of OINODataSet for MariaDb.
- * 
- */
-class OINOMariadbData extends OINODataSet {
-    private _rows:OINODataRow[] = OINO_EMPTY_ROWS
-    
-    /**
-     * OINOMariadbData constructor
-     * @param params database parameters
-     */
-    constructor(data: any, messages:string[]=[]) {
-        super(data, messages)
-
-        if (data == null) {
-            this.messages.push(OINO_INFO_PREFIX + "SQL result is empty")
-
-        } else if (Array.isArray(data)) {
-            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> {
-        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 OINO_EMPTY_ROW
-        }
-    }
-
-    /**
-     * Gets all rows of data.
-     *
-     */
-    async getAllRows(): Promise<OINODataRow[]> {
-        return this._rows // at the moment theres no result streaming, so we can just return the rows
-    }
-}
-
-/**
- * Implementation of MariaDb/MySql-database.
- * 
- */
-export class OINODbMariadb extends OINODb {
-    
-    private static _fieldLengthRegex = /([^\(\)]+)(\s?\((\d+)\s?\,?\s?(\d*)?\))?/i
-    private static _connectionExceptionMessageRegex = /\(([^\)]*)\) (.*)/i
-    private static _sqlExceptionMessageRegex = /\(([^\)]*)\) (.*)\nsql\:(.*)?/i
-    
-    private _pool:mariadb.Pool
-
-    /**
-     * Constructor of `OINODbMariadb` 
-     * @param params database parameters
-     */
-    constructor(params:OINODbParams) {
-        super(params)
-
-        if (this.dbParams.type !== "OINODbMariadb") {
-            throw new Error(OINO_ERROR_PREFIX + ": Not OINODbMariadb-type: " + this.dbParams.type)
-        } 
-        this._pool = mariadb.createPool({ host: this.dbParams.url, database: this.dbParams.database, port: this.dbParams.port, user: this.dbParams.user, password: this.dbParams.password, acquireTimeout: 2000, debug:false, rowsAsArray: true, multipleStatements: false }) // statements are now executed individually with bind parameters, so stacked/multi-statement execution is disabled
-        delete this.dbParams.password // do not store password in db object
-    }
-
-    private _parseFieldLength(fieldLengthStr:string):number {
-        let result:number = parseInt(fieldLengthStr)
-        if (Number.isNaN(result)) {
-            result = 0
-        }
-        return result
-    }
-
-    private async _query(sql:string, params?:OINODataCell[]):Promise<OINODataSet> {
-        let connection:mariadb.PoolConnection|null = null
-        let rows:OINODataRow[] = OINO_EMPTY_ROWS
-        try {
-            connection = await this._pool.getConnection()
-            const sql_res = (params && params.length > 0) ? await connection.query(sql, params) : await connection.query(sql)
-            // console.log("_query: sql=", sql, " result=", result)
-            if (Array.isArray(sql_res)) {
-                rows = sql_res.filter((r) => Array.isArray(r)) as OINODataRow[] // filter out OkPacket results from multiple statements
-            }
-        } catch (e:any) {
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", {message:e.message, stack:e.stack})
-            return new OINOMariadbData(OINO_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query") as OINOMariadbData 
-
-        } finally {
-            if (connection) {
-                connection.release()
-            }
-        }
-        return new OINOMariadbData(rows, [])
-    }
-
-    private async _exec(sql:string, params?:OINODataCell[]):Promise<OINODataSet> {
-        let connection:mariadb.PoolConnection|null = null
-        let rows:OINODataRow[] = OINO_EMPTY_ROWS
-        try {
-            connection = await this._pool.getConnection()
-            const sql_res = (params && params.length > 0) ? await connection.query(sql, params) : await connection.query(sql)
-            // console.log("OINODbMariadb._exec: result=", result)
-            if (Array.isArray(sql_res)) {
-                rows = sql_res.filter((r) => Array.isArray(r)) // filter out OkPacket results from multiple statements
-            }
-        
-        } catch (e:any) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", {message:msg_parts[2], stack:e.stack})
-            return new OINOMariadbData(OINO_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec") as OINOMariadbData
-
-        } finally {
-            if (connection) {
-                connection.release()
-            }
-        }
-        return new OINOMariadbData(rows, [])
-    }
-
-    /**
-     * Print a table name using database specific SQL escaping.
-     * 
-     * @param sqlTable name of the table
-     *
-     */
-    printTableName(sqlTable:string): string {
-        return "`"+sqlTable.replaceAll("`", "``")+"`"
-    }
-
-    /**
-     * Print a column name with correct SQL escaping.
-     *
-     * @param sqlColumn name of the column
-     *
-     */
-    printColumnName(sqlColumn:string): string {
-        return "`"+sqlColumn.replaceAll("`", "``")+"`"
-    }
-
-    /**
-     * Print a bind-parameter placeholder for the given zero-based parameter index (MySQL/MariaDB `?`).
-     *
-     * @param index zero-based parameter index
-     *
-     */
-    printParameterName(index:number): string {
-        return "?"
-    }
-
-    /**
-     * Coerce a data value into a MariaDB bind-parameter value. The connector binds numbers,
-     * strings, `Date` and `Buffer` natively; booleans are mapped to 1/0 for `bit`/numeric columns.
-     *
-     * @param cellValue data value to bind
-     * @param nativeType native type name for the table column
-     *
-     */
-    bindCellValue(cellValue:OINODataCell, nativeType: string): OINODataCell {
-        if (cellValue === undefined) {
-            return null
-        }
-        if (typeof cellValue === "boolean") {
-            return cellValue ? 1 : 0
-        }
-        return cellValue
-    }
-
-
-    /**
-     * 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 nativeType native type name for table column
-     *
-     */
-    printCellAsValue(cellValue:OINODataCell, nativeType: string): string {
-        if (cellValue === null) {
-            return "NULL"
-
-        } else if (cellValue === undefined) {
-            return "UNDEFINED"
-
-        } else if ((nativeType == "int") || (nativeType == "smallint") || (nativeType == "float") || (nativeType == "double")) {
-            return cellValue.toString()
-
-        } else if ((nativeType == "longblob") || (nativeType == "binary") || (nativeType == "varbinary")) {
-            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 (((nativeType == "date") || (nativeType == "datetime") || (nativeType == "timestamp")) && (cellValue instanceof Date)) {
-            return "\"" + cellValue.toISOString().replace('T', ' ').substring(0, 23) + "\""
-
-        } else if ((nativeType == "bit")) {
-            if ((cellValue === false) || (cellValue == null) || (cellValue == "") || (cellValue.toString().toLowerCase() == "false") || (cellValue == "0")) {
-                return "b'0'"
-            } else if ((cellValue === true) || (cellValue.toString().toLowerCase() == "true")) {
-                return "b'1'"
-            } else {
-                return "b'" + cellValue.toString() + "'" // rest is assumed to be a valid bitstring
-            }
-
-        } else {
-            return this.printStringValue(cellValue?.toString())
-        }
-    }
-
-    /**
-     * Print a single string value as valid sql literal
-     * 
-     * @param sqlString string value
-     *
-     */
-    printStringValue(sqlString:string): string {
-        return "\"" + sqlString.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\r", "\\r").replaceAll("\n", "\\n").replaceAll("\t", "\\t") + "\""
-    }
-
-
-    /**
-     * Parse a single SQL result value for serialization using the context of the native data
-     * type.
-     * 
-     * @param sqlValue data from serialization
-     * @param nativeType native type name for table column
-     * 
-     */
-    parseValueAsCell(sqlValue:OINODataCell, nativeType: string): OINODataCell {
-        if ((sqlValue === null) || (sqlValue == "NULL")) {
-            return null
-
-        } else if (sqlValue === undefined) {
-            return undefined
-
-        } else if (((nativeType == "date")) && (typeof(sqlValue) == "string") && (sqlValue != "")) {
-            return new Date(sqlValue)
-
-        } else if ((nativeType == "bit") && (sqlValue instanceof Buffer)) { // mariadb returns a buffer for bit-fields
-            const buf:Buffer = sqlValue as Buffer
-            if (buf.length == 1) {
-                return buf.readUInt8(0) === 1
-            } else {
-                let result:string = ""
-                for (let i=0; i<buf.length; i++) {
-                    result += buf[i].toString(2).padStart(8, '0')
-                }
-                return result
-            }
-
-        } else {
-            return sqlValue
-        }
-
-    }
-
-    /**
-     * Connect to database.
-     *
-     */
-    async connect(): Promise<OINOResult> {
-        let result:OINOResult = new OINOResult()
-        if (this.isConnected) {
-            return result
-        }
-        let connection:mariadb.PoolConnection|null = null
-        try {
-            // make sure that any items are correctly URL encoded in the connection string
-            connection = await this._pool.getConnection()
-            this.isConnected = true
-
-        } catch (e:any) {
-            const msg_parts = (e as Error).message.match(OINODbMariadb._connectionExceptionMessageRegex) || []
-            result.setError(500, "Error connecting to server: " + msg_parts[2], "OINODbMariadb.connect")
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", {message:e.message, stack:e.stack})
-        } finally {
-            if (connection) {
-                await connection.release()
-            }
-        }   
-
-        OINOBenchmark.endMetric("OINODb", "connect", result.status != 500)
-        return result
-    }
-
-    /**
-     * Validate connection to database is working. 
-     *
-     */
-    async validate(): Promise<OINOResult> {
-        OINOBenchmark.startMetric("OINODb", "validate")
-        let result:OINOResult = new OINOResult()
-        try {
-            const sql = this._getValidateSql()
-            const sql_res:OINODataSet = await this._query(sql, [this.dbParams.database])
-            if (sql_res.isEmpty()) {
-                result.setError(400, "DB returned no rows for schema!", "OINODbMariadb.validate")
-
-            } else {
-                this.isValidated = true
-            }
-        } catch (e:any) {
-            result.setError(500, "Exception validating connection: " + e.message, "OINODbMariadb.validate")
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", "exception in validate", {message:e.message, stack:e.stack})
-        }
-        OINOBenchmark.endMetric("OINODb", "validate", result.status != 500)
-        return result
-    }
-
-    /**
-     * Disconnect from database.
-     *
-     */
-    async disconnect(): Promise<void> {
-        if (this.isConnected) {
-            await this._pool.end()
-        }
-        this.isConnected = false
-        this.isValidated = false
-    }
-
-    /**
-     * Execute a select operation.
-     * 
-     * @param sql SQL statement.
-     *
-     */
-    async sqlSelect(sql:string): Promise<OINODataSet> {
-        if (!this.isValidated) {
-            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
-        }
-        OINOBenchmark.startMetric("OINODb", "sqlSelect")
-        let result:OINODataSet = await this._query(sql)
-        OINOBenchmark.endMetric("OINODb", "sqlSelect", result.status != 500)
-        return result
-    }
-
-    /**
-     * Execute other sql operations.
-     *
-     * @param sql SQL statement.
-     *
-     */
-    async sqlExec(sql:string): Promise<OINODataSet> {
-        if (!this.isValidated) {
-            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
-        }
-        OINOBenchmark.startMetric("OINODb", "sqlExec")
-        let result:OINODataSet = await this._exec(sql)
-        OINOBenchmark.endMetric("OINODb", "sqlExec", result.status != 500)
-        return result
-    }
-
-    /**
-     * Execute a parameterized statement, binding its values as positional `?` parameters.
-     *
-     * @param statement statement (SQL text + ordered bind values) to execute
-     *
-     */
-    async runStatement(statement:OINODbSqlStatement): Promise<OINODataSet> {
-        if (!this.isValidated) {
-            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
-        }
-        OINOBenchmark.startMetric("OINODb", "runStatement")
-        let result:OINODataSet = await this._exec(statement.sql, statement.values)
-        OINOBenchmark.endMetric("OINODb", "runStatement", result.status != 500)
-        return result
-    }
-
-    private _getSchemaSql():string {
-        const sql =
-`SELECT
-    C.COLUMN_NAME,
-    C.COLUMN_TYPE,
-    C.IS_NULLABLE,
-    C.COLUMN_KEY,
-    C.COLUMN_DEFAULT,
-    C.EXTRA,
-    KCU.CONSTRAINT_NAME AS ForeignKeyName
-FROM information_schema.COLUMNS C
-	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
-WHERE C.TABLE_SCHEMA = ? AND C.TABLE_NAME = ?
-ORDER BY C.ORDINAL_POSITION;`
-        return sql
-    }
-
-    private _getValidateSql():string {
-        const sql =
-`SELECT
-    Count(C.COLUMN_NAME) AS COLUMN_COUNT
-FROM information_schema.COLUMNS C
-	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
-WHERE C.TABLE_SCHEMA = ?;`
-        return sql
-    }
-
-
-    /**
-     * Get the schema fields of a table as `OINODataField`s (without any API-level field filtering).
-     * 
-     * @param tableName name of the table
-     *
-     */
-    async getSchemaFields(tableName:string): Promise<OINODataField[]> {
-        const fields:OINODataField[] = []
-        const schema_res:OINODataSet = await this._query(this._getSchemaSql(), [this.dbParams.database, tableName])
-        while (!schema_res.isEof()) {
-            const row:OINODataRow = schema_res.getRow()
-            const field_name:string = row[0]?.toString() || ""
-            const field_matches = OINODbMariadb._fieldLengthRegex.exec(row[1]?.toString() || "") || []
-            const sql_type:string = field_matches[1] || ""
-            const field_length1:number = this._parseFieldLength(field_matches[3] || "0")
-            const field_length2:number = this._parseFieldLength(field_matches[4] || "0")
-            const extra:string = row[5]?.toString() || ""
-            const field_params:OINODataFieldParams = {
-                isPrimaryKey: row[3] == "PRI",
-                isForeignKey: row[6] != null,
-                isAutoInc: extra.indexOf('auto_increment') >= 0,
-                isNotNull: row[2] == "NO"
-            }
-            if ((sql_type == "int") || (sql_type == "smallint")  || (sql_type == "mediumint") || (sql_type == "bigint")  || (sql_type == "float") || (sql_type == "double")) {
-                fields.push(new OINONumberDataField(this, field_name, sql_type, field_params))
-            } else if ((sql_type == "date") || (sql_type == "datetime") || (sql_type == "timestamp")) {
-                fields.push(new OINODatetimeDataField(this, field_name, sql_type, field_params))
-            } else if ((sql_type == "char") || (sql_type == "varchar") || (sql_type == "tinytext") || (sql_type == "mediumtext") || (sql_type == "longtext")) {
-                fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, field_length1))
-            } else if ((sql_type == "longblob") || (sql_type == "binary") || (sql_type == "varbinary")) {
-                fields.push(new OINOBlobDataField(this, field_name, sql_type, field_params, field_length1))
-            } else if (sql_type == "decimal") {
-                fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, field_length1 + field_length2 + 1))
-            } else if (sql_type == "bit") {
-                if (field_length1 == 1) {
-                    fields.push(new OINOBooleanDataField(this, field_name, sql_type, field_params))
-                } else {
-                    fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, field_length1 * 8))
-                }
-            } else {
-                fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
-            }
-            await schema_res.next()
-        }
-        return fields
-    }
-
-    /**
-     * Get the names of all user (base) tables in the database schema, excluding system tables and views.
-     *
-     */
-    async getSchemaTables(): Promise<string[]> {
-        const tables:string[] = []
-        const sql:string = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE' ORDER BY TABLE_NAME;"
-        const tables_res:OINODataSet = await this._query(sql, [this.dbParams.database])
-        while (!tables_res.isEof()) {
-            const row:OINODataRow = tables_res.getRow()
-            const table_name:string = row[0]?.toString() || ""
-            if (table_name) {
-                tables.push(table_name)
-            }
-            await tables_res.next()
-        }
-        return tables
-    }
-
-    /**
-     * Resolve the optimal native (SQL) type for a serialized field schema.
-     * 
-     * @param schema serialized field schema
-     *
-     */
-    getNativeDataType(schema:OINODataFieldSchema): string {
-        switch (schema.type) {
-            case "string":
-                return (schema.maxLength || 0) > 0 ? "varchar(" + schema.maxLength + ")" : "longtext"
-            case "number":
-                return schema.fieldParams?.isAutoInc ? "bigint" : "double"
-            case "boolean":
-                return "bit(1)"
-            case "datetime":
-                return "datetime"
-            case "blob":
-                return "longblob"
-            default:
-                throw new Error(OINO_ERROR_PREFIX + ": OINODbMariadb.getNativeDataType - unsupported field type '" + schema.type + "'")
-        }
-    }
-
-    protected _printColumnAutoInc(): string {
-        return "AUTO_INCREMENT"
-    }
-}
-
-
-
+/*
+ * 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 { OINO_ERROR_PREFIX, OINOBenchmark, OINO_INFO_PREFIX, OINOLog, OINOResult } from "@oino-ts/common";
+
+import { OINODataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODataField, OINODataFieldSchema, OINODataFieldParams, OINODataRow, OINODataCell, OINODatetimeDataField, OINOBlobDataField, OINO_EMPTY_ROW, OINO_EMPTY_ROWS } from "@oino-ts/common";
+
+import { OINODb, OINODbParams, OINODbSqlStatement } from "@oino-ts/db";
+
+import mariadb from "mariadb";
+
+/**
+ * Implmentation of OINODataSet for MariaDb.
+ * 
+ */
+class OINOMariadbData extends OINODataSet {
+    private _rows:OINODataRow[] = OINO_EMPTY_ROWS
+    
+    /**
+     * OINOMariadbData constructor
+     * @param params database parameters
+     */
+    constructor(data: any, messages:string[]=[]) {
+        super(data, messages)
+
+        if (data == null) {
+            this.messages.push(OINO_INFO_PREFIX + "SQL result is empty")
+
+        } else if (Array.isArray(data)) {
+            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> {
+        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 OINO_EMPTY_ROW
+        }
+    }
+
+    /**
+     * Gets all rows of data.
+     *
+     */
+    async getAllRows(): Promise<OINODataRow[]> {
+        return this._rows // at the moment theres no result streaming, so we can just return the rows
+    }
+}
+
+/**
+ * Implementation of MariaDb/MySql-database.
+ * 
+ */
+export class OINODbMariadb extends OINODb {
+    
+    private static _fieldLengthRegex = /([^\(\)]+)(\s?\((\d+)\s?\,?\s?(\d*)?\))?/i
+    private static _connectionExceptionMessageRegex = /\(([^\)]*)\) (.*)/i
+    private static _sqlExceptionMessageRegex = /\(([^\)]*)\) (.*)\nsql\:(.*)?/i
+    
+    private _pool:mariadb.Pool
+
+    /**
+     * Constructor of `OINODbMariadb` 
+     * @param params database parameters
+     */
+    constructor(params:OINODbParams) {
+        super(params)
+
+        if (this.dbParams.type !== "OINODbMariadb") {
+            throw new Error(OINO_ERROR_PREFIX + ": Not OINODbMariadb-type: " + this.dbParams.type)
+        } 
+        this._pool = mariadb.createPool({ host: this.dbParams.url, database: this.dbParams.database, port: this.dbParams.port, user: this.dbParams.user, password: this.dbParams.password, acquireTimeout: 2000, debug:false, rowsAsArray: true, multipleStatements: false }) // statements are now executed individually with bind parameters, so stacked/multi-statement execution is disabled
+        delete this.dbParams.password // do not store password in db object
+    }
+
+    private _parseFieldLength(fieldLengthStr:string):number {
+        let result:number = parseInt(fieldLengthStr)
+        if (Number.isNaN(result)) {
+            result = 0
+        }
+        return result
+    }
+
+    private async _query(sql:string, params?:OINODataCell[]):Promise<OINODataSet> {
+        let connection:mariadb.PoolConnection|null = null
+        let rows:OINODataRow[] = OINO_EMPTY_ROWS
+        try {
+            connection = await this._pool.getConnection()
+            const sql_res = (params && params.length > 0) ? await connection.query(sql, params) : await connection.query(sql)
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)) as OINODataRow[] // filter out OkPacket results from multiple statements
+            }
+        } catch (e:any) {
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", {message:e.message, stack:e.stack})
+            return new OINOMariadbData(OINO_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query") as OINOMariadbData 
+
+        } finally {
+            if (connection) {
+                connection.release()
+            }
+        }
+        return new OINOMariadbData(rows, [])
+    }
+
+    private async _exec(sql:string, params?:OINODataCell[]):Promise<OINODataSet> {
+        let connection:mariadb.PoolConnection|null = null
+        let rows:OINODataRow[] = OINO_EMPTY_ROWS
+        try {
+            connection = await this._pool.getConnection()
+            const sql_res = (params && params.length > 0) ? await connection.query(sql, params) : await connection.query(sql)
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)) // filter out OkPacket results from multiple statements
+            }
+        
+        } catch (e:any) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", {message:msg_parts[2], stack:e.stack})
+            return new OINOMariadbData(OINO_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec") as OINOMariadbData
+
+        } finally {
+            if (connection) {
+                connection.release()
+            }
+        }
+        return new OINOMariadbData(rows, [])
+    }
+
+    /**
+     * Print a table name using database specific SQL escaping.
+     * 
+     * @param sqlTable name of the table
+     *
+     */
+    printTableName(sqlTable:string): string {
+        return "`"+sqlTable.replaceAll("`", "``")+"`"
+    }
+
+    /**
+     * Print a column name with correct SQL escaping.
+     *
+     * @param sqlColumn name of the column
+     *
+     */
+    printColumnName(sqlColumn:string): string {
+        return "`"+sqlColumn.replaceAll("`", "``")+"`"
+    }
+
+    /**
+     * Print a bind-parameter placeholder for the given zero-based parameter index (MySQL/MariaDB `?`).
+     *
+     * @param index zero-based parameter index
+     *
+     */
+    printParameterName(index:number): string {
+        return "?"
+    }
+
+    /**
+     * Coerce a data value into a MariaDB bind-parameter value. The connector binds numbers,
+     * strings, `Date` and `Buffer` natively; booleans are mapped to 1/0 for `bit`/numeric columns.
+     *
+     * @param cellValue data value to bind
+     * @param nativeType native type name for the table column
+     *
+     */
+    bindCellValue(cellValue:OINODataCell, nativeType: string): OINODataCell {
+        if (cellValue === undefined) {
+            return null
+        }
+        if (typeof cellValue === "boolean") {
+            return cellValue ? 1 : 0
+        }
+        return cellValue
+    }
+
+
+    /**
+     * 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 nativeType native type name for table column
+     *
+     */
+    printCellAsValue(cellValue:OINODataCell, nativeType: string): string {
+        if (cellValue === null) {
+            return "NULL"
+
+        } else if (cellValue === undefined) {
+            return "UNDEFINED"
+
+        } else if ((nativeType == "int") || (nativeType == "smallint") || (nativeType == "float") || (nativeType == "double")) {
+            return cellValue.toString()
+
+        } else if ((nativeType == "longblob") || (nativeType == "binary") || (nativeType == "varbinary")) {
+            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 (((nativeType == "date") || (nativeType == "datetime") || (nativeType == "timestamp")) && (cellValue instanceof Date)) {
+            return "\"" + cellValue.toISOString().replace('T', ' ').substring(0, 23) + "\""
+
+        } else if ((nativeType == "bit")) {
+            if ((cellValue === false) || (cellValue == null) || (cellValue == "") || (cellValue.toString().toLowerCase() == "false") || (cellValue == "0")) {
+                return "b'0'"
+            } else if ((cellValue === true) || (cellValue.toString().toLowerCase() == "true")) {
+                return "b'1'"
+            } else {
+                return "b'" + cellValue.toString() + "'" // rest is assumed to be a valid bitstring
+            }
+
+        } else {
+            return this.printStringValue(cellValue?.toString())
+        }
+    }
+
+    /**
+     * Print a single string value as valid sql literal
+     * 
+     * @param sqlString string value
+     *
+     */
+    printStringValue(sqlString:string): string {
+        return "\"" + sqlString.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\r", "\\r").replaceAll("\n", "\\n").replaceAll("\t", "\\t") + "\""
+    }
+
+
+    /**
+     * Parse a single SQL result value for serialization using the context of the native data
+     * type.
+     * 
+     * @param sqlValue data from serialization
+     * @param nativeType native type name for table column
+     * 
+     */
+    parseValueAsCell(sqlValue:OINODataCell, nativeType: string): OINODataCell {
+        if ((sqlValue === null) || (sqlValue == "NULL")) {
+            return null
+
+        } else if (sqlValue === undefined) {
+            return undefined
+
+        } else if (((nativeType == "date")) && (typeof(sqlValue) == "string") && (sqlValue != "")) {
+            return new Date(sqlValue)
+
+        } else if ((nativeType == "bit") && (sqlValue instanceof Buffer)) { // mariadb returns a buffer for bit-fields
+            const buf:Buffer = sqlValue as Buffer
+            if (buf.length == 1) {
+                return buf.readUInt8(0) === 1
+            } else {
+                let result:string = ""
+                for (let i=0; i<buf.length; i++) {
+                    result += buf[i].toString(2).padStart(8, '0')
+                }
+                return result
+            }
+
+        } else {
+            return sqlValue
+        }
+
+    }
+
+    /**
+     * Connect to database.
+     *
+     */
+    async connect(): Promise<OINOResult> {
+        let result:OINOResult = new OINOResult()
+        if (this.isConnected) {
+            return result
+        }
+        let connection:mariadb.PoolConnection|null = null
+        try {
+            // make sure that any items are correctly URL encoded in the connection string
+            connection = await this._pool.getConnection()
+            this.isConnected = true
+
+        } catch (e:any) {
+            const msg_parts = (e as Error).message.match(OINODbMariadb._connectionExceptionMessageRegex) || []
+            result.setError(500, "Error connecting to server: " + msg_parts[2], "OINODbMariadb.connect")
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", {message:e.message, stack:e.stack})
+        } finally {
+            if (connection) {
+                await connection.release()
+            }
+        }   
+
+        OINOBenchmark.endMetric("OINODb", "connect", result.status != 500)
+        return result
+    }
+
+    /**
+     * Validate connection to database is working. 
+     *
+     */
+    async validate(): Promise<OINOResult> {
+        OINOBenchmark.startMetric("OINODb", "validate")
+        let result:OINOResult = new OINOResult()
+        try {
+            const sql = this._getValidateSql()
+            const sql_res:OINODataSet = await this._query(sql, [this.dbParams.database])
+            if (sql_res.isEmpty()) {
+                result.setError(400, "DB returned no rows for schema!", "OINODbMariadb.validate")
+
+            } else {
+                this.isValidated = true
+            }
+        } catch (e:any) {
+            result.setError(500, "Exception validating connection: " + e.message, "OINODbMariadb.validate")
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", "exception in validate", {message:e.message, stack:e.stack})
+        }
+        OINOBenchmark.endMetric("OINODb", "validate", result.status != 500)
+        return result
+    }
+
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect(): Promise<void> {
+        if (this.isConnected) {
+            await this._pool.end()
+        }
+        this.isConnected = false
+        this.isValidated = false
+    }
+
+    /**
+     * Execute a select operation.
+     * 
+     * @param sql SQL statement.
+     *
+     */
+    async sqlSelect(sql:string): Promise<OINODataSet> {
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
+        }
+        OINOBenchmark.startMetric("OINODb", "sqlSelect")
+        let result:OINODataSet = await this._query(sql)
+        OINOBenchmark.endMetric("OINODb", "sqlSelect", result.status != 500)
+        return result
+    }
+
+    /**
+     * Execute other sql operations.
+     *
+     * @param sql SQL statement.
+     *
+     */
+    async sqlExec(sql:string): Promise<OINODataSet> {
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
+        }
+        OINOBenchmark.startMetric("OINODb", "sqlExec")
+        let result:OINODataSet = await this._exec(sql)
+        OINOBenchmark.endMetric("OINODb", "sqlExec", result.status != 500)
+        return result
+    }
+
+    /**
+     * Execute a parameterized statement, binding its values as positional `?` parameters.
+     *
+     * @param statement statement (SQL text + ordered bind values) to execute
+     *
+     */
+    async runStatement(statement:OINODbSqlStatement): Promise<OINODataSet> {
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
+        }
+        OINOBenchmark.startMetric("OINODb", "runStatement")
+        let result:OINODataSet = await this._exec(statement.sql, statement.values)
+        OINOBenchmark.endMetric("OINODb", "runStatement", result.status != 500)
+        return result
+    }
+
+    private _getSchemaSql():string {
+        const sql =
+`SELECT
+    C.COLUMN_NAME,
+    C.COLUMN_TYPE,
+    C.IS_NULLABLE,
+    C.COLUMN_KEY,
+    C.COLUMN_DEFAULT,
+    C.EXTRA,
+    KCU.CONSTRAINT_NAME AS ForeignKeyName,
+    KCU.REFERENCED_TABLE_NAME,
+    KCU.REFERENCED_COLUMN_NAME
+FROM information_schema.COLUMNS C
+	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
+WHERE C.TABLE_SCHEMA = ? AND C.TABLE_NAME = ?
+ORDER BY C.ORDINAL_POSITION;`
+        return sql
+    }
+
+    private _getValidateSql():string {
+        const sql =
+`SELECT
+    Count(C.COLUMN_NAME) AS COLUMN_COUNT
+FROM information_schema.COLUMNS C
+	LEFT JOIN information_schema.KEY_COLUMN_USAGE KCU ON KCU.TABLE_SCHEMA = C.TABLE_SCHEMA AND KCU.TABLE_NAME = C.TABLE_NAME AND C.COLUMN_NAME = KCU.COLUMN_NAME and KCU.REFERENCED_TABLE_NAME IS NOT NULL
+WHERE C.TABLE_SCHEMA = ?;`
+        return sql
+    }
+
+
+    /**
+     * Get the schema fields of a table as `OINODataField`s (without any API-level field filtering).
+     * 
+     * @param tableName name of the table
+     *
+     */
+    async getSchemaFields(tableName:string): Promise<OINODataField[]> {
+        const fields:OINODataField[] = []
+        const schema_res:OINODataSet = await this._query(this._getSchemaSql(), [this.dbParams.database, tableName])
+        while (!schema_res.isEof()) {
+            const row:OINODataRow = schema_res.getRow()
+            const field_name:string = row[0]?.toString() || ""
+            const field_matches = OINODbMariadb._fieldLengthRegex.exec(row[1]?.toString() || "") || []
+            const sql_type:string = field_matches[1] || ""
+            const field_length1:number = this._parseFieldLength(field_matches[3] || "0")
+            const field_length2:number = this._parseFieldLength(field_matches[4] || "0")
+            const extra:string = row[5]?.toString() || ""
+            const fk_table:string = row[7]?.toString() || ""
+            const fk_column:string = row[8]?.toString() || ""
+            const foreign_key = fk_table ? { table: fk_table, column: fk_column } : null
+            const field_params:OINODataFieldParams = {
+                isPrimaryKey: row[3] == "PRI",
+                isForeignKey: (row[6] != null) || (foreign_key != null),
+                foreignKey: foreign_key,
+                isAutoInc: extra.indexOf('auto_increment') >= 0,
+                isNotNull: row[2] == "NO"
+            }
+            if ((sql_type == "int") || (sql_type == "smallint")  || (sql_type == "mediumint") || (sql_type == "bigint")  || (sql_type == "float") || (sql_type == "double")) {
+                fields.push(new OINONumberDataField(this, field_name, sql_type, field_params))
+            } else if ((sql_type == "date") || (sql_type == "datetime") || (sql_type == "timestamp")) {
+                fields.push(new OINODatetimeDataField(this, field_name, sql_type, field_params))
+            } else if ((sql_type == "char") || (sql_type == "varchar") || (sql_type == "tinytext") || (sql_type == "mediumtext") || (sql_type == "longtext")) {
+                fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, field_length1))
+            } else if ((sql_type == "longblob") || (sql_type == "binary") || (sql_type == "varbinary")) {
+                fields.push(new OINOBlobDataField(this, field_name, sql_type, field_params, field_length1))
+            } else if (sql_type == "decimal") {
+                fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, field_length1 + field_length2 + 1))
+            } else if (sql_type == "bit") {
+                if (field_length1 == 1) {
+                    fields.push(new OINOBooleanDataField(this, field_name, sql_type, field_params))
+                } else {
+                    fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, field_length1 * 8))
+                }
+            } else {
+                fields.push(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
+            }
+            await schema_res.next()
+        }
+        return fields
+    }
+
+    /**
+     * Get the names of all user (base) tables in the database schema, excluding system tables and views.
+     *
+     */
+    async getSchemaTables(): Promise<string[]> {
+        const tables:string[] = []
+        const sql:string = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE' ORDER BY TABLE_NAME;"
+        const tables_res:OINODataSet = await this._query(sql, [this.dbParams.database])
+        while (!tables_res.isEof()) {
+            const row:OINODataRow = tables_res.getRow()
+            const table_name:string = row[0]?.toString() || ""
+            if (table_name) {
+                tables.push(table_name)
+            }
+            await tables_res.next()
+        }
+        return tables
+    }
+
+    /**
+     * Resolve the optimal native (SQL) type for a serialized field schema.
+     * 
+     * @param schema serialized field schema
+     *
+     */
+    getNativeDataType(schema:OINODataFieldSchema): string {
+        switch (schema.type) {
+            case "string":
+                return (schema.maxLength || 0) > 0 ? "varchar(" + schema.maxLength + ")" : "longtext"
+            case "number":
+                return schema.fieldParams?.isAutoInc ? "bigint" : "double"
+            case "boolean":
+                return "bit(1)"
+            case "datetime":
+                return "datetime"
+            case "blob":
+                return "longblob"
+            default:
+                throw new Error(OINO_ERROR_PREFIX + ": OINODbMariadb.getNativeDataType - unsupported field type '" + schema.type + "'")
+        }
+    }
+
+    protected _printColumnAutoInc(): string {
+        return "AUTO_INCREMENT"
+    }
+}
+
+
+