diff --git a/integration-tests/__tests__/alter-processor.spec.js b/integration-tests/__tests__/alter-processor.spec.js index fc979ee5a..c58047181 100644 --- a/integration-tests/__tests__/alter-processor.spec.js +++ b/integration-tests/__tests__/alter-processor.spec.js @@ -1,10 +1,23 @@ const stableStringify = require('json-stable-stringify'); const _ = require('lodash'); +const fp = require('lodash/fp'); const uuidv1 = require('uuid/v1'); const { testWrapper } = require('../tools'); const engines = require('../engines'); const { getAlterTableScript, extendDatabaseInfo } = require('dbgate-tools'); +function pickImportantTableInfo(table) { + return { + pureName: table.pureName, + columns: table.columns.map(fp.pick(['columnName', 'notNull', 'autoIncrement'])), + }; +} + +function checkTableStructure(t1, t2) { + // expect(t1.pureName).toEqual(t2.pureName) + expect(pickImportantTableInfo(t1)).toEqual(pickImportantTableInfo(t2)); +} + async function testTableDiff(conn, driver, mangle) { await driver.query(conn, 'create table t1 (col1 int not null)'); @@ -20,7 +33,8 @@ async function testTableDiff(conn, driver, mangle) { const structure2Real = extendDatabaseInfo(await driver.analyseFull(conn)); - expect(stableStringify(structure2)).toEqual(stableStringify(structure2Real)); + checkTableStructure(structure2Real.tables[0], structure2.tables[0]); + // expect(stableStringify(structure2)).toEqual(stableStringify(structure2Real)); } describe('Alter processor', () => { @@ -32,6 +46,8 @@ describe('Alter processor', () => { columnName: 'added', dataType: 'int', pairingId: uuidv1(), + notNull: false, + autoIncrement: false, }) ); // console.log('ENGINE', engine); diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte index 774c379f7..802895a87 100644 --- a/packages/web/src/settings/SettingsModal.svelte +++ b/packages/web/src/settings/SettingsModal.svelte @@ -46,7 +46,7 @@ /> - +
Connection