@oino-ts/db 0.3.3 → 0.3.4

package/dist/cjs/OINODb.js

@@ -41,15 +41,15 @@ class OINODb {
         if (whereCondition != "") {
             result += " WHERE " + whereCondition;
         }
+        if (groupByCondition != "") {
+            result += " GROUP BY " + groupByCondition;
+        }
         if (orderCondition != "") {
             result += " ORDER BY " + orderCondition;
         }
         if (limitCondition != "") {
             result += " LIMIT " + limitCondition;
         }
-        if (groupByCondition != "") {
-            result += " GROUP BY " + groupByCondition;
-        }
         result += ";";
         // OINOLog.debug("OINODb.printSqlSelect", {result:result})
         return result;

package/dist/cjs/OINODbSqlParams.js

@@ -359,12 +359,12 @@ class OINODbSqlAggregate {
     /**
      * Constructor for `OINODbSqlAggregate`.
      *
-     * @param function aggregate function to use
+     * @param functions aggregate function to use
      * @param fields fields to aggregate
      *
      */
-    constructor(func, fields) {
-        this._functions = func;
+    constructor(functions, fields) {
+        this._functions = functions;
         this._fields = fields;
     }
     /**
@@ -423,11 +423,12 @@ class OINODbSqlAggregate {
         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] + "(" + dataModel.fields[i].printSqlColumnName() + "),";
+                result += this._functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
             }
             else {
-                result += dataModel.fields[i].printSqlColumnName() + ",";
+                result += col_name + ",";
             }
         }
         index_js_1.OINOLog.debug("OINODbSqlAggregate.printSqlColumnNames", { result: result });

package/dist/esm/OINODb.js

@@ -38,15 +38,15 @@ export class OINODb {
         if (whereCondition != "") {
             result += " WHERE " + whereCondition;
         }
+        if (groupByCondition != "") {
+            result += " GROUP BY " + groupByCondition;
+        }
         if (orderCondition != "") {
             result += " ORDER BY " + orderCondition;
         }
         if (limitCondition != "") {
             result += " LIMIT " + limitCondition;
         }
-        if (groupByCondition != "") {
-            result += " GROUP BY " + groupByCondition;
-        }
         result += ";";
         // OINOLog.debug("OINODb.printSqlSelect", {result:result})
         return result;

package/dist/esm/OINODbSqlParams.js

@@ -353,12 +353,12 @@ export class OINODbSqlAggregate {
     /**
      * Constructor for `OINODbSqlAggregate`.
      *
-     * @param function aggregate function to use
+     * @param functions aggregate function to use
      * @param fields fields to aggregate
      *
      */
-    constructor(func, fields) {
-        this._functions = func;
+    constructor(functions, fields) {
+        this._functions = functions;
         this._fields = fields;
     }
     /**
@@ -417,11 +417,12 @@ export class OINODbSqlAggregate {
         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] + "(" + dataModel.fields[i].printSqlColumnName() + "),";
+                result += this._functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
             }
             else {
-                result += dataModel.fields[i].printSqlColumnName() + ",";
+                result += col_name + ",";
             }
         }
         OINOLog.debug("OINODbSqlAggregate.printSqlColumnNames", { result: result });

package/dist/types/OINODbSqlParams.d.ts

@@ -167,11 +167,11 @@ export declare class OINODbSqlAggregate {
     /**
      * Constructor for `OINODbSqlAggregate`.
      *
-     * @param function aggregate function to use
+     * @param functions aggregate function to use
      * @param fields fields to aggregate
      *
      */
-    constructor(func: OINODbSqlAggregateFunctions[], fields: string[]);
+    constructor(functions: OINODbSqlAggregateFunctions[], fields: string[]);
     /**
      * Constructor for `OINODbSqlAggregate` as parser of http parameter.
      *

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "@oino-ts/db",
-  "version": "0.3.3",
-  "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
-  "author": "Matias Kiviniemi (pragmatta)",
-  "license": "MPL-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/pragmatta/oino-ts.git"
-  },
-  "keywords": [
-    "sql",
-    "database",
-    "rest-api",
-    "typescript",
-    "library"
-  ],
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "dependencies": {
-    "@oino-ts/common": "0.3.3"
-  },
-  "devDependencies": {
-    "@types/node": "^20.14.10",
-    "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.3.3",
-    "typedoc": "^0.25.13"
-  },
-  "files": [
-    "src/*.ts",
-    "dist/cjs/*.js",
-    "dist/esm/*.js",
-    "dist/types/*.d.ts"
-  ]
-}
+{
+  "name": "@oino-ts/db",
+  "version": "0.3.4",
+  "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
+  "author": "Matias Kiviniemi (pragmatta)",
+  "license": "MPL-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pragmatta/oino-ts.git"
+  },
+  "keywords": [
+    "sql",
+    "database",
+    "rest-api",
+    "typescript",
+    "library"
+  ],
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "dependencies": {
+    "@oino-ts/common": "0.3.4"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.10",
+    "@types/bun": "^1.1.14",
+    "@oino-ts/types": "0.3.4",
+    "typedoc": "^0.25.13"
+  },
+  "files": [
+    "src/*.ts",
+    "dist/cjs/*.js",
+    "dist/esm/*.js",
+    "dist/types/*.d.ts"
+  ]
+}