@oino-ts/db-postgresql 0.21.1 → 1.0.0

package/dist/cjs/OINODbPostgresql.js

@@ -10,10 +10,10 @@ const common_1 = require("@oino-ts/common");
 const db_1 = require("@oino-ts/db");
 const pg_1 = require("pg");
 /**
- * Implmentation of OINODbDataSet for Postgresql.
+ * Implmentation of OINODataSet for Postgresql.
  *
  */
-class OINOPostgresqlData extends db_1.OINODbDataSet {
+class OINOPostgresqlData extends common_1.OINODataSet {
     _rows;
     /**
      * OINOPostgresqlData constructor
@@ -72,7 +72,7 @@ class OINOPostgresqlData extends db_1.OINODbDataSet {
             return this._rows[this._currentRow];
         }
         else {
-            return db_1.OINODB_EMPTY_ROW;
+            return common_1.OINO_EMPTY_ROW;
         }
     }
     /**
@@ -95,12 +95,12 @@ class OINODbPostgresql extends db_1.OINODb {
      */
     constructor(params) {
         super(params);
-        if (this._params.type !== "OINODbPostgresql") {
-            throw new Error(common_1.OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this._params.type);
+        if (this.dbParams.type !== "OINODbPostgresql") {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this.dbParams.type);
         }
-        const ssl_enabled = !(this._params.url == "localhost" || this._params.url == "127.0.0.1");
-        this._pool = new pg_1.Pool({ host: this._params.url, database: this._params.database, port: this._params.port, user: this._params.user, password: this._params.password, ssl: ssl_enabled });
-        delete this._params.password;
+        const ssl_enabled = !(this.dbParams.url == "localhost" || this.dbParams.url == "127.0.0.1");
+        this._pool = new pg_1.Pool({ host: this.dbParams.url, database: this.dbParams.database, port: this.dbParams.port, user: this.dbParams.user, password: this.dbParams.password, ssl: ssl_enabled });
+        delete this.dbParams.password;
         this._pool.on("error", (err) => {
             common_1.OINOLog.error("@oino-ts/db-postgresql", "OINODbPostgresql", ".on(error)", "Error-event", { err: err });
         });
@@ -125,12 +125,12 @@ class OINODbPostgresql extends db_1.OINODb {
                 rows = query_result.rows;
             }
             else {
-                rows = db_1.OINODB_EMPTY_ROWS; // return empty row if no rows returned
+                rows = common_1.OINO_EMPTY_ROWS; // return empty row if no rows returned
             }
             return new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            return new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query");
+            return new OINOPostgresqlData(common_1.OINO_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query");
         }
         finally {
             if (connection) {
@@ -151,13 +151,13 @@ class OINODbPostgresql extends db_1.OINODb {
                 rows = query_result.rows;
             }
             else {
-                rows = db_1.OINODB_EMPTY_ROWS; // return empty row if no rows returned
+                rows = common_1.OINO_EMPTY_ROWS; // return empty row if no rows returned
             }
             // if (rows.length > 0) { console.log("OINODbPostgresql._exec: rows", rows) }
             return new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            return new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec");
+            return new OINOPostgresqlData(common_1.OINO_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec");
         }
         finally {
             if (connection) {
@@ -171,7 +171,7 @@ class OINODbPostgresql extends db_1.OINODb {
      * @param sqlTable name of the table
      *
      */
-    printSqlTablename(sqlTable) {
+    printTableName(sqlTable) {
         return "\"" + sqlTable.toLowerCase() + "\"";
     }
     /**
@@ -180,7 +180,7 @@ class OINODbPostgresql extends db_1.OINODb {
      * @param sqlColumn name of the column
      *
      */
-    printSqlColumnname(sqlColumn) {
+    printColumnName(sqlColumn) {
         return "\"" + sqlColumn + "\"";
     }
     /**
@@ -188,20 +188,20 @@ class OINODbPostgresql extends db_1.OINODb {
      * type with the correct SQL escaping.
      *
      * @param cellValue data from sql results
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    printCellAsSqlValue(cellValue, sqlType) {
+    printCellAsValue(cellValue, nativeType) {
         if (cellValue === null) {
             return "NULL";
         }
         else if (cellValue === undefined) {
             return "UNDEFINED";
         }
-        else if ((sqlType == "integer") || (sqlType == "smallint") || (sqlType == "real")) {
+        else if ((nativeType == "integer") || (nativeType == "smallint") || (nativeType == "real")) {
             return cellValue.toString();
         }
-        else if (sqlType == "bytea") {
+        else if (nativeType == "bytea") {
             if (cellValue instanceof Buffer) {
                 return "'\\x" + cellValue.toString("hex") + "'";
             }
@@ -212,7 +212,7 @@ class OINODbPostgresql extends db_1.OINODb {
                 return "\'" + cellValue?.toString() + "\'";
             }
         }
-        else if (sqlType == "boolean") {
+        else if (nativeType == "boolean") {
             if (cellValue == null || cellValue == "" || cellValue.toString().toLowerCase() == "false" || cellValue == "0") {
                 return "false";
             }
@@ -220,11 +220,11 @@ class OINODbPostgresql extends db_1.OINODb {
                 return "true";
             }
         }
-        else if ((sqlType == "date") && (cellValue instanceof Date)) {
+        else if ((nativeType == "date") && (cellValue instanceof Date)) {
             return "\'" + cellValue.toISOString() + "\'";
         }
         else {
-            return this.printSqlString(cellValue.toString());
+            return this.printStringValue(cellValue.toString());
         }
     }
     /**
@@ -233,7 +233,7 @@ class OINODbPostgresql extends db_1.OINODb {
      * @param sqlString string value
      *
      */
-    printSqlString(sqlString) {
+    printStringValue(sqlString) {
         return "\'" + sqlString.replaceAll("'", "''") + "\'";
     }
     /**
@@ -241,17 +241,17 @@ class OINODbPostgresql extends db_1.OINODb {
      * type.
      *
      * @param sqlValue data from serialization
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    parseSqlValueAsCell(sqlValue, sqlType) {
+    parseValueAsCell(sqlValue, nativeType) {
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null;
         }
         else if (sqlValue === undefined) {
             return undefined;
         }
-        else if (((sqlType == "date")) && (typeof (sqlValue) == "string") && (sqlValue != "")) {
+        else if (((nativeType == "date")) && (typeof (sqlValue) == "string") && (sqlValue != "")) {
             return new Date(sqlValue);
         }
         else {
@@ -292,7 +292,7 @@ class OINODbPostgresql extends db_1.OINODb {
         common_1.OINOBenchmark.startMetric("OINODb", "validate");
         let result = new common_1.OINOResult();
         try {
-            const sql = this._getValidateSql(this._params.database);
+            const sql = this._getValidateSql(this.dbParams.database);
             const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbPostgresql.validate");
@@ -358,59 +358,60 @@ 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;
     }
     _getValidateSql(dbName) {
-        const sql = `SELECT 
-    count(col.column_name) AS column_count
-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 
+    count(col.column_name) AS column_count
+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}'`;
         return sql;
     }
     /**
-     * Initialize a data model by getting the SQL schema and populating OINODbDataFields of
+     * Initialize a data model by getting the SQL schema and populating OINODataFields of
      * the model.
      *
      * @param api api which data model to initialize.
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()));
+        api.initializeDatamodel(new db_1.OINODbDataModel(api));
+        const schema_res = await this._query(this._getSchemaSql(this.dbParams.database, api.params.tableName.toLowerCase()));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             const field_name = row[0]?.toString() || "";
@@ -434,31 +435,31 @@ WHERE col.table_catalog = '${dbName}'`;
             }
             else {
                 if ((sql_type == "integer") || (sql_type == "smallint") || (sql_type == "real")) {
-                    api.datamodel.addField(new db_1.OINONumberDataField(this, field_name, sql_type, field_params));
+                    api.datamodel.addField(new common_1.OINONumberDataField(this, field_name, sql_type, field_params));
                 }
                 else if ((sql_type == "date")) {
                     if (api.params.useDatesAsString) {
-                        api.datamodel.addField(new db_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
+                        api.datamodel.addField(new common_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
                     }
                     else {
-                        api.datamodel.addField(new db_1.OINODatetimeDataField(this, field_name, sql_type, field_params));
+                        api.datamodel.addField(new common_1.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 db_1.OINOStringDataField(this, field_name, sql_type, field_params, field_length));
+                    api.datamodel.addField(new common_1.OINOStringDataField(this, field_name, sql_type, field_params, field_length));
                 }
                 else if ((sql_type == "bytea")) {
-                    api.datamodel.addField(new db_1.OINOBlobDataField(this, field_name, sql_type, field_params, field_length));
+                    api.datamodel.addField(new common_1.OINOBlobDataField(this, field_name, sql_type, field_params, field_length));
                 }
                 else if ((sql_type == "boolean")) {
-                    api.datamodel.addField(new db_1.OINOBooleanDataField(this, field_name, sql_type, field_params));
+                    api.datamodel.addField(new common_1.OINOBooleanDataField(this, field_name, sql_type, field_params));
                 }
                 else if ((sql_type == "decimal") || (sql_type == "numeric")) {
-                    api.datamodel.addField(new db_1.OINOStringDataField(this, field_name, sql_type, field_params, numeric_precision + numeric_scale + 1));
+                    api.datamodel.addField(new common_1.OINOStringDataField(this, field_name, sql_type, field_params, numeric_precision + numeric_scale + 1));
                 }
                 else {
                     common_1.OINOLog.info("@oino-ts/db-postgresql", "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 db_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
+                    api.datamodel.addField(new common_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
                 }
             }
             await schema_res.next();

package/dist/esm/OINODbPostgresql.js

@@ -3,14 +3,14 @@
  * 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, OINOLog, OINOResult } from "@oino-ts/common";
-import { OINODb, OINODbDataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODatetimeDataField, OINOBlobDataField, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINOLog, OINOResult, OINODataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODatetimeDataField, OINOBlobDataField, OINO_EMPTY_ROW, OINO_EMPTY_ROWS } from "@oino-ts/common";
+import { OINODb, OINODbDataModel } from "@oino-ts/db";
 import { Pool } from "pg";
 /**
- * Implmentation of OINODbDataSet for Postgresql.
+ * Implmentation of OINODataSet for Postgresql.
  *
  */
-class OINOPostgresqlData extends OINODbDataSet {
+class OINOPostgresqlData extends OINODataSet {
     _rows;
     /**
      * OINOPostgresqlData constructor
@@ -69,7 +69,7 @@ class OINOPostgresqlData extends OINODbDataSet {
             return this._rows[this._currentRow];
         }
         else {
-            return OINODB_EMPTY_ROW;
+            return OINO_EMPTY_ROW;
         }
     }
     /**
@@ -92,12 +92,12 @@ export class OINODbPostgresql extends OINODb {
      */
     constructor(params) {
         super(params);
-        if (this._params.type !== "OINODbPostgresql") {
-            throw new Error(OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this._params.type);
+        if (this.dbParams.type !== "OINODbPostgresql") {
+            throw new Error(OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this.dbParams.type);
         }
-        const ssl_enabled = !(this._params.url == "localhost" || this._params.url == "127.0.0.1");
-        this._pool = new Pool({ host: this._params.url, database: this._params.database, port: this._params.port, user: this._params.user, password: this._params.password, ssl: ssl_enabled });
-        delete this._params.password;
+        const ssl_enabled = !(this.dbParams.url == "localhost" || this.dbParams.url == "127.0.0.1");
+        this._pool = new Pool({ host: this.dbParams.url, database: this.dbParams.database, port: this.dbParams.port, user: this.dbParams.user, password: this.dbParams.password, ssl: ssl_enabled });
+        delete this.dbParams.password;
         this._pool.on("error", (err) => {
             OINOLog.error("@oino-ts/db-postgresql", "OINODbPostgresql", ".on(error)", "Error-event", { err: err });
         });
@@ -122,12 +122,12 @@ export class OINODbPostgresql extends OINODb {
                 rows = query_result.rows;
             }
             else {
-                rows = OINODB_EMPTY_ROWS; // return empty row if no rows returned
+                rows = OINO_EMPTY_ROWS; // return empty row if no rows returned
             }
             return new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            return new OINOPostgresqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query");
+            return new OINOPostgresqlData(OINO_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query");
         }
         finally {
             if (connection) {
@@ -148,13 +148,13 @@ export class OINODbPostgresql extends OINODb {
                 rows = query_result.rows;
             }
             else {
-                rows = OINODB_EMPTY_ROWS; // return empty row if no rows returned
+                rows = OINO_EMPTY_ROWS; // return empty row if no rows returned
             }
             // if (rows.length > 0) { console.log("OINODbPostgresql._exec: rows", rows) }
             return new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            return new OINOPostgresqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec");
+            return new OINOPostgresqlData(OINO_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec");
         }
         finally {
             if (connection) {
@@ -168,7 +168,7 @@ export class OINODbPostgresql extends OINODb {
      * @param sqlTable name of the table
      *
      */
-    printSqlTablename(sqlTable) {
+    printTableName(sqlTable) {
         return "\"" + sqlTable.toLowerCase() + "\"";
     }
     /**
@@ -177,7 +177,7 @@ export class OINODbPostgresql extends OINODb {
      * @param sqlColumn name of the column
      *
      */
-    printSqlColumnname(sqlColumn) {
+    printColumnName(sqlColumn) {
         return "\"" + sqlColumn + "\"";
     }
     /**
@@ -185,20 +185,20 @@ export class OINODbPostgresql extends OINODb {
      * type with the correct SQL escaping.
      *
      * @param cellValue data from sql results
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    printCellAsSqlValue(cellValue, sqlType) {
+    printCellAsValue(cellValue, nativeType) {
         if (cellValue === null) {
             return "NULL";
         }
         else if (cellValue === undefined) {
             return "UNDEFINED";
         }
-        else if ((sqlType == "integer") || (sqlType == "smallint") || (sqlType == "real")) {
+        else if ((nativeType == "integer") || (nativeType == "smallint") || (nativeType == "real")) {
             return cellValue.toString();
         }
-        else if (sqlType == "bytea") {
+        else if (nativeType == "bytea") {
             if (cellValue instanceof Buffer) {
                 return "'\\x" + cellValue.toString("hex") + "'";
             }
@@ -209,7 +209,7 @@ export class OINODbPostgresql extends OINODb {
                 return "\'" + cellValue?.toString() + "\'";
             }
         }
-        else if (sqlType == "boolean") {
+        else if (nativeType == "boolean") {
             if (cellValue == null || cellValue == "" || cellValue.toString().toLowerCase() == "false" || cellValue == "0") {
                 return "false";
             }
@@ -217,11 +217,11 @@ export class OINODbPostgresql extends OINODb {
                 return "true";
             }
         }
-        else if ((sqlType == "date") && (cellValue instanceof Date)) {
+        else if ((nativeType == "date") && (cellValue instanceof Date)) {
             return "\'" + cellValue.toISOString() + "\'";
         }
         else {
-            return this.printSqlString(cellValue.toString());
+            return this.printStringValue(cellValue.toString());
         }
     }
     /**
@@ -230,7 +230,7 @@ export class OINODbPostgresql extends OINODb {
      * @param sqlString string value
      *
      */
-    printSqlString(sqlString) {
+    printStringValue(sqlString) {
         return "\'" + sqlString.replaceAll("'", "''") + "\'";
     }
     /**
@@ -238,17 +238,17 @@ export class OINODbPostgresql extends OINODb {
      * type.
      *
      * @param sqlValue data from serialization
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    parseSqlValueAsCell(sqlValue, sqlType) {
+    parseValueAsCell(sqlValue, nativeType) {
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null;
         }
         else if (sqlValue === undefined) {
             return undefined;
         }
-        else if (((sqlType == "date")) && (typeof (sqlValue) == "string") && (sqlValue != "")) {
+        else if (((nativeType == "date")) && (typeof (sqlValue) == "string") && (sqlValue != "")) {
             return new Date(sqlValue);
         }
         else {
@@ -289,7 +289,7 @@ export class OINODbPostgresql extends OINODb {
         OINOBenchmark.startMetric("OINODb", "validate");
         let result = new OINOResult();
         try {
-            const sql = this._getValidateSql(this._params.database);
+            const sql = this._getValidateSql(this.dbParams.database);
             const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbPostgresql.validate");
@@ -355,59 +355,60 @@ 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;
     }
     _getValidateSql(dbName) {
-        const sql = `SELECT 
-    count(col.column_name) AS column_count
-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 
+    count(col.column_name) AS column_count
+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}'`;
         return sql;
     }
     /**
-     * Initialize a data model by getting the SQL schema and populating OINODbDataFields of
+     * Initialize a data model by getting the SQL schema and populating OINODataFields of
      * the model.
      *
      * @param api api which data model to initialize.
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()));
+        api.initializeDatamodel(new OINODbDataModel(api));
+        const schema_res = await this._query(this._getSchemaSql(this.dbParams.database, api.params.tableName.toLowerCase()));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             const field_name = row[0]?.toString() || "";