@nocobase/database 2.3.0-beta.12 → 2.3.0-beta.14

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.
Files changed (2) hide show
  1. package/lib/eager-loading/eager-loading-tree.js +4 -4
  2. package/package.json +5 -5
package/lib/eager-loading/eager-loading-tree.js CHANGED
@@ -235,10 +235,10 @@ const _EagerLoadingTree = class _EagerLoadingTree {
235
235
  if (!primaryKeyField) {
236
236
  throw new Error(`Model ${node.model.name} does not have primary key`);
237
237
  }
238
- const group = [`${node.model.name}.${primaryKeyField}`];
239
- if (this.db.inDialect("mssql") || this.db.isMySQLCompatibleDialect()) {
240
- group.push(...getRootModelOrderFields(node).map((field) => `${node.model.name}.${field}`));
241
- }
238
+ const group = [
239
+ `${node.model.name}.${primaryKeyField}`,
240
+ ...getRootModelOrderFields(node).map((field) => `${node.model.name}.${field}`)
241
+ ];
242
242
  const ids2 = (await node.model.findAll({
243
243
  ...this.rootQueryOptions,
244
244
  includeIgnoreAttributes: false,
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@nocobase/database",
3
- "version": "2.3.0-beta.12",
3
+ "version": "2.3.0-beta.14",
4
4
  "description": "",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",
7
7
  "license": "Apache-2.0",
8
8
  "dependencies": {
9
- "@nocobase/logger": "2.3.0-beta.12",
10
- "@nocobase/utils": "2.3.0-beta.12",
9
+ "@nocobase/logger": "2.3.0-beta.14",
10
+ "@nocobase/utils": "2.3.0-beta.14",
11
11
  "async-mutex": "^0.3.2",
12
12
  "chalk": "^4.1.1",
13
13
  "cron-parser": "4.4.0",
@@ -18,7 +18,7 @@
18
18
  "flat": "^5.0.2",
19
19
  "glob": "^7.1.6",
20
20
  "graphlib": "^2.1.8",
21
- "joi": "^17.13.3",
21
+ "joi": "^17.13.6",
22
22
  "lodash": "^4.17.21",
23
23
  "nanoid": "^3.3.11",
24
24
  "node-fetch": "^2.6.7",
@@ -38,5 +38,5 @@
38
38
  "url": "git+https://github.com/nocobase/nocobase.git",
39
39
  "directory": "packages/database"
40
40
  },
41
- "gitHead": "ffc1cefed2e8557f547c5dc562459a7390a2cbf8"
41
+ "gitHead": "2e19a2924cd2452eaacb99c5ca3419e656ed89bc"
42
42
  }