tspace-mysql 1.2.7 → 1.2.9

package/dist/lib/tspace/Model.js

@@ -2123,7 +2123,7 @@ class Model extends AbstractModel_1.AbstractModel {
             objects = Object.assign(Object.assign({}, objects), { [updatedAt]: this.$utils.timestamp() });
         }
         const keyValue = Object.entries(objects).map(([column, value]) => {
-            if (typeof value === 'string')
+            if (typeof value === 'string' && !(value.includes(this.$constants('RAW'))))
                 value = value === null || value === void 0 ? void 0 : value.replace(/'/g, '');
             return `${column} = ${value == null || value === 'NULL'
                 ? 'NULL'
@@ -2148,7 +2148,7 @@ class Model extends AbstractModel_1.AbstractModel {
         }
         const columns = Object.keys(objects).map((column) => `\`${column}\``);
         const values = Object.values(objects).map((value) => {
-            if (typeof value === 'string')
+            if (typeof value === 'string' && !(value.includes(this.$constants('RAW'))))
                 value = value === null || value === void 0 ? void 0 : value.replace(/'/g, '');
             return `${value == null || value === 'NULL'
                 ? 'NULL'
@@ -2189,7 +2189,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 ];
             }
             const v = Object.values(objects).map((value) => {
-                if (typeof value === 'string')
+                if (typeof value === 'string' && !(value.includes(this.$constants('RAW'))))
                     value = value === null || value === void 0 ? void 0 : value.replace(/'/g, '');
                 return `${value == null || value === 'NULL'
                     ? 'NULL'
@@ -2357,12 +2357,10 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             this._assertError(!this.$state.get('WHERE') && !ignoreWhere, "can't update [update] without where condition");
             const sql = this._buildQueryModel();
+            const [result] = yield this.actionStatement({ sql, returnId: true });
             if (this.$state.get('VOID'))
                 return null;
-            if (!this.$state.get('VOID')) {
-                const [result] = yield this.actionStatement({ sql, returnId: true });
-                if (!result)
-                    return null;
+            if (result) {
                 let data = yield this.queryStatement([
                     `${this.$state.get('SELECT')}`,
                     `${this.$state.get('FROM')}`,
@@ -2378,9 +2376,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 this.$state.set('RESULT', data);
                 return data;
             }
-            const [result] = yield this.actionStatement({ sql, returnId: true });
-            if (!result)
-                return null;
+            return null;
         });
     }
     _assertError(condition = true, message = 'error') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",