From 07a803a68793fdf48d4ad16fd02657e1cb82eab3 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Wed, 5 Feb 2025 09:17:11 +0100
Subject: [PATCH] try to fix e2e tests

---
 .github/workflows/build-app-pro-beta.yaml           | 2 +-
 .github/workflows/build-app-pro.yaml                | 2 +-
 .github/workflows/build-aws-pro.yaml                | 2 +-
 .github/workflows/build-docker-pro.yaml             | 2 +-
 .github/workflows/build-npm-pro.yaml                | 2 +-
 .github/workflows/e2e-pro.yaml                      | 2 +-
 packages/api/src/controllers/databaseConnections.js | 2 +-
 workflow-templates/includes.tpl.yaml                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-app-pro-beta.yaml b/.github/workflows/build-app-pro-beta.yaml
index 1be77aa7c..d7fd98503 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: 7ccbb71e491760624fbdec4a93d216539917924a
+          ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
       - 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 d79c86a5e..3b880b854 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: 7ccbb71e491760624fbdec4a93d216539917924a
+          ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/build-aws-pro.yaml b/.github/workflows/build-aws-pro.yaml
index ffced78b2..7295c47d9 100644
--- a/.github/workflows/build-aws-pro.yaml
+++ b/.github/workflows/build-aws-pro.yaml
@@ -36,7 +36,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: '${{ secrets.GH_TOKEN }}'
           path: dbgate-pro
-          ref: 7ccbb71e491760624fbdec4a93d216539917924a
+          ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
       - 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 2fcceec3b..f6ec12d34 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: 7ccbb71e491760624fbdec4a93d216539917924a
+          ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
       - 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 a3cb741e7..f3a1cec7f 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: 7ccbb71e491760624fbdec4a93d216539917924a
+          ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/.github/workflows/e2e-pro.yaml b/.github/workflows/e2e-pro.yaml
index 4d869ee1f..d991612c9 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: 7ccbb71e491760624fbdec4a93d216539917924a
+          ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro
diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index 984d00385..fd51b5b32 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -402,7 +402,7 @@ module.exports = {
   structure_meta: true,
   async structure({ conid, database, modelTransFile = null }, req) {
     if (!conid || !database) {
-      return null;
+      return {};
     }
 
     testConnectionPermission(conid, req);
diff --git a/workflow-templates/includes.tpl.yaml b/workflow-templates/includes.tpl.yaml
index 1f7bb4fdf..0fcde955a 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: 7ccbb71e491760624fbdec4a93d216539917924a
+      ref: 42760313d345c2872b2ac1d5d656764d4ab68ddc
   - name: Merge dbgate/dbgate-pro
     run: |
       mkdir ../dbgate-pro