diff --git a/integration-tests/__tests__/table-analyse.spec.js b/integration-tests/__tests__/table-analyse.spec.js index 2e9b898f1..16c9a6bdc 100644 --- a/integration-tests/__tests__/table-analyse.spec.js +++ b/integration-tests/__tests__/table-analyse.spec.js @@ -14,19 +14,23 @@ const txMatch = (engine, tname, vcolname, nextcol) => expect.objectContaining({ columnName: 'id', notNull: true, - dataType: expect.stringMatching(/int/i), + dataType: expect.stringMatching(/int.*/i), }), expect.objectContaining({ columnName: vcolname, notNull: false, - dataType: expect.stringMatching(/.*char.*\(50\)/), + dataType: engine.skipStringLength + ? expect.stringMatching(/.*string|char.*/i) + : expect.stringMatching(/.*string|char.*\(50\)/i), }), ...(nextcol ? [ expect.objectContaining({ columnName: 'nextcol', notNull: false, - dataType: expect.stringMatching(/.*char.*\(50\)/), + dataType: engine.skipStringLength + ? expect.stringMatching(/.*string.*|char.*/i) + : expect.stringMatching(/.*string.*|char.*\(50\).*/i), }), ] : []), @@ -52,6 +56,9 @@ describe('Table analyse', () => { const structure = await driver.analyseFull(conn); + console.log('****************** TABLE ***********************') + console.log(JSON.stringify(structure.tables[0], null, 2)); + expect(structure.tables.length).toEqual(1); expect(structure.tables[0]).toEqual(t1Match(engine)); }) @@ -113,7 +120,7 @@ describe('Table analyse', () => { }) ); - test.each(engines.map(engine => [engine.label, engine]))( + test.each(engines.filter(x => !x.skipIndexes).map(engine => [engine.label, engine]))( 'Index - full analysis - %s', testWrapper(async (conn, driver, engine) => { await driver.query(conn, t1Sql); @@ -128,7 +135,7 @@ describe('Table analyse', () => { }) ); - test.each(engines.map(engine => [engine.label, engine]))( + test.each(engines.filter(x => !x.skipUnique).map(engine => [engine.label, engine]))( 'Unique - full analysis - %s', testWrapper(async (conn, driver, engine) => { await driver.query(conn, t2Sql); @@ -142,7 +149,7 @@ describe('Table analyse', () => { }) ); - test.each(engines.map(engine => [engine.label, engine]))( + test.each(engines.filter(x => !x.skipReferences).map(engine => [engine.label, engine]))( 'Foreign key - full analysis - %s', testWrapper(async (conn, driver, engine) => { await driver.query(conn, t2Sql); diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 7d0110f71..d5d612daa 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -155,13 +155,13 @@ const engines = [ const filterLocal = [ // filter local testing - 'MySQL', + '-MySQL', '-MariaDB', '-PostgreSQL', '-SQL Server', '-SQLite', '-CockroachDB', - '-ClickHouse', + 'ClickHouse', ]; const enginesPostgre = engines.filter(x => x.label == 'PostgreSQL');