@oino-ts/db 0.3.4 → 0.4.0

package/dist/esm/OINODbSqlParams.js

@@ -3,7 +3,7 @@
  * 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 { OINOStr, OINO_ERROR_PREFIX, OINOLog } from "./index.js";
+import { OINOStr, OINO_ERROR_PREFIX, OINOLog, OINODB_UNDEFINED } from "./index.js";
 const OINO_FIELD_NAME_CHARS = "\\w\\s\\-\\_\\#\\¤";
 /**
  * Supported logical conjunctions in filter predicates.
@@ -404,28 +404,91 @@ export class OINODbSqlAggregate {
                 result += dataModel.fields[i].printSqlColumnName() + ",";
             }
         }
-        OINOLog.debug("OINODbSqlAggregate.toSql", { result: result });
+        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
         return result.substring(0, result.length - 1);
     }
     /**
      * Print non-aggregated fields as SQL GROUP BY-condition based on the datamodel of the API.
      *
      * @param dataModel data model (and database) to use for formatting of values
+     * @param select what fields to select
      *
      */
-    printSqlColumnNames(dataModel) {
+    printSqlColumnNames(dataModel, select) {
         let result = "";
         for (let i = 0; i < dataModel.fields.length; i++) {
-            const aggregate_index = this._fields.indexOf(dataModel.fields[i].name);
-            const col_name = dataModel.fields[i].printSqlColumnName();
-            if (aggregate_index >= 0) {
-                result += this._functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
+            const f = dataModel.fields[i];
+            if (select?.isSelected(f) == false) { // if a field is not selected, we include a constant and correct fieldname instead so that dimensions of the data don't change but no unnecessary data is fetched
+                result += f.db.printSqlString(OINODB_UNDEFINED) + " as " + f.printSqlColumnName() + ",";
             }
             else {
-                result += col_name + ",";
+                const aggregate_index = this._fields.indexOf(f.name);
+                const col_name = f.printSqlColumnName();
+                if (aggregate_index >= 0) {
+                    result += this._functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
+                }
+                else {
+                    result += col_name + ",";
+                }
             }
         }
-        OINOLog.debug("OINODbSqlAggregate.printSqlColumnNames", { result: result });
+        // OINOLog.debug("OINODbSqlAggregate.printSqlColumnNames", {result:result})
         return result.substring(0, result.length - 1);
     }
+    /**
+     * Does filter contain any valid conditions.
+     *
+     * @param field field to check if it is aggregated
+     */
+    isAggregated(field) {
+        return (this._fields.includes(field.name));
+    }
+}
+/**
+ * Class for ordering select results on a number of columns.
+ *
+ */
+export class OINODbSqlSelect {
+    _columns;
+    /**
+     * Constructor for `OINODbSqlSelect`.
+     *
+     * @param columns array of columns to select
+     *
+     */
+    constructor(columns) {
+        // OINOLog.debug("OINODbSqlSelect.constructor", {columns:columns})
+        this._columns = columns;
+    }
+    /**
+     * Constructor for `OINODbSqlSelect` as parser of http parameter.
+     *
+     * @param columns comma separatef string selected columns from HTTP-request
+     *
+     */
+    static parse(columns) {
+        if (columns == "") {
+            return new OINODbSqlSelect([]);
+        }
+        else {
+            return new OINODbSqlSelect(columns.split(','));
+        }
+    }
+    /**
+     * Does select contain any valid columns.
+     *
+     */
+    isEmpty() {
+        return (this._columns.length == 0);
+    }
+    /**
+     * Does select include given column.
+     *
+     * @param field field to check if it is selected
+     *
+     */
+    isSelected(field) {
+        // OINOLog.debug("OINODbSqlSelect.isSelected", {column:column, columns:this._columns})
+        return ((this._columns.length == 0) || (field.fieldParams.isPrimaryKey == true) || (this._columns.includes(field.name)));
+    }
 }

package/dist/esm/index.js

@@ -6,7 +6,7 @@ export { OINODbDataModel } from "./OINODbDataModel.js";
 export { OINODbModelSet } from "./OINODbModelSet.js";
 export { OINODbDataField, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINOBlobDataField, OINODatetimeDataField } from "./OINODbDataField.js";
 export { OINODbDataSet, OINODbMemoryDataSet, OINODb } from "./OINODb.js";
-export { OINODbSqlFilter, OINODbSqlOrder, OINODbSqlComparison, OINODbSqlLimit, OINODbSqlBooleanOperation, OINODbSqlAggregate, OINODbSqlAggregateFunctions } from "./OINODbSqlParams.js";
+export { OINODbSqlFilter, OINODbSqlOrder, OINODbSqlComparison, OINODbSqlLimit, OINODbSqlBooleanOperation, OINODbSqlAggregate, OINODbSqlAggregateFunctions, OINODbSqlSelect } from "./OINODbSqlParams.js";
 export { OINODbConfig } from "./OINODbConfig.js";
 export { OINODbFactory } from "./OINODbFactory.js";
 export { OINODbSwagger } from "./OINODbSwagger.js";
@@ -15,3 +15,5 @@ export { OINODbParser } from "./OINODbParser.js";
 export const OINODB_EMPTY_ROW = [];
 /** Empty row array instance */
 export const OINODB_EMPTY_ROWS = [OINODB_EMPTY_ROW];
+/** Constant for undefined values */
+export const OINODB_UNDEFINED = ""; // original idea was to have a defined literal that get's swapped back to undefined, but current implementation just leaves it out at serialization (so value does not matter)

package/dist/types/OINODb.d.ts

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

package/dist/types/OINODbApi.d.ts

@@ -32,6 +32,19 @@ export declare class OINODbApiResult extends OINOResult {
  *
  */
 export declare class OINODbHtmlTemplate extends OINOHtmlTemplate {
+    /** Datetime format string */
+    localeStr: string;
+    /** Locale formatter */
+    protected _locale: Intl.DateTimeFormat | null;
+    /**
+     * Constructor of OINODbHtmlTemplate.
+     *
+     * @param template HTML template string
+     * @param localeStr Datetime format string, either "iso" for ISO8601 or "default" for system default or valid locale string
+     * @param localeStyle Datetime format style, either "short/medium/long/full" or Intl.DateTimeFormat options
+     *
+     */
+    constructor(template: string, localeStr?: string, localeStyle?: string | any);
     /**
      * Creates HTML Response from API modelset.
      *

package/dist/types/OINODbConfig.d.ts

@@ -13,6 +13,8 @@ export declare class OINODbConfig {
     static OINODB_SQL_LIMIT_PARAM: string;
     /** Name of the OINODbSqlAggregate-parameter in request */
     static OINODB_SQL_AGGREGATE_PARAM: string;
+    /** Name of the OINODbSqlSelect-parameter in request */
+    static OINODB_SQL_SELECT_PARAM: string;
     /**
      * Set the name of the OINO ID field
      * @param idField name of the OINO ID field

package/dist/types/OINODbDataField.d.ts

@@ -192,6 +192,14 @@ export declare class OINODatetimeDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal: OINODataCell): string | null | undefined;
+    /**
+     * Serialize cell value in the given content format.
+     *
+     * @param cellVal cell value
+     * @param locale locale-object to format datetimes with
+     *
+     */
+    serializeCellWithLocale(cellVal: OINODataCell, locale: Intl.DateTimeFormat): string | null | undefined;
     /**
      * Parce cell value from string using field type specific formatting rules.
      *

package/dist/types/OINODbModelSet.d.ts

@@ -1,4 +1,4 @@
-import { OINODbDataSet, OINODbDataModel, OINOContentType, OINODataCell } from "./index.js";
+import { OINODbDataSet, OINODbDataModel, OINOContentType, OINODataCell, OINODbSqlParams } from "./index.js";
 /**
  * Class for dataset based on a data model that can be serialized to
  * a supported format:
@@ -11,6 +11,8 @@ export declare class OINODbModelSet {
     readonly datamodel: OINODbDataModel;
     /** Reference to data set */
     readonly dataset: OINODbDataSet;
+    /** SQL parameters */
+    readonly sqlParams?: OINODbSqlParams;
     /** Collection of errors */
     errors: string[];
     /**
@@ -18,8 +20,9 @@ export declare class OINODbModelSet {
      *
      * @param datamodel data model
      * @param dataset data set
+     * @param sqlParams SQL parameters
      */
-    constructor(datamodel: OINODbDataModel, dataset: OINODbDataSet);
+    constructor(datamodel: OINODbDataModel, dataset: OINODbDataSet, sqlParams?: OINODbSqlParams);
     private _encodeAndHashFieldValue;
     private _writeRowJson;
     private _writeStringJson;

package/dist/types/OINODbSqlParams.d.ts

@@ -1,4 +1,4 @@
-import { OINODbDataModel } from "./index.js";
+import { OINODbDataField, OINODbDataModel } from "./index.js";
 /**
  * Supported logical conjunctions in filter predicates.
  * @enum
@@ -195,7 +195,47 @@ export declare class OINODbSqlAggregate {
      * Print non-aggregated fields as SQL GROUP BY-condition based on the datamodel of the API.
      *
      * @param dataModel data model (and database) to use for formatting of values
+     * @param select what fields to select
      *
      */
-    printSqlColumnNames(dataModel: OINODbDataModel): string;
+    printSqlColumnNames(dataModel: OINODbDataModel, select?: OINODbSqlSelect): string;
+    /**
+     * Does filter contain any valid conditions.
+     *
+     * @param field field to check if it is aggregated
+     */
+    isAggregated(field: OINODbDataField): boolean;
+}
+/**
+ * Class for ordering select results on a number of columns.
+ *
+ */
+export declare class OINODbSqlSelect {
+    private _columns;
+    /**
+     * Constructor for `OINODbSqlSelect`.
+     *
+     * @param columns array of columns to select
+     *
+     */
+    constructor(columns: string[]);
+    /**
+     * Constructor for `OINODbSqlSelect` as parser of http parameter.
+     *
+     * @param columns comma separatef string selected columns from HTTP-request
+     *
+     */
+    static parse(columns: string): OINODbSqlSelect;
+    /**
+     * Does select contain any valid columns.
+     *
+     */
+    isEmpty(): boolean;
+    /**
+     * Does select include given column.
+     *
+     * @param field field to check if it is selected
+     *
+     */
+    isSelected(field: OINODbDataField): boolean;
 }

package/dist/types/index.d.ts

@@ -3,13 +3,13 @@ export { OINOContentType };
 export { OINO_ERROR_PREFIX, OINO_WARNING_PREFIX, OINO_INFO_PREFIX, OINO_DEBUG_PREFIX, OINOStr, OINOBenchmark, OINOLog, OINOLogLevel, OINOConsoleLog, OINOResult, OINOHttpResult, OINOHtmlTemplate } from "@oino-ts/common";
 import { OINODb } from "./OINODb.js";
 import { OINODbDataField } from "./OINODbDataField.js";
-import { OINODbSqlAggregate, OINODbSqlFilter, OINODbSqlLimit, OINODbSqlOrder } from "./OINODbSqlParams.js";
+import { OINODbSqlAggregate, OINODbSqlFilter, OINODbSqlLimit, OINODbSqlOrder, OINODbSqlSelect } from "./OINODbSqlParams.js";
 export { OINODbApiResult, OINODbHtmlTemplate, OINODbApi } from "./OINODbApi.js";
 export { OINODbDataModel } from "./OINODbDataModel.js";
 export { OINODbModelSet } from "./OINODbModelSet.js";
 export { OINODbDataField, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINOBlobDataField, OINODatetimeDataField } from "./OINODbDataField.js";
 export { OINODbDataSet, OINODbMemoryDataSet, OINODb } from "./OINODb.js";
-export { OINODbSqlFilter, OINODbSqlOrder, OINODbSqlComparison, OINODbSqlLimit, OINODbSqlBooleanOperation, OINODbSqlAggregate, OINODbSqlAggregateFunctions } from "./OINODbSqlParams.js";
+export { OINODbSqlFilter, OINODbSqlOrder, OINODbSqlComparison, OINODbSqlLimit, OINODbSqlBooleanOperation, OINODbSqlAggregate, OINODbSqlAggregateFunctions, OINODbSqlSelect } from "./OINODbSqlParams.js";
 export { OINODbConfig } from "./OINODbConfig.js";
 export { OINODbFactory } from "./OINODbFactory.js";
 export { OINODbSwagger } from "./OINODbSwagger.js";
@@ -89,6 +89,8 @@ export type OINODbSqlParams = {
     limit?: OINODbSqlLimit;
     /** SQL aggregation functions */
     aggregate?: OINODbSqlAggregate;
+    /** SQL select condition */
+    select?: OINODbSqlSelect;
 };
 /** Request options */
 export type OINODbApiRequestParams = {
@@ -113,5 +115,7 @@ export type OINODataRow = Array<OINODataCell>;
 export declare const OINODB_EMPTY_ROW: OINODataRow;
 /** Empty row array instance */
 export declare const OINODB_EMPTY_ROWS: OINODataRow[];
+/** Constant for undefined values */
+export declare const OINODB_UNDEFINED = "";
 /** Key-value collection */
 export type OINOValues = Record<string, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,12 +19,12 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.3.4"
+    "@oino-ts/common": "0.4.0"
   },
   "devDependencies": {
     "@types/node": "^20.14.10",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.3.4",
+    "@oino-ts/types": "0.4.0",
     "typedoc": "^0.25.13"
   },
   "files": [

package/src/OINODb.ts

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

package/src/OINODbApi.test.ts

@@ -6,7 +6,7 @@
 
 import { expect, test } from "bun:test";
 
-import { OINODbApi, OINODbApiParams, OINOContentType, OINODataRow, OINODbDataField, OINOStringDataField, OINODb, OINODbFactory, OINODbParams, OINODbMemoryDataSet, OINODbModelSet, OINOBenchmark, OINOConsoleLog, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINOLogLevel, OINOLog, OINODbSqlLimit, OINODbApiResult, OINODbSqlComparison, OINONumberDataField, OINODatetimeDataField, OINODbApiRequestParams } from "./index.js";
+import { OINODbApi, OINODbApiParams, OINOContentType, OINODataRow, OINODbDataField, OINOStringDataField, OINODb, OINODbFactory, OINODbParams, OINODbMemoryDataSet, OINODbModelSet, OINOBenchmark, OINOConsoleLog, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINOLogLevel, OINOLog, OINODbSqlLimit, OINODbApiResult, OINODbSqlComparison, OINONumberDataField, OINODatetimeDataField, OINODbApiRequestParams, OINODbHtmlTemplate } from "./index.js";
 
 import { OINODbBunSqlite } from "@oino-ts/db-bunsqlite"
 import { OINODbPostgresql } from "@oino-ts/db-postgresql"
@@ -130,6 +130,14 @@ function encodeResult(o:any|undefined):string {
     })
 }
 
+function createApiTemplate(api:OINODbApi):OINODbHtmlTemplate {
+	let template_str = ""
+	for (let i=0; i<api.datamodel.fields.length; i++) {
+		template_str += "<input type='text' name='" + api.datamodel.fields[i].name + "' value='###" + api.datamodel.fields[i].name + "###'></input>"
+	}
+	return new OINODbHtmlTemplate(template_str, "fi", "medium")
+}
+
 export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestParams) {
     // OINOLog.info("OINOTestApi", {dbParams:dbParams, apiDataset:apiDataset})
     const db:OINODb = await OINODbFactory.createDb( dbParams )
@@ -177,6 +185,13 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
         expect(encodeData(await (await api.doRequest("GET", "", "", empty_params)).data?.writeString(OINOContentType.csv))).toMatchSnapshot("GET CSV")
     })
 
