tspace-mysql 1.0.9 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2789,28 +2789,28 @@ var Database = /** @class */ (function (_super) {
|
|
|
2789
2789
|
return value;
|
|
2790
2790
|
};
|
|
2791
2791
|
Database.prototype._queryGenrate = function () {
|
|
2792
|
-
var
|
|
2792
|
+
var sql = [];
|
|
2793
2793
|
while (true) {
|
|
2794
2794
|
if (this.$db.get('INSERT')) {
|
|
2795
|
-
|
|
2796
|
-
this.$db.get('INSERT')
|
|
2795
|
+
sql = [
|
|
2796
|
+
this.$db.get('INSERT')
|
|
2797
2797
|
];
|
|
2798
2798
|
break;
|
|
2799
2799
|
}
|
|
2800
2800
|
if (this.$db.get('UPDATE')) {
|
|
2801
|
-
|
|
2801
|
+
sql = [
|
|
2802
2802
|
this.$db.get('UPDATE'),
|
|
2803
|
-
this.$db.get('WHERE')
|
|
2803
|
+
this.$db.get('WHERE')
|
|
2804
2804
|
];
|
|
2805
2805
|
break;
|
|
2806
2806
|
}
|
|
2807
2807
|
if (this.$db.get('DELETE')) {
|
|
2808
|
-
|
|
2808
|
+
sql = [
|
|
2809
2809
|
this.$db.get('DELETE')
|
|
2810
2810
|
];
|
|
2811
2811
|
break;
|
|
2812
2812
|
}
|
|
2813
|
-
|
|
2813
|
+
sql = [
|
|
2814
2814
|
this.$db.get('SELECT'),
|
|
2815
2815
|
this.$db.get('FROM'),
|
|
2816
2816
|
this.$db.get('TABLE_NAME'),
|
|
@@ -2824,9 +2824,8 @@ var Database = /** @class */ (function (_super) {
|
|
|
2824
2824
|
];
|
|
2825
2825
|
break;
|
|
2826
2826
|
}
|
|
2827
|
-
var filterSql =
|
|
2828
|
-
|
|
2829
|
-
return sql;
|
|
2827
|
+
var filterSql = sql.filter(function (data) { return data !== '' || data == null; });
|
|
2828
|
+
return filterSql.join(' ');
|
|
2830
2829
|
};
|
|
2831
2830
|
Database.prototype._setupLogger = function () {
|
|
2832
2831
|
var logger = [];
|
package/dist/lib/tspace/Model.js
CHANGED
|
@@ -1659,7 +1659,7 @@ var Model = /** @class */ (function (_super) {
|
|
|
1659
1659
|
if (this.$db.get('UPDATE')) {
|
|
1660
1660
|
sql = [
|
|
1661
1661
|
this.$db.get('UPDATE'),
|
|
1662
|
-
this.$db.get('WHERE')
|
|
1662
|
+
this.$db.get('WHERE')
|
|
1663
1663
|
];
|
|
1664
1664
|
break;
|
|
1665
1665
|
}
|
|
@@ -1852,10 +1852,9 @@ var Model = /** @class */ (function (_super) {
|
|
|
1852
1852
|
this.$constants('RELATIONSHIP').hasOne,
|
|
1853
1853
|
this.$constants('RELATIONSHIP').belongsTo
|
|
1854
1854
|
].some(function (r) { return r === relation; });
|
|
1855
|
+
dataParent[keyRelation] = [];
|
|
1855
1856
|
if (relationIsHasOneOrBelongsTo)
|
|
1856
1857
|
dataParent[keyRelation] = null;
|
|
1857
|
-
else
|
|
1858
|
-
dataParent[keyRelation] = [];
|
|
1859
1858
|
if (!dataChilds.length)
|
|
1860
1859
|
continue;
|
|
1861
1860
|
try {
|
|
@@ -2177,7 +2176,6 @@ var Model = /** @class */ (function (_super) {
|
|
|
2177
2176
|
return result_3;
|
|
2178
2177
|
}
|
|
2179
2178
|
var result = this._result((_e = data.shift()) !== null && _e !== void 0 ? _e : null);
|
|
2180
|
-
console.log(result);
|
|
2181
2179
|
if (result == null)
|
|
2182
2180
|
throw new Error('test test');
|
|
2183
2181
|
return result;
|
|
@@ -2391,7 +2389,6 @@ var Model = /** @class */ (function (_super) {
|
|
|
2391
2389
|
objects = __assign(__assign({}, objects), (_a = {}, _a[createdAt] = this.$utils.timestamp(), _a[updatedAt] = this.$utils.timestamp(), _a));
|
|
2392
2390
|
}
|
|
2393
2391
|
if (this.$db.get('UUID')) {
|
|
2394
|
-
console.log(this.$db.get('UUID_FORMAT'));
|
|
2395
2392
|
objects = __assign(__assign({}, objects), (_b = {}, _b[this.$db.get('UUID_FORMAT')] = this.$utils.generateUUID(), _b));
|
|
2396
2393
|
}
|
|
2397
2394
|
var columns = Object.keys(objects).map(function (data) { return "".concat(data); });
|