@joktec/mysql 0.0.194 → 0.0.196
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AAEpF,OAAO,
|
|
1
|
+
{"version":3,"file":"mysql.finder.d.ts","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AAEpF,OAAO,EAGL,eAAe,EAShB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,qBAAa,WAAW;IACtB,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IASjE,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,UAAU,EACzC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAC3D,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAc/B,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAqE/E,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAQ5D,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;CAalF"}
|
|
@@ -38,54 +38,58 @@ class MysqlFinder {
|
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
if (typeof value === 'object') {
|
|
41
|
+
const conditions = [];
|
|
41
42
|
for (const [op, val] of Object.entries(value)) {
|
|
42
43
|
switch (op) {
|
|
43
44
|
case '$eq':
|
|
44
|
-
|
|
45
|
+
conditions.push((0, lodash_1.isNil)(val) ? (0, typeorm_1.IsNull)() : (0, typeorm_1.Equal)(val));
|
|
45
46
|
break;
|
|
46
47
|
case '$gt':
|
|
47
|
-
|
|
48
|
+
conditions.push((0, typeorm_1.MoreThan)(val));
|
|
48
49
|
break;
|
|
49
50
|
case '$gte':
|
|
50
|
-
|
|
51
|
+
conditions.push((0, typeorm_1.MoreThanOrEqual)(val));
|
|
51
52
|
break;
|
|
52
53
|
case '$lt':
|
|
53
|
-
|
|
54
|
+
conditions.push((0, typeorm_1.LessThan)(val));
|
|
54
55
|
break;
|
|
55
56
|
case '$lte':
|
|
56
|
-
|
|
57
|
+
conditions.push((0, typeorm_1.LessThanOrEqual)(val));
|
|
57
58
|
break;
|
|
58
59
|
case '$ne':
|
|
59
|
-
|
|
60
|
+
conditions.push((0, lodash_1.isNil)(val) ? (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) : (0, typeorm_1.Not)(val));
|
|
60
61
|
break;
|
|
61
62
|
case '$in':
|
|
62
63
|
if ((0, core_1.toArray)(val).length)
|
|
63
|
-
|
|
64
|
+
conditions.push((0, typeorm_1.In)((0, core_1.toArray)(val)));
|
|
64
65
|
break;
|
|
65
66
|
case '$nin':
|
|
66
67
|
if ((0, core_1.toArray)(val).length)
|
|
67
|
-
|
|
68
|
+
conditions.push((0, typeorm_1.Not)((0, typeorm_1.In)((0, core_1.toArray)(val))));
|
|
68
69
|
break;
|
|
69
70
|
case '$like':
|
|
70
|
-
|
|
71
|
+
conditions.push((0, typeorm_1.ILike)(`%${val}%`));
|
|
71
72
|
break;
|
|
72
73
|
case '$begin':
|
|
73
|
-
|
|
74
|
+
conditions.push((0, typeorm_1.ILike)(`${val}%`));
|
|
74
75
|
break;
|
|
75
76
|
case '$end':
|
|
76
|
-
|
|
77
|
+
conditions.push((0, typeorm_1.ILike)(`%${val}`));
|
|
77
78
|
break;
|
|
78
79
|
case '$not':
|
|
79
|
-
|
|
80
|
+
conditions.push((0, typeorm_1.Not)(this.parseCondition(val)));
|
|
80
81
|
break;
|
|
81
82
|
default:
|
|
82
83
|
throw new mysql_exception_1.MysqlException(`Operator ${op} not supported`, { op, val });
|
|
83
84
|
}
|
|
84
85
|
}
|
|
86
|
+
if (conditions.length > 1)
|
|
87
|
+
where[key] = (0, typeorm_1.And)(...conditions);
|
|
88
|
+
else
|
|
89
|
+
where[key] = conditions[0];
|
|
90
|
+
continue;
|
|
85
91
|
}
|
|
86
|
-
|
|
87
|
-
where[key] = value;
|
|
88
|
-
}
|
|
92
|
+
where[key] = value;
|
|
89
93
|
}
|
|
90
94
|
return where;
|
|
91
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql.finder.js","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":";;;AAAA,uCAAoF;AACpF,mCAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"mysql.finder.js","sourceRoot":"","sources":["../../src/helpers/mysql.finder.ts"],"names":[],"mappings":"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"}
|