remult 2.7.32 → 2.7.34
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/esm/inputTypes.js +1 -0
- package/esm/remult-knex/index.js +10 -5
- package/esm/server/get-remult-admin-html.js +1 -1
- package/esm/server/remult-admin.js +3 -2
- package/esm/src/remult3/Fields.js +5 -0
- package/esm/src/valueConverters.js +2 -0
- package/inputTypes.d.ts +1 -0
- package/inputTypes.js +1 -0
- package/package.json +1 -1
- package/remult-knex/index.js +10 -5
- package/server/get-remult-admin-html.js +1 -1
- package/server/remult-admin.d.ts +1 -1
- package/server/remult-admin.js +2 -1
- package/src/remult3/Fields.js +5 -0
- package/src/valueConverters.js +2 -0
package/esm/inputTypes.js
CHANGED
package/esm/remult-knex/index.js
CHANGED
|
@@ -119,12 +119,17 @@ class KnexEntityDataProvider {
|
|
|
119
119
|
async groupBy(options) {
|
|
120
120
|
return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
|
|
121
121
|
}
|
|
122
|
+
getEntityFrom(e) {
|
|
123
|
+
if (this.entity.options.sqlExpression)
|
|
124
|
+
return this.knex.fromRaw(e.$entityName);
|
|
125
|
+
return this.knex(e.$entityName);
|
|
126
|
+
}
|
|
122
127
|
async count(where) {
|
|
123
128
|
const e = await this.init();
|
|
124
129
|
const br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
|
|
125
130
|
where.__applyToConsumer(br);
|
|
126
131
|
let r = await br.resolveWhere();
|
|
127
|
-
const result = await this.
|
|
132
|
+
const result = await this.getEntityFrom(e)
|
|
128
133
|
.count()
|
|
129
134
|
.where((b) => r.forEach((w) => w(b)));
|
|
130
135
|
var row = result[0];
|
|
@@ -151,7 +156,7 @@ class KnexEntityDataProvider {
|
|
|
151
156
|
colKeys.push(x);
|
|
152
157
|
}
|
|
153
158
|
}
|
|
154
|
-
let query = this.
|
|
159
|
+
let query = this.getEntityFrom(e).select(cols);
|
|
155
160
|
if (options?.where) {
|
|
156
161
|
const br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
|
|
157
162
|
options.where.__applyToConsumer(br);
|
|
@@ -218,7 +223,7 @@ class KnexEntityDataProvider {
|
|
|
218
223
|
}
|
|
219
224
|
}
|
|
220
225
|
let where = await f.resolveWhere();
|
|
221
|
-
await this.
|
|
226
|
+
await this.getEntityFrom(e)
|
|
222
227
|
.update(updateObject)
|
|
223
228
|
.where((b) => where.forEach((w) => w(b)));
|
|
224
229
|
return getRowAfterUpdate(this.entity, this, data, id, 'update');
|
|
@@ -228,7 +233,7 @@ class KnexEntityDataProvider {
|
|
|
228
233
|
let f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
|
|
229
234
|
Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
|
|
230
235
|
let where = await f.resolveWhere();
|
|
231
|
-
await this.
|
|
236
|
+
await this.getEntityFrom(e)
|
|
232
237
|
.delete()
|
|
233
238
|
.where((b) => where.forEach((w) => w(b)));
|
|
234
239
|
}
|
|
@@ -246,7 +251,7 @@ class KnexEntityDataProvider {
|
|
|
246
251
|
}
|
|
247
252
|
}
|
|
248
253
|
}
|
|
249
|
-
let insert = this.
|
|
254
|
+
let insert = this.getEntityFrom(e).insert(insertObject);
|
|
250
255
|
if (isAutoIncrement(this.entity.idMetadata.field)) {
|
|
251
256
|
let newId;
|
|
252
257
|
if (this.knex.client.config.client === 'mysql2' ||
|