+    test(target_name + target_db + target_table + target_group + " select * with template", async () => {
+        const template = createApiTemplate(api)
+        const api_result:OINODbApiResult = await api.doRequest("GET", "", "", empty_params)
+        const html = (await template.renderFromDbData(api_result.data!)).body
+        expect(encodeData(html)).toMatchSnapshot("GET HTML")
+    })
+
     test(target_name + target_db + target_table + target_group + " select * with filter", async () => {
         expect(encodeData(await (await api.doRequest("GET", "", "", request_params_with_filters)).data?.writeString())).toMatchSnapshot("GET JSON FILTER")
     })
@@ -376,6 +391,7 @@ const snapshots = require("./__snapshots__/OINODbApi.test.ts.snap.js")
 
 const api_crosschecks:string[] = [
     "[HTTP GET] select *: GET JSON 1",
+    "[HTTP GET] select * with template: GET HTML 1",
     "[HTTP POST] insert: GET JSON 1",
     "[HTTP POST] insert: GET CSV 1",
     "[HTTP PUT] update JSON: GET JSON 1",

package/src/OINODbApi.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbApiParams, OINODb, OINODbDataSet, OINODbDataModel, OINODbDataField, OINOStringDataField, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINODbModelSet, OINOBenchmark, OINODbApiRequestParams, OINODbConfig, OINOHttpResult, OINOHtmlTemplate, OINONumberDataField, OINODbParser } from "./index.js"
+import { OINODbApiParams, OINODb, OINODbDataSet, OINODbDataModel, OINODbDataField, OINOStringDataField, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINODbModelSet, OINOBenchmark, OINODbApiRequestParams, OINODbConfig, OINOHttpResult, OINOHtmlTemplate, OINONumberDataField, OINODbParser, OINODatetimeDataField } from "./index.js"
 import { OINOLog, OINOResult } from "@oino-ts/common";
 import { OINOHashid } from "@oino-ts/hashid"
 
