@spinajs/orm-sql - npm Package Compare versions

Comparing version 2.0.197 to 2.0.198

lib/cjs/converters.js

@@ -6,2 +6,3 @@ "use strict";
 const luxon_1 = require("luxon");
+const DATE_NUMERICAL_TYPES = ['int', 'integer', 'float', 'double', 'decimal', 'bigint', 'smallint', 'tinyint', 'mediumint'];
 class SqlSetConverter {
@@ -33,8 +34,13 @@ toDB(value) {
     toDB(value, _model, column) {
-        const numericalTypes = ['int', 'tinyint', 'smallint', 'mediumint', 'bigint', 'float', 'double', 'decimal'];
+        if (value === null) {
+            return null;
+        }
+        if (value === undefined) {
+            return '1970-01-01 00:00:00';
+        }
         let dt = value instanceof luxon_1.DateTime ? value : luxon_1.DateTime.fromJSDate(value);
-        if (numericalTypes.includes(column.Type)) {
-            return dt?.toUnixInteger() ?? 0;
+        if (DATE_NUMERICAL_TYPES.includes(column.Type)) {
+            return dt.toUnixInteger() ?? 0;
         }
-        return dt?.toSQL({ includeOffset: false }) ?? "1970-01-01 00:00:00";
+        return dt.toSQL({ includeOffset: false });
     }
@@ -41,0 +47,0 @@ fromDB(value) {

lib/cjs/index.js

@@ -28,9 +28,15 @@ "use strict";
     execute(builder) {
-        const compiled = builder.toDB();
-        if (Array.isArray(compiled)) {
-            // TODO: rethink this cast
-            return Promise.all(compiled.map((c) => this.executeOnDb(c.expression, c.bindings, builder.QueryContext)));
+        try {
+            const compiled = builder.toDB();
+            if (Array.isArray(compiled)) {
+                // TODO: rethink this cast
+                return Promise.all(compiled.map((c) => this.executeOnDb(c.expression, c.bindings, builder.QueryContext)));
+            }
+            else {
+                return this.executeOnDb(compiled.expression, compiled.bindings, builder.QueryContext);
+            }
         }
-        else {
-            return this.executeOnDb(compiled.expression, compiled.bindings, builder.QueryContext);
+        catch (err) {
+            this.Log.error(`Error during query execution: ${err.message}, ${err.stack}, model: ${builder.Model.name}, context: ${builder.QueryContext}`);
+            throw err;
         }
@@ -37,0 +43,0 @@ }

lib/mjs/converters.js

 import { DatetimeValueConverter } from '@spinajs/orm';
 import { DateTime } from 'luxon';
+const DATE_NUMERICAL_TYPES = ['int', 'integer', 'float', 'double', 'decimal', 'bigint', 'smallint', 'tinyint', 'mediumint'];
 export class SqlSetConverter {
@@ -27,8 +28,13 @@ toDB(value) {
     toDB(value, _model, column) {
-        const numericalTypes = ['int', 'tinyint', 'smallint', 'mediumint', 'bigint', 'float', 'double', 'decimal'];
+        if (value === null) {
+            return null;
+        }
+        if (value === undefined) {
+            return '1970-01-01 00:00:00';
+        }
         let dt = value instanceof DateTime ? value : DateTime.fromJSDate(value);
-        if (numericalTypes.includes(column.Type)) {
-            return dt?.toUnixInteger() ?? 0;
+        if (DATE_NUMERICAL_TYPES.includes(column.Type)) {
+            return dt.toUnixInteger() ?? 0;
         }
-        return dt?.toSQL({ includeOffset: false }) ?? "1970-01-01 00:00:00";
+        return dt.toSQL({ includeOffset: false });
     }
@@ -35,0 +41,0 @@ fromDB(value) {

lib/mjs/index.js

@@ -11,9 +11,15 @@ import { SqlDefaultValueBuilder } from './builders.js';
     execute(builder) {
-        const compiled = builder.toDB();
-        if (Array.isArray(compiled)) {
-            // TODO: rethink this cast
-            return Promise.all(compiled.map((c) => this.executeOnDb(c.expression, c.bindings, builder.QueryContext)));
+        try {
+            const compiled = builder.toDB();
+            if (Array.isArray(compiled)) {
+                // TODO: rethink this cast
+                return Promise.all(compiled.map((c) => this.executeOnDb(c.expression, c.bindings, builder.QueryContext)));
+            }
+            else {
+                return this.executeOnDb(compiled.expression, compiled.bindings, builder.QueryContext);
+            }
         }
-        else {
-            return this.executeOnDb(compiled.expression, compiled.bindings, builder.QueryContext);
+        catch (err) {
+            this.Log.error(`Error during query execution: ${err.message}, ${err.stack}, model: ${builder.Model.name}, context: ${builder.QueryContext}`);
+            throw err;
         }
@@ -20,0 +26,0 @@ }

package.json

 {
   "name": "@spinajs/orm-sql",
-  "version": "2.0.197",
+  "version": "2.0.198",
   "description": "framework orm sql language module",
@@ -55,5 +55,5 @@
   "dependencies": {
-    "@spinajs/di": "^2.0.197",
-    "@spinajs/orm": "^2.0.197",
-    "@spinajs/exceptions": "^2.0.197",
+    "@spinajs/di": "^2.0.198",
+    "@spinajs/orm": "^2.0.198",
+    "@spinajs/exceptions": "^2.0.198",
     "luxon": "^3.2.1",
@@ -60,0 +60,0 @@ "typescript-mix": "^3.1.3"

No alert changes

Improved metrics

Total package byte prevSize

403842

increased by0.36%

Lines of code

3616

increased by0.67%

Dependency changes

• Updated@spinajs/di@^2.0.198

• Updated@spinajs/exceptions@^2.0.198

• Updated@spinajs/orm@^2.0.198