@oino-ts/db 1.0.1 → 1.0.2

package/dist/cjs/OINODbDataModel.js

@@ -35,10 +35,10 @@ class OINODbDataModel extends common_1.OINODataModel {
         for (let i = 0; i < this.fields.length; i++) {
             const f = this.fields[i];
             if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == 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.datasource.printStringValue(OINODbConstants_js_1.OINODB_UNDEFINED) + " as " + f.printColumnName() + ",";
+                result += f.datasource.printStringValue(OINODbConstants_js_1.OINODB_UNDEFINED) + " as " + f.printFieldName() + ",";
             }
             else {
-                result += f.printColumnName() + ",";
+                result += f.printFieldName() + ",";
             }
         }
         return result.substring(0, result.length - 1);
@@ -55,7 +55,7 @@ class OINODbDataModel extends common_1.OINODataModel {
                     columns += ",";
                     values += ",";
                 }
-                columns += f.printColumnName();
+                columns += f.printFieldName();
                 values += f.printCellAsValue(val);
             }
         }
@@ -71,7 +71,7 @@ class OINODbDataModel extends common_1.OINODataModel {
                 if (result != "") {
                     result += ",";
                 }
-                result += f.printColumnName() + "=" + f.printCellAsValue(val);
+                result += f.printFieldName() + "=" + f.printCellAsValue(val);
             }
         }
         if (result == "") {
@@ -94,9 +94,9 @@ class OINODbDataModel extends common_1.OINODataModel {
                 }
                 value = f.printCellAsValue(value);
                 if (value == "") { // ids are user input and could be specially crafted to be empty
-                    throw new Error(common_1.OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName);
+                    throw new Error(common_1.OINO_ERROR_PREFIX + ": invalid id value '" + id_value + "' for table " + this.api.params.tableName);
                 }
-                result += f.printColumnName() + "=" + value;
+                result += f.printFieldName() + "=" + value;
                 i = i + 1;
             }
         }

package/dist/cjs/OINODbQueryParams.js

@@ -55,7 +55,7 @@ class OINODbQueryFilter extends common_1.OINOQueryFilter {
                 common_1.OINOLog.error("@oino-ts/db", "OINODbQueryFilter", "toSql", "Invalid field!", { field: filter.leftSide });
                 throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbQueryFilter.toSql - Invalid field '" + filter.leftSide + "'"); // invalid field name could be a security risk, stop processing
             }
