@oino-ts/db 0.4.0 → 0.4.2

package/dist/cjs/OINODbDataModel.js

@@ -234,7 +234,7 @@ class OINODbDataModel {
         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) || "";
+        const groupby_sql = params.aggregate?.toSql(this, params.select) || "";
         let where_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 != "")) {
@@ -246,8 +246,8 @@ class OINODbDataModel {
         else if (filter_sql != "") {
             where_sql = filter_sql;
         }
-        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, aggregate_sql);
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
+        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql);
+        index_js_1.OINOLog.debug("OINODbDataModel.printSqlSelect", { result: result });
         return result;
     }
     /**

package/dist/cjs/OINODbModelSet.js

@@ -39,7 +39,7 @@ class OINODbModelSet {
     _encodeAndHashFieldValue(field, value, contentType, primaryKeyValues, rowIdSeed) {
         let result;
         if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
-            if (value && (field instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid)) {
+            if (value && (field instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid) && ((this.sqlParams?.aggregate === undefined) || (this.sqlParams.aggregate.isAggregated(field) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed);
             }
             if (field.fieldParams.isPrimaryKey) {

package/dist/cjs/OINODbSqlParams.js

@@ -398,16 +398,18 @@ 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
      *
      */
-    toSql(dataModel) {
+    toSql(dataModel, select) {
         if (this.isEmpty()) {
             return "";
         }
         let result = "";
         for (let i = 0; i < dataModel.fields.length; i++) {
-            if (this._fields.includes(dataModel.fields[i].name) == false) {
-                result += dataModel.fields[i].printSqlColumnName() + ",";
+            const f = dataModel.fields[i];
+            if (select?.isSelected(f) && (this._fields.includes(f.name) == false)) {
+                result += f.printSqlColumnName() + ",";
             }
         }
         // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
@@ -424,8 +426,8 @@ class OINODbSqlAggregate {
         let result = "";
         for (let i = 0; i < dataModel.fields.length; i++) {
             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(index_js_1.OINODB_UNDEFINED) + " as " + f.printSqlColumnName() + ",";
+            if (select?.isSelected(f) == false) { // if a field is not selected, we include an aggregated constant (min of const string) and correct fieldname instead so that dimensions of the data don't change, it does not need a group by but no unnecessary data is fetched
+                result += OINODbSqlAggregateFunctions.min + "(" + f.db.printSqlString(index_js_1.OINODB_UNDEFINED) + ") as " + f.printSqlColumnName() + ",";
             }
             else {
                 const aggregate_index = this._fields.indexOf(f.name);

package/dist/esm/OINODbDataModel.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 { OINO_ERROR_PREFIX, OINODbConfig, OINONumberDataField, OINODB_UNDEFINED } from "./index.js";
+import { OINO_ERROR_PREFIX, OINODbConfig, OINONumberDataField, OINOLog, OINODB_UNDEFINED } from "./index.js";
 /**
  * OINO Datamodel object for representing one database table and it's columns.
  *
@@ -231,7 +231,7 @@ export class OINODbDataModel {
         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) || "";
+        const groupby_sql = params.aggregate?.toSql(this, params.select) || "";
         let where_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 != "")) {
@@ -243,8 +243,8 @@ export class OINODbDataModel {
         else if (filter_sql != "") {
             where_sql = filter_sql;
         }
-        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, aggregate_sql);
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
+        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql);
+        OINOLog.debug("OINODbDataModel.printSqlSelect", { result: result });
         return result;
     }
     /**

package/dist/esm/OINODbModelSet.js

@@ -36,7 +36,7 @@ export class OINODbModelSet {
     _encodeAndHashFieldValue(field, value, contentType, primaryKeyValues, rowIdSeed) {
         let result;
         if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
-            if (value && (field instanceof OINONumberDataField) && (this.datamodel.api.hashid)) {
+            if (value && (field instanceof OINONumberDataField) && (this.datamodel.api.hashid) && ((this.sqlParams?.aggregate === undefined) || (this.sqlParams.aggregate.isAggregated(field) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed);
             }
             if (field.fieldParams.isPrimaryKey) {

package/dist/esm/OINODbSqlParams.js

@@ -392,16 +392,18 @@ export 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
      *
      */
-    toSql(dataModel) {
+    toSql(dataModel, select) {
         if (this.isEmpty()) {
             return "";
         }
         let result = "";
         for (let i = 0; i < dataModel.fields.length; i++) {
-            if (this._fields.includes(dataModel.fields[i].name) == false) {
-                result += dataModel.fields[i].printSqlColumnName() + ",";
+            const f = dataModel.fields[i];
+            if (select?.isSelected(f) && (this._fields.includes(f.name) == false)) {
+                result += f.printSqlColumnName() + ",";
             }
         }
         // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
@@ -418,8 +420,8 @@ export class OINODbSqlAggregate {
         let result = "";
         for (let i = 0; i < dataModel.fields.length; i++) {
             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() + ",";
+            if (select?.isSelected(f) == false) { // if a field is not selected, we include an aggregated constant (min of const string) and correct fieldname instead so that dimensions of the data don't change, it does not need a group by but no unnecessary data is fetched
+                result += OINODbSqlAggregateFunctions.min + "(" + f.db.printSqlString(OINODB_UNDEFINED) + ") as " + f.printSqlColumnName() + ",";
             }
             else {
                 const aggregate_index = this._fields.indexOf(f.name);

package/dist/types/OINODbSqlParams.d.ts

@@ -188,9 +188,10 @@ 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
      *
      */
-    toSql(dataModel: OINODbDataModel): string;
+    toSql(dataModel: OINODbDataModel, select?: OINODbSqlSelect): string;
     /**
      * Print non-aggregated fields as SQL GROUP BY-condition based on the datamodel of the API.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "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.4.0"
+    "@oino-ts/common": "0.4.2"
   },
   "devDependencies": {
     "@types/node": "^20.14.10",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.4.0",
+    "@oino-ts/types": "0.4.2",
     "typedoc": "^0.25.13"
   },
   "files": [

package/src/OINODbDataModel.ts

@@ -243,7 +243,7 @@ export class OINODbDataModel {
         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) || ""
+        const groupby_sql = params.aggregate?.toSql(this, params.select) || ""
         
         let where_sql = ""
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, aggregate_sql:aggregate_sql})
@@ -254,8 +254,8 @@ export class OINODbDataModel {
         } else if (filter_sql != "") {
             where_sql = filter_sql
         }
-        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, aggregate_sql)
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
+        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql)
+        OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
         return result;
     }
 

package/src/OINODbModelSet.ts

@@ -44,7 +44,7 @@ export class OINODbModelSet {
     private _encodeAndHashFieldValue(field:OINODbDataField, value:string|null, contentType:OINOContentType, primaryKeyValues:string[], rowIdSeed:string):string {
         let result:string
         if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
-            if (value && (field instanceof OINONumberDataField) && (this.datamodel.api.hashid)) {
+            if (value && (field instanceof OINONumberDataField) && (this.datamodel.api.hashid) && ((this.sqlParams?.aggregate === undefined) || (this.sqlParams.aggregate.isAggregated(field) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed)
             }
             if (field.fieldParams.isPrimaryKey) {

package/src/OINODbSqlParams.ts

@@ -397,16 +397,18 @@ export 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 
      *
      */
-    toSql(dataModel:OINODbDataModel):string {
+    toSql(dataModel:OINODbDataModel, select?:OINODbSqlSelect):string {
         if (this.isEmpty()) {
             return ""
         }
         let result:string = ""
         for (let i=0; i<dataModel.fields.length; i++) {
-            if (this._fields.includes(dataModel.fields[i].name) == false) {
-                result += dataModel.fields[i].printSqlColumnName() + ","
+            const f = dataModel.fields[i]
+            if (select?.isSelected(f) && (this._fields.includes(f.name) == false)) {
+                result += f.printSqlColumnName() + ","
             }
         }
         // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
@@ -424,8 +426,8 @@ export class OINODbSqlAggregate {
         let result:string = ""
         for (let i=0; i<dataModel.fields.length; i++) {
             const f:OINODbDataField = 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()+","
+            if (select?.isSelected(f)==false) { // if a field is not selected, we include an aggregated constant (min of const string) and correct fieldname instead so that dimensions of the data don't change, it does not need a group by but no unnecessary data is fetched
+                result += OINODbSqlAggregateFunctions.min + "(" + f.db.printSqlString(OINODB_UNDEFINED) + ") as " + f.printSqlColumnName()+","
 
             } else {
                 const aggregate_index = this._fields.indexOf(f.name)