@nocobase/database 0.21.0-alpha.2 → 0.21.0-alpha.3

package/lib/collection.js

@@ -234,12 +234,14 @@ const _Collection = class _Collection extends import_events.EventEmitter {
         this.db.logger.warn(
           `source collection "${sourceCollectionName}" not found for field "${name}" at collection "${this.name}"`
         );
+        return null;
       } else {
         const sourceField = sourceCollection.fields.get(sourceFieldName);
         if (!sourceField) {
           this.db.logger.warn(
-            `source field "${sourceFieldName}" not found for field "${name}" at collection "${this.name}"`
+            `Source field "${sourceFieldName}" not found for field "${name}" at collection "${this.name}". Source collection: "${sourceCollectionName}"`
           );
+          return null;
         } else {
           options = { ...import_lodash.default.omit(sourceField.options, ["name", "primaryKey"]), ...options };
         }

package/lib/sql-collection/sql-collection.d.ts

@@ -3,5 +3,6 @@ export declare class SqlCollection extends Collection {
     constructor(options: CollectionOptions, context: CollectionContext);
     isSql(): boolean;
     collectionSchema(): any;
+    get filterTargetKey(): string;
     modelInit(): void;
 }

package/lib/sql-collection/sql-collection.js

@@ -36,6 +36,17 @@ const _SqlCollection = class _SqlCollection extends import_collection.Collection
   collectionSchema() {
     return void 0;
   }
+  get filterTargetKey() {
+    var _a;
+    const targetKey = ((_a = this.options) == null ? void 0 : _a.filterTargetKey) || "id";
+    if (targetKey && this.model.getAttributes()[targetKey]) {
+      return targetKey;
+    }
+    if (this.model.primaryKeyAttributes.length > 1) {
+      return null;
+    }
+    return this.model.primaryKeyAttribute;
+  }
   modelInit() {
     var _a;
     const { autoGenId, sql } = this.options;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.21.0-alpha.2",
+  "version": "0.21.0-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.21.0-alpha.2",
-    "@nocobase/utils": "0.21.0-alpha.2",
+    "@nocobase/logger": "0.21.0-alpha.3",
+    "@nocobase/utils": "0.21.0-alpha.3",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -36,5 +36,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "90628f2e2da846208fb2d7966ddb4e467d187ffb"
+  "gitHead": "f7276aff14063a2cf825191a0c83aeacde05a912"
 }