dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-22 06:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/cassandra

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-02-11 08:37:15 +01:00
parent 3b72a9751c dc9da0b866
commit 8d20b7d19f
4 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
e2e-tests/cypress/e2e/browse-data.cy.js
View File

@@ -364,4 +364,43 @@ describe('Data browser data', () => {
cy.contains('Balls to the Wall'); cy.contains('Balls to the Wall');
cy.themeshot('aiassistant'); cy.themeshot('aiassistant');
}); });
it('Modify data', () => {
// TODO FIX: delete references cascade not working
cy.contains('MySql-connection').click();
cy.contains('MyChinook').click();
cy.contains('Employee').click();
cy.contains('Rows: 8');
cy.contains('Laura').click();
cy.contains('Laura').click();
cy.get('body').realType('Jane');
// cy.contains('Peacock').click();
// cy.testid('TableDataTab_deleteSelectedRows').click();
cy.contains('King').click();
cy.testid('TableDataTab_deleteSelectedRows').click();
cy.testid('TableDataTab_insertNewRow').click();
cy.get('body').realType('Novak');
cy.get('body').realPress('{enter}');
cy.realPress(['ArrowRight']);
cy.get('body').realType('Karel');
cy.testid('TableDataTab_save').click();
cy.contains('INSERT INTO `Employee`');
cy.contains("SET `FirstName`='Jane'");
cy.contains('DELETE FROM `Employee`');
cy.themeshot('modifydata');
// cy.testid('ConfirmSqlModal_okButton').click();
// cy.contains('Cannot delete or update a parent row')
// cy.testid('ConfirmSqlModal_okButton').click();
// cy.testid('TableDataTab_save').click();
// cy.testid('ConfirmSqlModal_deleteReferencesCascade').click();
// cy.testid('ConfirmSqlModal_okButton').click();
cy.testid('ConfirmSqlModal_okButton').click();
cy.contains('Novak');
cy.contains('Rows: 8');
});
}); });

10
packages/web/src/modals/ConfirmSqlModal.svelte
View File

@@ -92,6 +92,7 @@
templateProps={{ noMargin: true }} templateProps={{ noMargin: true }}
label="Delete references CASCADE" label="Delete references CASCADE"
name="deleteReferencesCascade" name="deleteReferencesCascade"
data-testid="ConfirmSqlModal_deleteReferencesCascade"
/> />
</div> </div>
{/if} {/if}
@@ -166,8 +167,14 @@
closeCurrentModal(); closeCurrentModal();
onConfirm(currentScript); onConfirm(currentScript);
}} }}
data-testid="ConfirmSqlModal_okButton"
/>
<FormStyledButton
type="button"
value="Close"
on:click={closeCurrentModal}
data-testid="ConfirmSqlModal_closeButton"
/> />
<FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
<FormStyledButton <FormStyledButton
type="button" type="button"
value="Open script" value="Open script"
@@ -178,6 +185,7 @@
closeCurrentModal(); closeCurrentModal();
}} }}
data-testid="ConfirmSqlModal_openScriptButton"
/> />
</div> </div>
</ModalBase> </ModalBase>

2
packages/web/src/modals/ErrorMessageModal.svelte
View File

@@ -30,7 +30,7 @@
{/if} {/if}
<div slot="footer"> <div slot="footer">
<FormSubmit value="Close" on:click={closeCurrentModal} /> <FormSubmit value="Close" on:click={closeCurrentModal} data-testid="ErrorMessageModal_closeButton" />
</div> </div>
</ModalBase> </ModalBase>
</FormProvider> </FormProvider>

27
packages/web/src/tabs/TableDataTab.svelte
View File

@@ -318,20 +318,29 @@
<!-- <ToolStripCommandButton command="dataGrid.refresh" hideDisabled /> <!-- <ToolStripCommandButton command="dataGrid.refresh" hideDisabled />
<ToolStripCommandButton command="dataForm.refresh" hideDisabled /> --> <ToolStripCommandButton command="dataForm.refresh" hideDisabled /> -->
<ToolStripCommandButton command="dataForm.goToFirst" hideDisabled /> <ToolStripCommandButton command="dataForm.goToFirst" hideDisabled data-testid="TableDataTab_goToFirst" />
<ToolStripCommandButton command="dataForm.goToPrevious" hideDisabled /> <ToolStripCommandButton command="dataForm.goToPrevious" hideDisabled data-testid="TableDataTab_goToPrevious" />
<ToolStripCommandButton command="dataForm.goToNext" hideDisabled /> <ToolStripCommandButton command="dataForm.goToNext" hideDisabled data-testid="TableDataTab_goToNext" />
<ToolStripCommandButton command="dataForm.goToLast" hideDisabled /> <ToolStripCommandButton command="dataForm.goToLast" hideDisabled data-testid="TableDataTab_goToLast" />
<ToolStripCommandButton <ToolStripCommandButton
command="tableData.save" command="tableData.save"
iconAfter={getNumberIcon(changeSetChangedCount($changeSetStore?.value))} iconAfter={getNumberIcon(changeSetChangedCount($changeSetStore?.value))}
data-testid="TableDataTab_save"
/> />
<ToolStripCommandButton command="dataGrid.revertAllChanges" hideDisabled /> <ToolStripCommandButton
<ToolStripCommandButton command="dataGrid.insertNewRow" hideDisabled /> command="dataGrid.revertAllChanges"
<ToolStripCommandButton command="dataGrid.deleteSelectedRows" hideDisabled /> hideDisabled
<ToolStripCommandButton command="dataGrid.switchToForm" hideDisabled /> data-testid="TableDataTab_revertAllChanges"
<ToolStripCommandButton command="dataGrid.switchToTable" hideDisabled /> />
<ToolStripCommandButton command="dataGrid.insertNewRow" hideDisabled data-testid="TableDataTab_insertNewRow" />
<ToolStripCommandButton
command="dataGrid.deleteSelectedRows"
hideDisabled
data-testid="TableDataTab_deleteSelectedRows"
/>
<ToolStripCommandButton command="dataGrid.switchToForm" hideDisabled data-testid="TableDataTab_switchToForm" />
<ToolStripCommandButton command="dataGrid.switchToTable" hideDisabled data-testid="TableDataTab_switchToTable" />
<ToolStripExportButton {quickExportHandlerRef} /> <ToolStripExportButton {quickExportHandlerRef} />
<ToolStripButton <ToolStripButton