@oino-ts/db 0.7.0 → 0.7.2

package/dist/cjs/OINODbDataModel.js

@@ -97,8 +97,12 @@ class OINODbDataModel {
                 if ((f instanceof index_js_1.OINONumberDataField) && (this.api.hashid)) {
                     value = this.api.hashid.decode(value);
                 }
+                value = f.printCellAsSqlValue(value);
+                if (value == "") { // ids are user input and could be specially crafted to be empty
+                    throw new Error(index_js_1.OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName);
+                }
                 // OINOLog.debug("OINODbDataModel._printSqlPrimaryKeyCondition", {field:f.name, value:value, id_value:id_value})
-                result += f.printSqlColumnName() + "=" + f.printCellAsSqlValue(value);
+                result += f.printSqlColumnName() + "=" + value;
                 i = i + 1;
             }
         }

package/dist/cjs/OINODbFactory.js

@@ -28,6 +28,8 @@ class OINODbFactory {
      * Create database from parameters from the registered classes.
      *
      * @param params database connection parameters
+     * @param connect if true, connects to the database
+     * @param validate if true, validates the database connection
      */
     static async createDb(params, connect = true, validate = true) {
         let result;

package/dist/cjs/OINODbSqlParams.js

@@ -172,7 +172,7 @@ class OINODbSqlFilter {
         }
         else {
             const value = field.deserializeCell(this._rightSide);
-            if (!value) {
+            if ((value == null) || (value === "")) {
                 index_js_1.OINOLog.error("OINODbSqlFilter.toSql: Invalid value!", { value: value });
                 throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid value '" + value + "'"); // invalid value could be a security risk, stop processing
             }

package/dist/esm/OINODbDataModel.js

@@ -94,8 +94,12 @@ export class OINODbDataModel {
                 if ((f instanceof OINONumberDataField) && (this.api.hashid)) {
                     value = this.api.hashid.decode(value);
                 }
+                value = f.printCellAsSqlValue(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);
+                }
                 // OINOLog.debug("OINODbDataModel._printSqlPrimaryKeyCondition", {field:f.name, value:value, id_value:id_value})
-                result += f.printSqlColumnName() + "=" + f.printCellAsSqlValue(value);
+                result += f.printSqlColumnName() + "=" + value;
                 i = i + 1;
             }
         }

package/dist/esm/OINODbFactory.js

@@ -25,6 +25,8 @@ export class OINODbFactory {
      * Create database from parameters from the registered classes.
      *
      * @param params database connection parameters
+     * @param connect if true, connects to the database
+     * @param validate if true, validates the database connection
      */
     static async createDb(params, connect = true, validate = true) {
         let result;

package/dist/esm/OINODbSqlParams.js

@@ -169,7 +169,7 @@ export class OINODbSqlFilter {
         }
         else {
             const value = field.deserializeCell(this._rightSide);
-            if (!value) {
+            if ((value == null) || (value === "")) {
                 OINOLog.error("OINODbSqlFilter.toSql: Invalid value!", { value: value });
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid value '" + value + "'"); // invalid value could be a security risk, stop processing
             }

package/dist/types/OINODbApi.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { OINODbApiParams, OINODb, OINODbDataModel, OINODataRow, OINODbModelSet, OINODbApiRequestParams, OINOHttpResult, OINOHtmlTemplate } from "./index.js";
 import { OINOResult } from "@oino-ts/common";
 import { OINOHashid } from "@oino-ts/hashid";

package/dist/types/OINODbFactory.d.ts

@@ -17,6 +17,8 @@ export declare class OINODbFactory {
      * Create database from parameters from the registered classes.
      *
      * @param params database connection parameters
+     * @param connect if true, connects to the database
+     * @param validate if true, validates the database connection
      */
     static createDb(params: OINODbParams, connect?: boolean, validate?: boolean): Promise<OINODb>;
     /**

package/dist/types/OINODbParser.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { OINODbDataModel, OINODataRow, OINODbApiRequestParams } from "./index.js";
 /**
  * Static factory class for easily creating things based on data

package/dist/types/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { OINOContentType } from "@oino-ts/common";
 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";
@@ -48,6 +50,7 @@ export type OINODbApiParams = {
 /**
  * Database class (constructor) type
  * @param dbParams database parameters
+ * @return OINODb instance
  */
 export type OINODbConstructor = new (dbParams: OINODbParams) => OINODb;
 /** Database parameters */

package/package.json

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

package/src/OINODbApi.test.ts

@@ -347,11 +347,11 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     }
 
     target_group = "[BATCH UPDATE]"
-    const string_fields:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return ((field instanceof OINOStringDataField) || (field instanceof OINONumberDataField)) && (field.fieldParams.isPrimaryKey == false) && (field.fieldParams.isForeignKey == false) })
-    if (string_fields.length == 0) {
+    const reversable_fields:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return ((field instanceof OINOStringDataField) || (field instanceof OINONumberDataField)) && (field.fieldParams.isPrimaryKey == false) && (field.fieldParams.isForeignKey == false) })
+    if (reversable_fields.length == 0) {
         OINOLog.info("BATCH UPDATE table " + testParams.apiParams.tableName + " does not have numeric fields and batch update tests are skipped")
     } else {
-        const batch_field = string_fields[0]
+        const batch_field = reversable_fields[0]
         const batch_field_name:string = batch_field.name
         const batch_field_index:number = api.datamodel.findFieldIndexByName(batch_field_name)
         const batch_value = testParams.putRow[batch_field_index] 

package/src/OINODbDataModel.ts

@@ -103,8 +103,12 @@ export class OINODbDataModel {
                 if ((f instanceof OINONumberDataField) && (this.api.hashid)) {
                     value = this.api.hashid.decode(value)
                 }
+                value = f.printCellAsSqlValue(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)
+                }
                 // OINOLog.debug("OINODbDataModel._printSqlPrimaryKeyCondition", {field:f.name, value:value, id_value:id_value})
-                result += f.printSqlColumnName() + "=" + f.printCellAsSqlValue(value); 
+                result += f.printSqlColumnName() + "=" + value; 
                 i = i + 1
             }
         }

package/src/OINODbFactory.ts

@@ -30,6 +30,8 @@ export class OINODbFactory {
      * Create database from parameters from the registered classes.
      * 
      * @param params database connection parameters
+     * @param connect if true, connects to the database
+     * @param validate if true, validates the database connection
      */
     static async createDb(params:OINODbParams, connect:boolean = true, validate:boolean = true):Promise<OINODb> {
         let result:OINODb

package/src/OINODbSqlParams.ts

@@ -167,7 +167,7 @@ export class OINODbSqlFilter {
             result += this._rightSide.toSql(dataModel)
         } else {
             const value = field!.deserializeCell(this._rightSide)
-            if (!value) {
+            if ((value == null) || (value === "")) {
                 OINOLog.error("OINODbSqlFilter.toSql: Invalid value!", {value:value})
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid value '" + value + "'") // invalid value could be a security risk, stop processing
             }

package/src/index.ts

@@ -53,6 +53,7 @@ export type OINODbApiParams = {
 /** 
  * Database class (constructor) type 
  * @param dbParams database parameters
+ * @return OINODb instance
  */
 export type OINODbConstructor = new (dbParams:OINODbParams) => OINODb