diff --git a/integration-tests/__tests__/object-analyse.spec.js b/integration-tests/__tests__/object-analyse.spec.js index d973a42aa..cfd0a0326 100644 --- a/integration-tests/__tests__/object-analyse.spec.js +++ b/integration-tests/__tests__/object-analyse.spec.js @@ -99,11 +99,12 @@ describe('Object analyse', () => { 'Test parameters simple analyse - %s - %s', testWrapper(async (conn, driver, testName, parameter, engine) => { for (const sql of initSql) await driver.query(conn, sql, { discardResult: true }); + for (const sql of engine.parametersOtherSql) await driver.query(conn, sql, { discardResult: true }); await driver.query(conn, parameter.create, { discardResult: true }); const structure = await driver.analyseFull(conn); - const parameters = structure[parameter.objectTypeField][0].parameters; + const parameters = structure[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters; expect(parameters.length).toEqual(parameter.list.length); for (let i = 0; i < parameters.length; i += 1) { @@ -116,16 +117,17 @@ describe('Object analyse', () => { 'Test parameters create SQL - %s - %s', testWrapper(async (conn, driver, testName, parameter, engine) => { for (const sql of initSql) await driver.query(conn, sql, { discardResult: true }); + for (const sql of engine.parametersOtherSql) await driver.query(conn, sql, { discardResult: true }); await driver.query(conn, parameter.create, { discardResult: true }); const structure1 = await driver.analyseFull(conn); await driver.query(conn, parameter.drop, { discardResult: true }); - const obj = structure1[parameter.objectTypeField][0]; + const obj = structure1[parameter.objectTypeField].find(x => x.pureName == 'obj1'); await driver.query(conn, obj.createSql, { discardResult: true }); const structure2 = await driver.analyseFull(conn); - const parameters = structure2[parameter.objectTypeField][0].parameters; + const parameters = structure2[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters; expect(parameters.length).toEqual(parameter.list.length); for (let i = 0; i < parameters.length; i += 1) { diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 70ae9fc41..6f28f0dc2 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -37,6 +37,7 @@ const engines = [ res: '25', }, ], + parametersOtherSql: ['CREATE PROCEDURE obj2(a int, b int) BEGIN SELECT * FROM t1; END'], parameters: [ { testName: 'simple', @@ -167,6 +168,7 @@ const engines = [ }, ], + parametersOtherSql: ['CREATE PROCEDURE obj2(a integer, b integer) LANGUAGE SQL AS $$ select * from t1 $$'], parameters: [ { testName: 'simple', @@ -277,6 +279,7 @@ end;$$`, drop2: 'DROP PROCEDURE obj2', }, ], + parametersOtherSql: ['CREATE PROCEDURE obj2 (@p1 int, @p2 int) AS SELECT id from t1'], parameters: [ { testName: 'simple',