@@ -61,6 +61,40 @@ export class OINODbApiResult extends OINOResult {
  *
  */
 export class OINODbHtmlTemplate extends OINOHtmlTemplate {
+    /** Datetime format string */
+    localeStr:string
+    /** Locale formatter */
+    protected _locale:Intl.DateTimeFormat|null
+
+    /**
+     * Constructor of OINODbHtmlTemplate.
+     *
+     * @param template HTML template string
+     * @param localeStr Datetime format string, either "iso" for ISO8601 or "default" for system default or valid locale string
+     * @param localeStyle Datetime format style, either "short/medium/long/full" or Intl.DateTimeFormat options
+     * 
+     */
+    constructor (template:string, localeStr:string = "iso", localeStyle:string|any = "medium") {
+        super(template)
+        const supported_locales = Intl.DateTimeFormat.supportedLocalesOf([localeStr])
+        let locale_opts:any
+        if (typeof localeStyle == "string") {
+            locale_opts = { dateStyle: localeStyle, timeStyle: localeStyle }
+        } else {
+            locale_opts = localeStyle
+        }
+
+        if ((localeStr == "iso") || (localeStr == "") || (supported_locales.length == 0)) {
+            this._locale = null
+            this.localeStr = "iso"
+        } else if (localeStr == "default") {
+            this._locale = new Intl.DateTimeFormat(undefined, locale_opts)
+            this.localeStr = "default"
+        } else {
+            this.localeStr = supported_locales[0]
+            this._locale = new Intl.DateTimeFormat(supported_locales[0], locale_opts)
+        }
+    }
 
     /**
      * Creates HTML Response from API modelset.
@@ -92,7 +126,12 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i=0; i<datamodel.fields.length; i++) {
                 const f:OINODbDataField = datamodel.fields[i]
-                let value:string|null|undefined = f.serializeCell(row[i])
+                let value:string|null|undefined
+                if ((this._locale != null) && (f instanceof OINODatetimeDataField)) {
+                    value = f.serializeCellWithLocale(row[i], this._locale)
+                } else {
+                    value = f.serializeCell(row[i])
+                }
                 if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
                     if (value && (f instanceof OINONumberDataField) && (datamodel.api.hashid)) {
                         value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed)
@@ -205,7 +244,7 @@ export class OINODbApi {
                 result.setError(500, sql_res.getFirstError(), "DoGet")
                 result.addDebug("OINO GET SQL [" + sql + "]", "DoPut")
             } else {
-                result.data = new OINODbModelSet(this.datamodel, sql_res)
+                result.data = new OINODbModelSet(this.datamodel, sql_res, params.sqlParams)
             }
         } catch (e:any) {
             result.setError(500, "Unhandled exception in doGet: " + e.message, "DoGet")

package/src/OINODbConfig.ts

@@ -19,6 +19,9 @@ export class OINODbConfig {
     /** Name of the OINODbSqlAggregate-parameter in request */
     static OINODB_SQL_AGGREGATE_PARAM:string = "oinosqlaggregate"
 
+    /** Name of the OINODbSqlSelect-parameter in request */
+    static OINODB_SQL_SELECT_PARAM:string = "oinosqlselect"
+
     /** 
      * Set the name of the OINO ID field 
      * @param idField name of the OINO ID field 

package/src/OINODbDataField.ts

@@ -364,6 +364,30 @@ export class OINODatetimeDataField extends OINODbDataField {
         }
     }
 
+    /**
+     * Serialize cell value in the given content format.
+     * 
+     * @param cellVal cell value
+     * @param locale locale-object to format datetimes with
+     *
+     */
+    serializeCellWithLocale(cellVal: OINODataCell, locale:Intl.DateTimeFormat): string|null|undefined {
+        // OINOLog.debug("OINODatetimeDataField.serializeCell", {cellVal:cellVal, type:typeof(cellVal)})
+        if (typeof(cellVal) == "string") {
+            cellVal = this.db.parseSqlValueAsCell(cellVal, this.sqlType)
+            // OINOLog.debug("OINODatetimeDataField.serializeCell parsed", {cellVal:cellVal, type:typeof(cellVal)})
+        }
+        if ((cellVal === null) || (cellVal === undefined))  {
+            return cellVal
+            
+        } else if (cellVal instanceof Date) {
+            return locale.format(cellVal)
+
+        } else {
+            return cellVal.toString()
+        }
+    }
+
     /**
      * Parce cell value from string using field type specific formatting rules.
      * 

package/src/OINODbDataModel.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbDataField, OINODbApi, OINODataRow, OINO_ERROR_PREFIX, OINODbDataFieldFilter, OINODbConfig, OINODbSqlParams, OINONumberDataField, OINOLog } from "./index.js";
+import { OINODbDataField, OINODbApi, OINODataRow, OINO_ERROR_PREFIX, OINODbDataFieldFilter, OINODbConfig, OINODbSqlParams, OINONumberDataField, OINOLog, OINODbSqlSelect, OINODB_UNDEFINED } from "./index.js";
 
 /**
  * OINO Datamodel object for representing one database table and it's columns.
@@ -41,10 +41,15 @@ export class OINODbDataModel {
         await this.api.db.initializeApiDatamodel(this.api)
     }
 
-    private _printSqlColumnNames(): string {
+    private _printSqlColumnNames(select?:OINODbSqlSelect): string {
         let result: string = "";
         for (let i=0; i < this.fields.length; i++) {
-            result += this.fields[i].printSqlColumnName()+","
+            const f:OINODbDataField = this.fields[i]
+            if (select?.isSelected(f) === false) { // if a field is not selected, we include a constant and correct fieldname instead so that dimensions of the data don't change but no unnecessary data is fetched
+                result += f.db.printSqlString(OINODB_UNDEFINED) + " as " + f.printSqlColumnName()+","
+            } else {
+                result += f.printSqlColumnName()+","
+            }
         }
         return result.substring(0, result.length-1)
     }
@@ -230,17 +235,18 @@ export class OINODbDataModel {
     printSqlSelect(id: string, params:OINODbSqlParams): string {
         let column_names = ""
         if (params.aggregate) {
-            column_names = params.aggregate.printSqlColumnNames(this)
+            column_names = params.aggregate.printSqlColumnNames(this, params.select)
         } else { 
-            column_names = this._printSqlColumnNames()
+            column_names = this._printSqlColumnNames(params.select)
         } 
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {column_names:column_names})
         const order_sql = params.order?.toSql(this) || ""
         const limit_sql = params.limit?.toSql(this) || ""
         const filter_sql = params.filter?.toSql(this) || ""
         const aggregate_sql = params.aggregate?.toSql(this) || ""
         
         let where_sql = ""
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {id:id, select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, aggregate_sql:aggregate_sql})
         if ((id != null) && (id != "") && (filter_sql != ""))  {
             where_sql = this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql
         } else if ((id != null) && (id != "")) {

package/src/OINODbFactory.ts

@@ -4,8 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbApi, OINODbApiParams, OINODbParams, OINOContentType, OINODb, OINODbConstructor, OINODbApiRequestParams, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlParams } from "./index.js"
-import { OINODbSqlAggregate } from "./OINODbSqlParams.js"
+import { OINODbApi, OINODbApiParams, OINODbParams, OINOContentType, OINODb, OINODbConstructor, OINODbApiRequestParams, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect } from "./index.js"
 
 /**
  * Static factory class for easily creating things based on data
@@ -80,6 +79,10 @@ export class OINODbFactory {
         if (aggregate) {
             sql_params.aggregate = OINODbSqlAggregate.parse(aggregate)
         }
+        const select = url.searchParams.get(OINODbConfig.OINODB_SQL_SELECT_PARAM)
+        if (select) {
+            sql_params.select = OINODbSqlSelect.parse(select)
+        }
 
         let result:OINODbApiRequestParams = { sqlParams: sql_params }
 

package/src/OINODbModelSet.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbDataSet, OINODbDataModel, OINODbDataField, OINODataRow, OINOContentType, OINOBlobDataField, OINOStr, OINODbConfig, OINONumberDataField, OINOBooleanDataField, OINODataCell, OINOLog } from "./index.js";
+import { OINODbDataSet, OINODbDataModel, OINODbDataField, OINODataRow, OINOContentType, OINOBlobDataField, OINOStr, OINODbConfig, OINONumberDataField, OINOBooleanDataField, OINODataCell, OINOLog, OINODbSqlSelect, OINODbSqlParams } from "./index.js";
 
 /**
  * Class for dataset based on a data model that can be serialized to 
@@ -21,6 +21,9 @@ export class OINODbModelSet {
     /** Reference to data set */
     readonly dataset: OINODbDataSet
 
+    /** SQL parameters */
+    readonly sqlParams?: OINODbSqlParams
+
     /** Collection of errors */
     errors: string[]
 
@@ -29,10 +32,12 @@ export class OINODbModelSet {
      *
      * @param datamodel data model
      * @param dataset data set
+     * @param sqlParams SQL parameters 
      */
-    constructor(datamodel: OINODbDataModel, dataset: OINODbDataSet) {
+    constructor(datamodel: OINODbDataModel, dataset: OINODbDataSet, sqlParams?: OINODbSqlParams) {
         this.datamodel = datamodel
         this.dataset = dataset
+        this.sqlParams = sqlParams
         this.errors = this.dataset.messages
     }
 
@@ -59,6 +64,9 @@ export class OINODbModelSet {
         let json_row:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue
+            }
             let value:string|null|undefined = f.serializeCell(row[i])
             if (value === undefined) {
                 // OINOLog.info("OINODbModelSet._writeRowJson: undefined value skipped", {field_name:f.name})
@@ -118,6 +126,9 @@ export class OINODbModelSet {
         let csv_row:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue
+            }
             let value:string|null|undefined = f.serializeCell(row[i])
             if (value == null) {
                 csv_row += "," + OINOStr.encode(value, OINOContentType.csv) // either null or undefined
@@ -169,6 +180,9 @@ export class OINODbModelSet {
         let result:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue
+            }
             let value:string|null|undefined = f.serializeCell(row[i])
             let formdata_block:string = ""
             let is_file = (f instanceof OINOBlobDataField)
@@ -213,6 +227,9 @@ export class OINODbModelSet {
         let urlencode_row:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue
+            }
             let value:string|null|undefined = f.serializeCell(row[i])
             if ((value === undefined)) { // || (value === null)) {
                 // console.log("OINODbModelSet._writeRowUrlencode undefined field value:" + fields[i].name)