-            result += dataModel.api.datasource.printColumnName(field.name);
+            result += dataModel.dbApi.db.printColumnName(field.name);
         }
         result += OINODbQueryFilter.operatorToSql(filter);
         if (filter.rightSide instanceof common_1.OINOQueryFilter) {
@@ -104,7 +104,7 @@ class OINODbQueryOrder extends common_1.OINOQueryOrder {
             if (result) {
                 result += ",";
             }
-            result += dataModel.api.datasource.printColumnName(field.name) + " ";
+            result += dataModel.dbApi.db.printColumnName(field.name) + " ";
             if (order.descending[i]) {
                 result += "DESC";
             }
@@ -163,7 +163,7 @@ class OINODbQueryAggregate extends common_1.OINOQueryAggregate {
         for (let i = 0; i < dataModel.fields.length; i++) {
             const f = dataModel.fields[i];
             if ((select?.isSelected(f.name) || (f.fieldParams.isPrimaryKey == true)) && (aggregate.fields.includes(f.name) == false)) {
-                result += f.printColumnName() + ",";
+                result += f.printFieldName() + ",";
             }
         }
         result = result.substring(0, result.length - 1);
@@ -182,11 +182,11 @@ class OINODbQueryAggregate extends common_1.OINOQueryAggregate {
         for (let i = 0; i < dataModel.fields.length; i++) {
             const f = dataModel.fields[i];
             if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == 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 += common_1.OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printColumnName() + ",";
+                result += common_1.OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printFieldName() + ",";
             }
             else {
                 const aggregate_index = aggregate.fields.indexOf(f.name);
-                const col_name = f.printColumnName();
+                const col_name = f.printFieldName();
                 if (aggregate_index >= 0) {
                     result += aggregate.functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
                 }

package/dist/esm/OINODbDataModel.js

@@ -32,10 +32,10 @@ export class OINODbDataModel extends OINODataModel {
         for (let i = 0; i < this.fields.length; i++) {
             const f = this.fields[i];
             if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == 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.datasource.printStringValue(OINODB_UNDEFINED) + " as " + f.printColumnName() + ",";
+                result += f.datasource.printStringValue(OINODB_UNDEFINED) + " as " + f.printFieldName() + ",";
             }
             else {
-                result += f.printColumnName() + ",";
+                result += f.printFieldName() + ",";
             }
         }
         return result.substring(0, result.length - 1);
@@ -52,7 +52,7 @@ export class OINODbDataModel extends OINODataModel {
                     columns += ",";
                     values += ",";
                 }
-                columns += f.printColumnName();
+                columns += f.printFieldName();
                 values += f.printCellAsValue(val);
             }
         }
@@ -68,7 +68,7 @@ export class OINODbDataModel extends OINODataModel {
                 if (result != "") {
                     result += ",";
                 }
-                result += f.printColumnName() + "=" + f.printCellAsValue(val);
+                result += f.printFieldName() + "=" + f.printCellAsValue(val);
             }
         }
         if (result == "") {
@@ -91,9 +91,9 @@ export class OINODbDataModel extends OINODataModel {
                 }
                 value = f.printCellAsValue(value);
                 if (value == "") { // ids are user input and could be specially crafted to be empty
-                    throw new Error(OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName);
+                    throw new Error(OINO_ERROR_PREFIX + ": invalid id value '" + id_value + "' for table " + this.api.params.tableName);
                 }
-                result += f.printColumnName() + "=" + value;
+                result += f.printFieldName() + "=" + value;
                 i = i + 1;
             }
         }

package/dist/esm/OINODbQueryParams.js

@@ -52,7 +52,7 @@ export class OINODbQueryFilter extends OINOQueryFilter {
                 OINOLog.error("@oino-ts/db", "OINODbQueryFilter", "toSql", "Invalid field!", { field: filter.leftSide });
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbQueryFilter.toSql - Invalid field '" + filter.leftSide + "'"); // invalid field name could be a security risk, stop processing
             }
-            result += dataModel.api.datasource.printColumnName(field.name);
+            result += dataModel.dbApi.db.printColumnName(field.name);
         }
         result += OINODbQueryFilter.operatorToSql(filter);
         if (filter.rightSide instanceof OINOQueryFilter) {
@@ -100,7 +100,7 @@ export class OINODbQueryOrder extends OINOQueryOrder {
             if (result) {
                 result += ",";
             }
-            result += dataModel.api.datasource.printColumnName(field.name) + " ";
+            result += dataModel.dbApi.db.printColumnName(field.name) + " ";
             if (order.descending[i]) {
                 result += "DESC";
             }
@@ -157,7 +157,7 @@ export class OINODbQueryAggregate extends OINOQueryAggregate {
         for (let i = 0; i < dataModel.fields.length; i++) {
             const f = dataModel.fields[i];
             if ((select?.isSelected(f.name) || (f.fieldParams.isPrimaryKey == true)) && (aggregate.fields.includes(f.name) == false)) {
-                result += f.printColumnName() + ",";
+                result += f.printFieldName() + ",";
             }
         }
         result = result.substring(0, result.length - 1);
@@ -176,11 +176,11 @@ export class OINODbQueryAggregate extends OINOQueryAggregate {
         for (let i = 0; i < dataModel.fields.length; i++) {
             const f = dataModel.fields[i];
             if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == 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 += OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printColumnName() + ",";
+                result += OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printFieldName() + ",";
             }
             else {
                 const aggregate_index = aggregate.fields.indexOf(f.name);
-                const col_name = f.printColumnName();
+                const col_name = f.printFieldName();
                 if (aggregate_index >= 0) {
                     result += aggregate.functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
                 }

package/dist/types/OINODb.d.ts

@@ -30,6 +30,13 @@ export declare abstract class OINODb extends OINODataSource {
      *
      */
     abstract sqlExec(sql: string): Promise<OINODataSet>;
+    /**
+     * Print a table name using database specific SQL escaping.
+     *
+     * @param sqlTable name of the table
+     *
+     */
+    abstract printTableName(sqlTable: string): string;
     /**
      * Print SQL select statement with DB specific formatting.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "1.0.1",
+  "version": "1.0.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,13 +19,13 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "1.0.1",
+    "@oino-ts/common": "1.0.2",
     "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@oino-ts/types": "1.0.1",
+    "@oino-ts/types": "1.0.2",
     "@types/bun": "^1.1.14",
-    "@types/node": "^21.0.10",
+    "@types/node": "^21.0.20",
     "typescript": "~5.9.0"
   },
   "files": [

package/src/OINODb.ts

@@ -48,6 +48,14 @@ export abstract class OINODb extends OINODataSource {
      */
     abstract sqlExec(sql:string): Promise<OINODataSet>
 
+    /**
+     * Print a table name using database specific SQL escaping.
+     * 
+     * @param sqlTable name of the table
+     *
+     */
+    abstract printTableName(sqlTable:string): string
+
     /**
      * Print SQL select statement with DB specific formatting.
      * 

package/src/OINODbDataModel.ts

@@ -39,9 +39,9 @@ export class OINODbDataModel extends OINODataModel {
         for (let i=0; i < this.fields.length; i++) {
             const f:OINODataField = this.fields[i]
             if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == 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.datasource.printStringValue(OINODB_UNDEFINED) + " as " + f.printColumnName()+","
+                result += f.datasource.printStringValue(OINODB_UNDEFINED) + " as " + f.printFieldName()+","
             } else {
-                result += f.printColumnName()+","
+                result += f.printFieldName()+","
             }
         }
         return result.substring(0, result.length-1)
@@ -59,7 +59,7 @@ export class OINODbDataModel extends OINODataModel {
                     columns += ",";
                     values += ",";
                 }
-                columns += f.printColumnName();
+                columns += f.printFieldName();
                 values += f.printCellAsValue(val);
             }
         }
@@ -76,7 +76,7 @@ export class OINODbDataModel extends OINODataModel {
                 if (result != "") {
                     result += ",";
                 }
-                result += f.printColumnName() + "=" + f.printCellAsValue(val);
+                result += f.printFieldName() + "=" + f.printCellAsValue(val);
             }
         }
         if (result == "") {
@@ -100,9 +100,9 @@ export class OINODbDataModel extends OINODataModel {
                 }
                 value = f.printCellAsValue(value)
                 if (value == "") { // ids are user input and could be specially crafted to be empty
-                    throw new Error(OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName)
+                    throw new Error(OINO_ERROR_PREFIX + ": invalid id value '" + id_value + "' for table " + this.api.params.tableName)
                 }
-                result += f.printColumnName() + "=" + value; 
+                result += f.printFieldName() + "=" + value; 
                 i = i + 1
             }
         }

package/src/OINODbQueryParams.ts

@@ -57,7 +57,7 @@ export class OINODbQueryFilter extends OINOQueryFilter {
                 OINOLog.error("@oino-ts/db", "OINODbQueryFilter", "toSql", "Invalid field!", {field:filter.leftSide})
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbQueryFilter.toSql - Invalid field '" + filter.leftSide + "'") // invalid field name could be a security risk, stop processing
             }
-            result += dataModel.api.datasource.printColumnName(field.name)
+            result += dataModel.dbApi.db.printColumnName(field.name)
         }
         result += OINODbQueryFilter.operatorToSql(filter)
         if (filter.rightSide instanceof OINOQueryFilter) {
@@ -106,7 +106,7 @@ export class OINODbQueryOrder extends OINOQueryOrder {
             if (result) {
                 result += ","
             }
-            result += dataModel.api.datasource.printColumnName(field.name) + " "
+            result += dataModel.dbApi.db.printColumnName(field.name) + " "
             if (order.descending[i]) {
                 result += "DESC"
             } else {
@@ -166,7 +166,7 @@ export class OINODbQueryAggregate extends OINOQueryAggregate {
         for (let i=0; i<dataModel.fields.length; i++) {
             const f = dataModel.fields[i]
             if ((select?.isSelected(f.name) || (f.fieldParams.isPrimaryKey == true)) && (aggregate.fields.includes(f.name) == false)) {
-                result += f.printColumnName() + ","
+                result += f.printFieldName() + ","
             }
         }
         result = result.substring(0, result.length-1)
@@ -186,11 +186,11 @@ export class OINODbQueryAggregate extends OINOQueryAggregate {
         for (let i=0; i<dataModel.fields.length; i++) {
             const f:OINODataField = dataModel.fields[i]
             if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == 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 += OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printColumnName()+","
+                result += OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printFieldName()+","
 
             } else {
                 const aggregate_index = aggregate.fields.indexOf(f.name)
-                const col_name = f.printColumnName()
+                const col_name = f.printFieldName()
                 if (aggregate_index >= 0) {
                     result += aggregate.functions[aggregate_index] + "(" + col_name + ") as " + col_name + ","
                 } else {