From 22577c5f879aa8d0f176dd018d70458fd26482fa Mon Sep 17 00:00:00 2001 From: CI workflows Date: Thu, 15 May 2025 14:07:52 +0000 Subject: [PATCH 1/8] Update pro ref --- workflow-templates/includes.tpl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow-templates/includes.tpl.yaml b/workflow-templates/includes.tpl.yaml index e05960c2c..7d4d0e5eb 100644 --- a/workflow-templates/includes.tpl.yaml +++ b/workflow-templates/includes.tpl.yaml @@ -7,7 +7,7 @@ checkout-and-merge-pro: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro From 55640470013f19d88280d60a7f3a56b4603b3350 Mon Sep 17 00:00:00 2001 From: CI workflows Date: Thu, 15 May 2025 14:08:12 +0000 Subject: [PATCH 2/8] chore: auto-update github workflows --- .github/workflows/build-app-pro-beta.yaml | 2 +- .github/workflows/build-app-pro.yaml | 2 +- .github/workflows/build-cloud-pro.yaml | 2 +- .github/workflows/build-docker-pro.yaml | 2 +- .github/workflows/build-npm-pro.yaml | 2 +- .github/workflows/e2e-pro.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml index 219b97675..8f7899bd1 100644 --- a/.github/workflows/build-app-pro-beta.yaml +++ b/.github/workflows/build-app-pro-beta.yaml @@ -39,7 +39,7 @@ jobs: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-app-pro.yaml b/.github/workflows/build-app-pro.yaml index dfeac852d..d684d3642 100644 --- a/.github/workflows/build-app-pro.yaml +++ b/.github/workflows/build-app-pro.yaml @@ -39,7 +39,7 @@ jobs: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-cloud-pro.yaml b/.github/workflows/build-cloud-pro.yaml index 56f37a0f1..c989edbbe 100644 --- a/.github/workflows/build-cloud-pro.yaml +++ b/.github/workflows/build-cloud-pro.yaml @@ -39,7 +39,7 @@ jobs: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-docker-pro.yaml b/.github/workflows/build-docker-pro.yaml index 029dde3d4..46ec00e7d 100644 --- a/.github/workflows/build-docker-pro.yaml +++ b/.github/workflows/build-docker-pro.yaml @@ -44,7 +44,7 @@ jobs: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/build-npm-pro.yaml b/.github/workflows/build-npm-pro.yaml index c6c83f7f3..116de2991 100644 --- a/.github/workflows/build-npm-pro.yaml +++ b/.github/workflows/build-npm-pro.yaml @@ -32,7 +32,7 @@ jobs: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro diff --git a/.github/workflows/e2e-pro.yaml b/.github/workflows/e2e-pro.yaml index 3b3d87b7e..3c5594553 100644 --- a/.github/workflows/e2e-pro.yaml +++ b/.github/workflows/e2e-pro.yaml @@ -26,7 +26,7 @@ jobs: repository: dbgate/dbgate-pro token: ${{ secrets.GH_TOKEN }} path: dbgate-pro - ref: 55cf42d58b843c4f1ffd6ab9b808f5f971bc3c8b + ref: 5cc7d79f7e3f5f33cad605e16df7570f25f36978 - name: Merge dbgate/dbgate-pro run: | mkdir ../dbgate-pro From e8cb87ae3d3f518a8eef12ed0cf19812e0ac91b9 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Fri, 16 May 2025 08:00:33 +0200 Subject: [PATCH 3/8] feedback link --- packages/web/src/widgets/AdminPremiumPromoWidget.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/widgets/AdminPremiumPromoWidget.svelte b/packages/web/src/widgets/AdminPremiumPromoWidget.svelte index c47cbdb62..ee06418c0 100644 --- a/packages/web/src/widgets/AdminPremiumPromoWidget.svelte +++ b/packages/web/src/widgets/AdminPremiumPromoWidget.svelte @@ -45,7 +45,7 @@

Your feedback is very valuable for us. It helps us to improve DbGate and make it more useful for you.

