@mikro-orm/knex 5.9.6-dev.0 → 5.9.6-dev.2
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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/knex",
|
|
3
|
-
"version": "5.9.6-dev.
|
|
3
|
+
"version": "5.9.6-dev.2",
|
|
4
4
|
"description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "index.mjs",
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
"@mikro-orm/core": "^5.9.5"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@mikro-orm/core": "5.9.6-dev.
|
|
70
|
-
"@mikro-orm/entity-generator": "5.9.6-dev.
|
|
71
|
-
"@mikro-orm/migrations": "5.9.6-dev.
|
|
69
|
+
"@mikro-orm/core": "5.9.6-dev.2",
|
|
70
|
+
"@mikro-orm/entity-generator": "5.9.6-dev.2",
|
|
71
|
+
"@mikro-orm/migrations": "5.9.6-dev.2",
|
|
72
72
|
"better-sqlite3": "*",
|
|
73
73
|
"mssql": "*",
|
|
74
74
|
"mysql": "*",
|
package/query/CriteriaNode.js
CHANGED
|
@@ -102,7 +102,7 @@ class CriteriaNode {
|
|
|
102
102
|
return `${this.constructor.name} ${(0, util_1.inspect)(o)}`;
|
|
103
103
|
}
|
|
104
104
|
static isCustomExpression(field) {
|
|
105
|
-
return !!field.match(/[ ?<>=()]|^\d/);
|
|
105
|
+
return !!field.match(/[ ?<>=()]|^\d/) && !field.match(/;|--/);
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
exports.CriteriaNode = CriteriaNode;
|
|
@@ -546,7 +546,7 @@ class QueryBuilderHelper {
|
|
|
546
546
|
static isCustomExpression(field, hasAlias = false) {
|
|
547
547
|
// if we do not have alias, we don't consider spaces as custom expressions
|
|
548
548
|
const re = hasAlias ? /[ ?<>=()'"`:]|^\d/ : /[?<>=()'"`:]|^\d/;
|
|
549
|
-
return !!field.match(re);
|
|
549
|
+
return !!field.match(re) && !field.match(/;|--/);
|
|
550
550
|
}
|
|
551
551
|
prefix(field, always = false, quote = false, idx) {
|
|
552
552
|
let ret;
|