mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 01:15:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(plugin-workflow-sql): fix no result when calling stored procedure (#5385)

Browse Source
This commit is contained in:
Junyi 2024-10-10 14:11:32 +08:00 committed by GitHub
parent 744d97c9b4
commit 0183ef0561
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/plugins/@nocobase/plugin-workflow-sql/src/server/SQLInstruction.ts
View File

@ -24,12 +24,12 @@ export default class extends Instruction {
};
}
// @ts-ignore
const [result, meta] = await db.sequelize.query(sql, {
transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction),
// plain: true,
// model: db.getCollection(node.config.collection).model
});
const [result = null, meta = null] =
(await db.sequelize.query(sql, {
transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction),
// plain: true,
// model: db.getCollection(node.config.collection).model
})) ?? [];
return {
result: node.config.withMeta ? [result, meta] : result,

46
packages/plugins/@nocobase/plugin-workflow-sql/src/server/__tests__/instruction.test.ts
View File

@ -14,6 +14,8 @@ import { getApp, sleep } from '@nocobase/plugin-workflow-test';
import Plugin from '..';
const mysql = process.env.DB_DIALECT === 'mysql' ? describe : describe.skip;
describe('workflow > instructions > sql', () => {
let app: Application;
let db: Database;
@ -288,4 +290,48 @@ describe('workflow > instructions > sql', () => {
expect(job.result[0].id).toBe(post.id);
});
});
describe('dialects', () => {
mysql('mysql', () => {
it('stored procedure with result', async () => {
await db.sequelize.query(`DROP PROCEDURE IF EXISTS hello`);
await db.sequelize.query(`CREATE PROCEDURE hello(IN id INT) BEGIN select id + 1 as a; END;`);
const n1 = await workflow.createNode({
type: 'sql',
config: {
sql: 'call hello(1)',
},
});
await PostRepo.create({ values: { title: 't1' } });
await sleep(500);
const [execution] = await workflow.getExecutions();
const [sqlJob] = await execution.getJobs({ order: [['id', 'ASC']] });
expect(sqlJob.status).toBe(JOB_STATUS.RESOLVED);
expect(sqlJob.result).toEqual({ a: 2 });
});
it('stored procedure without result', async () => {
await db.sequelize.query(`DROP PROCEDURE IF EXISTS hello`);
await db.sequelize.query(`CREATE PROCEDURE hello(IN id INT) BEGIN declare i int default 0; END;`);
const n1 = await workflow.createNode({
type: 'sql',
config: {
sql: 'call hello(1)',
},
});
await PostRepo.create({ values: { title: 't1' } });
await sleep(500);
const [execution] = await workflow.getExecutions();
const [sqlJob] = await execution.getJobs({ order: [['id', 'ASC']] });
expect(sqlJob.status).toBe(JOB_STATUS.RESOLVED);
expect(sqlJob.result).toBe(null);
});
});
});
});