- openWebLink('https://dbgate.org/survey')} value="Fill out the survey" skipWidth /> + openWebLink('https://dbgate.org/feedback')} value="Give us feedback" skipWidth />
From 4a3491e0b518161008a5f73d838f7bb4b0ed824d Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Fri, 16 May 2025 08:03:08 +0200 Subject: [PATCH 4/8] feedback menu link --- app/src/mainMenuDefinition.js | 1 + packages/web/src/commands/stdCommands.ts | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/app/src/mainMenuDefinition.js b/app/src/mainMenuDefinition.js index 6d0ab52a8..c463af4bf 100644 --- a/app/src/mainMenuDefinition.js +++ b/app/src/mainMenuDefinition.js @@ -108,6 +108,7 @@ module.exports = ({ editMenu, isMac }) => [ { command: 'app.openWeb', hideDisabled: true }, { command: 'app.openIssue', hideDisabled: true }, { command: 'app.openSponsoring', hideDisabled: true }, + { command: 'app.giveFeedback', hideDisabled: true }, { divider: true }, { command: 'settings.commands', hideDisabled: true }, { command: 'tabs.changelog', hideDisabled: true }, diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index 85c97b632..44be01135 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -929,9 +929,17 @@ registerCommand({ id: 'app.openSponsoring', category: 'Application', name: 'Become sponsor', + testEnabled: () => !isProApp(), onClick: () => openWebLink('https://opencollective.com/dbgate'), }); +registerCommand({ + id: 'app.giveFeedback', + category: 'Application', + name: 'Give us feedback', + onClick: () => openWebLink('https://dbgate.org/feedback'), +}); + registerCommand({ id: 'app.zoomIn', category: 'Application', From 5590aa7234dfd7aeaa1b80e553a13937448dc55e Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Fri, 16 May 2025 08:04:44 +0200 Subject: [PATCH 5/8] feedback URL --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a08b55a81..44298c6d4 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ DbGate is licensed under GPL-3.0 license and is free to use for any purpose. * Run web version as [NPM package](https://www.npmjs.com/package/dbgate-serve) or as [docker image](https://hub.docker.com/r/dbgate/dbgate) * Use nodeJs [scripting interface](https://docs.dbgate.io/scripting) ([API documentation](https://docs.dbgate.io/apidoc)) * [Recommend DbGate](https://testimonial.to/dbgate) | [Rate on G2](https://www.g2.com/products/dbgate/reviews) +* [Give us feedback](https://dbgate.org/feedback) ## Supported databases * MySQL From c71c32b363ee58447a25fd51283436000a2a6294 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Fri, 16 May 2025 08:10:20 +0200 Subject: [PATCH 6/8] readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 44298c6d4..5c12c1e35 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ DbGate is licensed under GPL-3.0 license and is free to use for any purpose. * Run web version as [NPM package](https://www.npmjs.com/package/dbgate-serve) or as [docker image](https://hub.docker.com/r/dbgate/dbgate) * Use nodeJs [scripting interface](https://docs.dbgate.io/scripting) ([API documentation](https://docs.dbgate.io/apidoc)) * [Recommend DbGate](https://testimonial.to/dbgate) | [Rate on G2](https://www.g2.com/products/dbgate/reviews) -* [Give us feedback](https://dbgate.org/feedback) +* [Give us feedback](https://dbgate.org/feedback) - it will help us to decide, how to improve DbGate in future ## Supported databases * MySQL From 23150815a09bde6f7464ed0cab36af7d4bc10dc6 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Fri, 16 May 2025 13:55:14 +0200 Subject: [PATCH 7/8] use default target schema in dbDeploy --- packages/api/src/shell/generateDeploySql.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/api/src/shell/generateDeploySql.js b/packages/api/src/shell/generateDeploySql.js index dad7a9e0d..b3e9e4210 100644 --- a/packages/api/src/shell/generateDeploySql.js +++ b/packages/api/src/shell/generateDeploySql.js @@ -52,7 +52,10 @@ async function generateDeploySql({ dbdiffOptionsExtra?.['schemaMode'] !== 'ignore' && dbdiffOptionsExtra?.['schemaMode'] !== 'ignoreImplicit' ) { - throw new Error('targetSchema is required for databases with multiple schemas'); + if (!driver?.dialect?.defaultSchemaName) { + throw new Error('targetSchema is required for databases with multiple schemas'); + } + targetSchema = driver.dialect.defaultSchemaName; } try { From 05e8f6ed78336ca6243263cf1bef2ab706c62dba Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Fri, 16 May 2025 13:55:45 +0200 Subject: [PATCH 8/8] v6.4.3-alpha.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 273369105..8bfdbd903 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "6.4.2", + "version": "6.4.3-alpha.1", "name": "dbgate-all", "workspaces": [ "packages/*",