@spinajs/orm - npm Package Compare versions

Comparing version 2.0.321 to 2.0.322

lib/cjs/decorators.js

@@ -304,2 +304,3 @@ "use strict";
     return extractDecoratorPropertyDescriptor((model, target, propertyKey) => {
+        const targetModelDesc = (0, model_js_1.extractModelDescriptor)(target);
         model.Relations.set(propertyKey, {
@@ -312,3 +313,3 @@ Name: propertyKey,
             ForeignKey: foreignKey ?? `${propertyKey.toLowerCase()}_id`,
-            PrimaryKey: primaryKey ?? model.PrimaryKey,
+            PrimaryKey: primaryKey ?? targetModelDesc.PrimaryKey,
             Recursive: false,
@@ -315,0 +316,0 @@ });

lib/cjs/exceptions.d.ts

 import { Exception } from '@spinajs/exceptions';
+import { IDriverOptions } from './interfaces.js';
 /**
@@ -6,2 +7,6 @@ * Exception thrown when functionality is not supported
 export declare class OrmException extends Exception {
+    driver?: Partial<IDriverOptions>;
+    inner?: Error | unknown;
+    constructor(message?: string, driver?: Partial<IDriverOptions>, inner?: Error | unknown);
+    toString(): void;
 }
@@ -8,0 +13,0 @@ /**

lib/cjs/exceptions.js

@@ -9,2 +9,14 @@ "use strict";
 class OrmException extends exceptions_1.Exception {
+    constructor(message, driver, inner) {
+        super('', inner);
+        this.driver = driver;
+        this.inner = inner;
+        if (this.driver) {
+            this.message = `Error during execution statement on connection ${this.driver.Name} at ${this.driver.User}@${this.driver.Host}, inner exception: ${this.inner ?? 'none'}, message: ${this.message}`;
+        }
+        else {
+            this.message = message;
+        }
+    }
+    toString() { }
 }
@@ -11,0 +23,0 @@ exports.OrmException = OrmException;

lib/mjs/decorators.js

@@ -285,2 +285,3 @@ /* eslint-disable prettier/prettier */
     return extractDecoratorPropertyDescriptor((model, target, propertyKey) => {
+        const targetModelDesc = extractModelDescriptor(target);
         model.Relations.set(propertyKey, {
@@ -293,3 +294,3 @@ Name: propertyKey,
             ForeignKey: foreignKey ?? `${propertyKey.toLowerCase()}_id`,
-            PrimaryKey: primaryKey ?? model.PrimaryKey,
+            PrimaryKey: primaryKey ?? targetModelDesc.PrimaryKey,
             Recursive: false,
@@ -296,0 +297,0 @@ });

lib/mjs/exceptions.d.ts

 import { Exception } from '@spinajs/exceptions';
+import { IDriverOptions } from './interfaces.js';
 /**
@@ -6,2 +7,6 @@ * Exception thrown when functionality is not supported
 export declare class OrmException extends Exception {
+    driver?: Partial<IDriverOptions>;
+    inner?: Error | unknown;
+    constructor(message?: string, driver?: Partial<IDriverOptions>, inner?: Error | unknown);
+    toString(): void;
 }
@@ -8,0 +13,0 @@ /**

lib/mjs/exceptions.js

@@ -6,2 +6,14 @@ import { Exception } from '@spinajs/exceptions';
 export class OrmException extends Exception {
+    constructor(message, driver, inner) {
+        super('', inner);
+        this.driver = driver;
+        this.inner = inner;
+        if (this.driver) {
+            this.message = `Error during execution statement on connection ${this.driver.Name} at ${this.driver.User}@${this.driver.Host}, inner exception: ${this.inner ?? 'none'}, message: ${this.message}`;
+        }
+        else {
+            this.message = message;
+        }
+    }
+    toString() { }
 }
@@ -8,0 +20,0 @@ /**

package.json

 {
   "name": "@spinajs/orm",
-  "version": "2.0.321",
+  "version": "2.0.322",
   "description": "framework orm module",
@@ -58,6 +58,6 @@ "main": "lib/cjs/index.js",
   "dependencies": {
-    "@spinajs/configuration-common": "^2.0.321",
-    "@spinajs/di": "^2.0.321",
-    "@spinajs/exceptions": "^2.0.321",
-    "@spinajs/log-common": "^2.0.321",
+    "@spinajs/configuration-common": "^2.0.322",
+    "@spinajs/di": "^2.0.322",
+    "@spinajs/exceptions": "^2.0.322",
+    "@spinajs/log-common": "^2.0.322",
     "glob": "^8.1.0",
@@ -64,0 +64,0 @@ "glob-to-regexp": "^0.4.1",

No alert changes

Improved metrics

Total package byte prevSize

1315180

0.23%

Lines of code

17686

0.2%

Dependency changes

• Updated

  @spinajs/configuration-common@^2.0.322

• Updated

  @spinajs/di@^2.0.322

• Updated

  @spinajs/exceptions@^2.0.322

• Updated

  @spinajs/log-common@^2.0.322