@nocobase/database 0.11.1-alpha.1 → 0.11.1-alpha.3

package/lib/features/referential-integrity-check.d.ts

@@ -1,5 +1,5 @@
-import Database from '../database';
 import { Model, Transactionable } from 'sequelize';
+import Database from '../database';
 interface ReferentialIntegrityCheckOptions extends Transactionable {
     db: Database;
     referencedInstance: Model;

package/lib/features/referential-integrity-check.js

@@ -35,6 +35,9 @@ function _referentialIntegrityCheck() {
           onDelete = reference.onDelete;
         const sourceCollection = db.collections.get(sourceCollectionName);
         const sourceRepository = sourceCollection.repository;
+        if (sourceCollection.isView()) {
+          continue;
+        }
         const filter = {
           [sourceField]: referencedInstance[targetField]
         };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.11.1-alpha.1",
+  "version": "0.11.1-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.11.1-alpha.1",
-    "@nocobase/utils": "0.11.1-alpha.1",
+    "@nocobase/logger": "0.11.1-alpha.3",
+    "@nocobase/utils": "0.11.1-alpha.3",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "dayjs": "^1.11.8",
@@ -29,5 +29,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "9ed1dba520bc5f3a7cb1255ea8d92ccbefc11bc8"
+  "gitHead": "5ed3bd7d5b16bd38d268961b34875d5cd45799ef"
 }

package/src/__tests__/view/view-collection.test.ts

@@ -18,6 +18,133 @@ pgOnly()('', () => {
     await db.close();
   });
 
+  it('should skip on delete on view collection', async () => {
+    const Order = db.collection({
+      name: 'orders',
+      fields: [
+        {
+          type: 'string',
+          name: 'name',
+        },
+        {
+          type: 'hasMany',
+          name: 'orderItems',
+          foreignKey: 'order_id',
+          target: 'orderItems',
+        },
+      ],
+    });
+
+    const OrderItem = db.collection({
+      name: 'orderItems',
+      timestamps: false,
+      fields: [
+        {
+          type: 'integer',
+          name: 'count',
+        },
+        {
+          type: 'belongsTo',
+          name: 'item',
+          target: 'items',
+          foreignKey: 'item_id',
+        },
+        {
+          type: 'belongsTo',
+          name: 'order',
+          target: 'orders',
+          foreignKey: 'order_id',
+          onDelete: 'NO ACTION',
+        },
+      ],
+    });
+
+    const Item = db.collection({
+      name: 'items',
+      fields: [{ name: 'name', type: 'string' }],
+    });
+
+    await db.sync();
+
+    const viewName = 'order_item_view';
+
+    const dropViewSQL = `DROP VIEW IF EXISTS ${viewName}`;
+    await db.sequelize.query(dropViewSQL);
+
+    const viewSQL = `CREATE VIEW ${viewName} as SELECT orders.*, items.name as item_name FROM ${OrderItem.quotedTableName()} as orders INNER JOIN ${Item.quotedTableName()} as items ON orders.item_id = items.id`;
+
+    await db.sequelize.query(viewSQL);
+
+    const OrderItemView = db.collection({
+      name: viewName,
+      view: true,
+      schema: db.inDialect('postgres') ? 'public' : undefined,
+      fields: [
+        {
+          type: 'bigInt',
+          name: 'order_id',
+        },
+        {
+          type: 'bigInt',
+          name: 'item_id',
+          onDelete: 'CASCADE',
+        },
+      ],
+    });
+
+    await db.sync();
+
+    Order.setField('items', {
+      type: 'belongsToMany',
+      target: 'orderItems',
+      through: viewName,
+      foreignKey: 'order_id',
+      otherKey: 'item_id',
+      sourceKey: 'id',
+      targetKey: 'id',
+      onDelete: 'CASCADE',
+    });
+
+    await db.sync();
+
+    const order1 = await db.getRepository('orders').create({
+      values: {
+        name: 'order1',
+        orderItems: [
+          {
+            count: 1,
+            item: {
+              name: 'item1',
+            },
+          },
+          {
+            count: 2,
+            item: {
+              name: 'item2',
+            },
+          },
+        ],
+      },
+    });
+
+    const item1 = await db.getRepository('items').findOne({
+      filter: {
+        name: 'item1',
+      },
+    });
+
+    let error;
+    try {
+      await db.getRepository('orders').destroy({
+        filterByTk: order1.get('id'),
+      });
+    } catch (err) {
+      error = err;
+    }
+
+    expect(error).toBeUndefined();
+  });
+
   it('should update view collection', async () => {
     const UserCollection = db.collection({
       name: 'users',

package/src/features/referential-integrity-check.ts

@@ -1,5 +1,5 @@
-import Database from '../database';
 import { Model, Transactionable } from 'sequelize';
+import Database from '../database';
 
 interface ReferentialIntegrityCheckOptions extends Transactionable {
   db: Database;
@@ -24,6 +24,10 @@ export async function referentialIntegrityCheck(options: ReferentialIntegrityChe
     const sourceCollection = db.collections.get(sourceCollectionName);
     const sourceRepository = sourceCollection.repository;
 
+    if (sourceCollection.isView()) {
+      continue;
+    }
+
     const filter = {
       [sourceField]: referencedInstance[targetField],
     };