dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 00:56:02 +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-10 15:27:45 +01:00
parent 5debd8e115 737436d7e7
commit bb3cb23ee0
10 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-app-pro-beta.yaml vendored
View File

@@ -39,7 +39,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: '${{ secrets.GH_TOKEN }}' token: '${{ secrets.GH_TOKEN }}'
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-app-pro.yaml vendored
View File

@@ -39,7 +39,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: '${{ secrets.GH_TOKEN }}' token: '${{ secrets.GH_TOKEN }}'
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-aws-pro.yaml vendored
View File

@@ -36,7 +36,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: '${{ secrets.GH_TOKEN }}' token: '${{ secrets.GH_TOKEN }}'
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-docker-pro.yaml vendored
View File

@@ -44,7 +44,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: '${{ secrets.GH_TOKEN }}' token: '${{ secrets.GH_TOKEN }}'
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-npm-pro.yaml vendored
View File

@@ -32,7 +32,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: '${{ secrets.GH_TOKEN }}' token: '${{ secrets.GH_TOKEN }}'
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/e2e-pro.yaml vendored
View File

@@ -26,7 +26,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: '${{ secrets.GH_TOKEN }}' token: '${{ secrets.GH_TOKEN }}'
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

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

@@ -355,6 +355,8 @@ describe('Data browser data', () => {
cy.contains('MyChinook').click(); cy.contains('MyChinook').click();
cy.testid('TabsPanel_buttonNewQuery').click(); cy.testid('TabsPanel_buttonNewQuery').click();
cy.testid('QueryTab_switchAiAssistantButton').click(); cy.testid('QueryTab_switchAiAssistantButton').click();
cy.testid('QueryAiAssistant_allowSendToAiServiceButton').click();
cy.testid('ConfirmModal_okButton').click();
cy.testid('QueryAiAssistant_promptInput').type('album names'); cy.testid('QueryAiAssistant_promptInput').type('album names');
cy.testid('QueryAiAssistant_queryFromQuestionButton').click(); cy.testid('QueryAiAssistant_queryFromQuestionButton').click();
cy.contains('Use this').click(); cy.contains('Use this').click();

3
e2e-tests/e2eTestTools.js
View File

@@ -22,6 +22,9 @@ function clearTestingData() {
if (fs.existsSync(path.join(baseDir, 'connections-e2etests.jsonl'))) { if (fs.existsSync(path.join(baseDir, 'connections-e2etests.jsonl'))) {
fs.unlinkSync(path.join(baseDir, 'connections-e2etests.jsonl')); fs.unlinkSync(path.join(baseDir, 'connections-e2etests.jsonl'));
} }
if (fs.existsSync(path.join(baseDir, 'settings-e2etests.jsonl'))) {
fs.unlinkSync(path.join(baseDir, 'settings-e2etests.jsonl'));
}
if (fs.existsSync(path.join(baseDir, 'files-e2etests'))) { if (fs.existsSync(path.join(baseDir, 'files-e2etests'))) {
fs.rmdirSync(path.join(baseDir, 'files-e2etests'), { recursive: true }); fs.rmdirSync(path.join(baseDir, 'files-e2etests'), { recursive: true });
} }

12
packages/api/src/controllers/config.js
View File

@@ -136,7 +136,7 @@ module.exports = {
deleteSettings_meta: true, deleteSettings_meta: true,
async deleteSettings() { async deleteSettings() {
await fs.unlink(path.join(datadir(), 'settings.json')); await fs.unlink(path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'));
return true; return true;
}, },
@@ -161,7 +161,10 @@ module.exports = {
async loadSettings() { async loadSettings() {
try { try {
const settingsText = await fs.readFile(path.join(datadir(), 'settings.json'), { encoding: 'utf-8' }); const settingsText = await fs.readFile(
path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
{ encoding: 'utf-8' }
);
return { return {
...this.fillMissingSettings(JSON.parse(settingsText)), ...this.fillMissingSettings(JSON.parse(settingsText)),
'other.licenseKey': platformInfo.isElectron ? await this.loadLicenseKey() : undefined, 'other.licenseKey': platformInfo.isElectron ? await this.loadLicenseKey() : undefined,
@@ -247,7 +250,10 @@ module.exports = {
...currentValue, ...currentValue,
..._.omit(values, ['other.licenseKey']), ..._.omit(values, ['other.licenseKey']),
}; };
await fs.writeFile(path.join(datadir(), 'settings.json'), JSON.stringify(updated, undefined, 2)); await fs.writeFile(
path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
JSON.stringify(updated, undefined, 2)
);
// this.settingsValue = updated; // this.settingsValue = updated;
if (currentValue['other.licenseKey'] != values['other.licenseKey']) { if (currentValue['other.licenseKey'] != values['other.licenseKey']) {

2
workflow-templates/includes.tpl.yaml
View File

@@ -7,7 +7,7 @@ checkout-and-merge-pro:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: a2f824dc711b510a5e8235d3faf4aafab1965184 ref: ca1a1664e4c45945d7afe9534c43ca6cbb0b06e3
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro