v7.1.2

SYNC: don't use random data in testing REST service
SYNC: Merge pull request #78 from dbgate/feature/aitest
2026-03-02 15:53:28 +01:00 · 2026-03-02 14:10:12 +00:00 · 2026-03-02 13:28:57 +00:00 · 2026-03-02 12:59:39 +01:00 · 2026-03-02 12:58:03 +01:00 · 2026-03-02 11:57:43 +00:00
513 changed files with 36678 additions and 15270 deletions
@@ -1,12 +1,14 @@
 ---
 name: Bug report
-about: Create a report to help us improve DbGate
+about: Create a report to help us improve DbGate (in ENGLISH)
 title: 'BUG: Say something here'
 labels: ''
 assignees: ''

 ---

+Please keep communication in ENGLISH to reach more contributors.
+
 **Describe the bug**
 A clear and concise description of what the bug is.

@@ -1,12 +1,14 @@
 ---
 name: Feature request
-about: Suggest an idea for DbGate
+about: Suggest an idea for DbGate (in ENGLISH)
 title: 'FEAT: '
 labels: ''
 assignees: ''

 ---

+Please keep communication in ENGLISH to reach more contributors.
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

@@ -1,12 +1,14 @@
 ---
 name: Question
-about: Ask a question about how to do something
+about: Ask a question about how to do something (in ENGLISH)
 title: 'QUESTION: Summary of your question'
 labels: ''
 assignees: ''

 ---

+Please keep communication in ENGLISH to reach more contributors.
+
 **Details:**
 Details about your question

@@ -21,6 +21,10 @@ jobs:
          - windows-2022
          - ubuntu-22.04
    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python -m pip install --upgrade pip setuptools
      - name: Install python 3.11 (MacOS)
        if: matrix.os == 'macos-14'
        run: |
@@ -21,6 +21,10 @@ jobs:
          - windows-2022
          - ubuntu-22.04
    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python -m pip install --upgrade pip setuptools
      - name: Install python 3.11 (MacOS)
        if: matrix.os == 'macos-14'
        run: |
@@ -21,6 +21,10 @@ jobs:
          - windows-2022
          - ubuntu-22.04
    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python -m pip install --upgrade pip setuptools
      - name: Install python 3.11 (MacOS)
        if: matrix.os == 'macos-14'
        run: |
@@ -43,7 +47,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: ca69c4857d7d93c4b066018e8a9a0a0ece2300e7
+          ref: c33e71a6ddc30d8ce59cf0351e04e08f6be272a3
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -21,6 +21,10 @@ jobs:
          - windows-2022
          - ubuntu-22.04
    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python -m pip install --upgrade pip setuptools
      - name: Install python 3.11 (MacOS)
        if: matrix.os == 'macos-14'
        run: |
@@ -43,7 +47,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: ca69c4857d7d93c4b066018e8a9a0a0ece2300e7
+          ref: c33e71a6ddc30d8ce59cf0351e04e08f6be272a3
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -21,6 +21,10 @@ jobs:
          - windows-2022
          - ubuntu-22.04
    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python -m pip install --upgrade pip setuptools
      - name: Install python 3.11 (MacOS)
        if: matrix.os == 'macos-14'
        run: |
@@ -39,7 +39,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: ca69c4857d7d93c4b066018e8a9a0a0ece2300e7
+          ref: c33e71a6ddc30d8ce59cf0351e04e08f6be272a3
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -90,14 +90,6 @@ jobs:
          prerelease: true
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run `packer init` for Azure
-        run: |
-          cd ../dbgate-merged/packer
-          packer init ./azure-ubuntu.pkr.hcl
-      - name: Run `packer build` for Azure
-        run: |
-          cd ../dbgate-merged/packer
-          packer build ./azure-ubuntu.pkr.hcl
      - name: Run `packer init` for AWS
        run: |
          cd ../dbgate-merged/packer
@@ -114,16 +106,6 @@ jobs:
          AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
          AWS_DEFAULT_REGION: ${{secrets.AWS_DEFAULT_REGION}}
-      - name: Delete old Azure VMs
-        run: |
-          cd ../dbgate-merged/packer
-          chmod +x delete-old-azure-images.sh
-          ./delete-old-azure-images.sh
-        env:
-          AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}}
-          AZURE_CLIENT_SECRET: ${{secrets.AZURE_CLIENT_SECRET}}
-          AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}}
-          AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}}
      - name: Delete old AMIs (AWS)
        run: |
          cd ../dbgate-merged/packer
@@ -44,7 +44,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: ca69c4857d7d93c4b066018e8a9a0a0ece2300e7
+          ref: c33e71a6ddc30d8ce59cf0351e04e08f6be272a3
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -35,7 +35,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: ca69c4857d7d93c4b066018e8a9a0a0ece2300e7
+          ref: c33e71a6ddc30d8ce59cf0351e04e08f6be272a3
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -5,10 +5,14 @@ name: Cypress tests with screenshots PREMIUM
 'on':
  push:
    branches:
+      - stable
      - master
      - develop
      - feature/**
      - hotfix/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
  e2e-tests:
    runs-on: ubuntu-latest
@@ -26,7 +30,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: ca69c4857d7d93c4b066018e8a9a0a0ece2300e7
+          ref: c33e71a6ddc30d8ce59cf0351e04e08f6be272a3
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -69,8 +73,8 @@ jobs:
        with:
          name: screenshots
          path: screenshots
-      - name: Push E2E screenshots
-        if: ${{ github.ref_name == 'master' }}
+      - name: Push E2E screenshots - stable
+        if: ${{ github.ref_name == 'stable' }}
        run: |
          git config --global user.email "info@dbgate.info"
          git config --global user.name "GitHub Actions"
@@ -80,6 +84,17 @@ jobs:
          git add .
          git commit --amend --no-edit
          git push --force
+      - name: Push E2E screenshots - master
+        if: ${{ github.ref_name == 'master' }}
+        run: |
+          git config --global user.email "info@dbgate.info"
+          git config --global user.name "GitHub Actions"
+          git clone https://${{ secrets.DIFLOW_GIT_SECRET }}@github.com/dbgate/dbgate-img.git
+          cp ../dbgate-merged/e2e-tests/screenshots/*.png dbgate-img/static/img-dev
+          cd dbgate-img/static/img-dev
+          git add .
+          git commit --amend --no-edit
+          git push --force
    services:
      postgres-cypress:
        image: postgres
@@ -9,6 +9,9 @@ name: Integration and unit tests
      - develop
      - feature/**
      - hotfix/**
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
  all-tests:
    runs-on: ubuntu-latest
@@ -2,5 +2,10 @@
    "jestrunner.jestCommand": "node_modules/.bin/cross-env DEVMODE=1 LOCALTEST=1 node_modules/.bin/jest",
    "cSpell.words": [
        "dbgate"
-    ]
+    ],
+    "chat.tools.terminal.autoApprove": {
+        "yarn workspace": true,
+        "yarn --cwd packages/rest": true,
+        "yarn --cwd packages/web": true
+    }
 }
@@ -0,0 +1,8 @@
+# AGENTS
+
+## Rules
+
+- In newly added code, always use `DBGM-00000` for message/error codes; do not introduce new numbered DBGM codes such as `DBGM-00316`.
+- GUI uses Svelte4 (packages/web)
+- GUI is tested with E2E tests in `e2e-tests` folder, using Cypress. Use data-testid attribute in components to make them easier to test.  
+- data-testid format: ComponentName_identifier. Use reasonable identifiers
@@ -8,6 +8,124 @@ Builds:
 - linux - application for linux
 - win - application for Windows

+## 7.1.2
+- ADDED: GraphQL chat - AI chat with GraphQL endpoint (Premium)
+- FIXED: Error "400 Provider returned error" in Database Chat (Premium)
+- CHANGED: Upgraded AI components to latest versions, improved stability and performance of AI features (Premium)
+- ADDED: New LLM models available (GPT-5.1 Codex Mini - now default), Claude Haiku 4.5
+- CHANGED: Upgraded some internal building components (svelte-preprocess, typescript)
+
+## 7.1.1
+- CHANGED: Fixed some DynamoDB issues, improved filtering performance
+- FIXED: Afilter filter scroll issue #1370
+- FIXED: Team Premium - filtering by connection in database and table permissions
+- FIXED: Team Premium - Creating role and user in PostgreSQL - settings is remembered without reopening new role/user
+- FIXED: Team Premium - don't show errors "Connection permission not granted" when no connection is selected
+- FIXED: Firebird - improved connectivity & table loading #1324
+- ADDED: New GraphQL query option, changed GraphQL query icon (Premium)
+
+
+## 7.1.0
+- ADDED: Support for Amazon DynamoDB (Premium)
+- ADDED: Connect to API endpoints - OpenAPI (Swagger), GraphQL and oData  (Premium)
+- FIXED: Redis key list infinite loading when first key hierarchy segment is numeric (e.g. "0:profile:1234") #1363
+- FIXED: Sum of PostgreSQL numeric values always 0 #1354
+- FIXED: SQL SERVER Table structure key duplication #1351
+- FIXED: SQL Server - Incorrect SQL generated for 'Group by Year/Month/Day' #1350
+- ADDED: Choose drivers available in connection dialog
+- FIXED: Show query results for CTE (WITH) queries
+- CHANGED: Used rolldown bundler instead of legacy rollup
+
+## 7.0.6
+- ADDED: Reset password for Team Premium edition
+- ADDED: Encrypting passwords sent to frontend when using SHELL_CONNECTION=1 in Docker Community edition #1357
+
+## 7.0.4
+- FIXED: MS SQL server export to CSV does not convert bit FALSE to 0 #1276
+- ADDED: MySQL FULLTEXT support #1305
+- FIXED: Error messages in Chinese will display garbled characters(MS SQL over ODBC) #1321
+- FIXED: Table's Show SQL fails to display precision and scale for NUMERIC/DECIMAL types in PostgreSQL #1325
+- FIXED: Export to Excel/CSV is broken for certain data types in v7.0.0 #1327
+- ADDED: Null value with keyboard shortcut in form view #1332
+- FIXED: Clicking into active form cell discards changes #1334
+- FIXED: Remember selection after filtering #1335
+- FIXED: Unable to use 'Group By' or one of the aggregate functions on tables containing text columns #1348
+- CHANGED: Improved custom connection color palette
+
+## 7.0.3
+- FIXED: Optimalized loading MySQL primary keys #1261
+- FIXED: Test connection now works for MS Entra authentication #1315
+- FIXED: SQL Server - Unable to use 'Is Empty or Null' or 'Has Not Empty Value' filters on a field with data type TEXT #1338
+- FIXED: Play triangle too large for text-wrapped queries #1337
+- FIXED: Text wraps mid-word in form view, making it illegible #1333
+- FIXED: Cell View autodetects Form instead of Map for geometry/geography #1330
+- FIXED: Search for database in cloud connection #1329
+- ADDED: Toolstrip could be configured to the bottom of the tab #1326
+- CHANGED: Upgraded node for DbGate AWS distribution
+
+## 7.0.1
+- FIXED: Foreign key actions not detected on PostgreSQL #1323
+- FIXED: Vulnerabilities in bundled dependencies: axios, cross-spawn, glob #1322
+- FIXED: The JsonB field in the cell data view always displays as null. #1320
+- ADDED: Possibility to skip computed coumn in SQL generator
+- ADDED: Improved team file editing, move between team folders
+- ADDED: Korean localization
+- FIXED: Added missing localization strings
+- ADDED: Default editor theme is part of application theme now
+
+## 7.0.0
+- CHANGED: New design of application, new theme system
+- ADDED: Theme AI assistant - create custom themes using AI (Premium)
+- CHANGED: Themes are now defined in JSON files, custom themes could be shared via DbGate Cloud
+- REMOVED: Custom themes are no longer part of plugins
+- CHANGED: Huge improvements of Redis support
+- ADDED: Support for Redis JSON and Stream types
+- ADDED: Editing Redis values (Strings, Hashes, Lists, Sets, Sorted Sets, JSON, Streams)
+- ADDED: Support for Team Folders (Team Premium)
+- CHANGED: Upgraded Svelte to version 4
+- ADDED: Differentiate pinned database with same name #1306
+- ADDED: Database icons/logos for faster visual recognition #1222
+- CHANGED: Reorganized left sidebar widgets
+- ADDED: Widget for currently opened tabs
+
+## 6.8.2
+- FIXED: Initialize storage database from envoronment variables failed with PostgreSQL
+
+## 6.8.1
+- FIXED: Won't navigate to the relevant field on click of a field in columns #1303
+
+## 6.8.0
+- ADDED: Form cell view for detailed data inspection and editing in data grids, with multi-row bulk editing support
+- CHANGED: Cell data sidebar moved to right side, now is part of data grid
+- FIXED: Improved widget resizing algorithm
+- FIXED: Word wrap feature in SQL editor
+- CHANGED: Data grid keyboard navigation improvements
+- CHANGED: Improved PostgreSQL decimal type support in data grid #1214
+- ADDED: Retrieve number of databases from Redis configuration #1278
+- ADDED: Run macro context menu (Premium)
+- ADDED: Support for skip update columns in replicator
+- FIXED: UTF-8 BOM handling in CSV input
+- CHANGED: Advanced export is now part of Community edition
+- FIXED: SQLite foreign key constraint types
+- FIXED: Double drop constraint issue
+- CHANGED: Improved map view lat/lon field autodetection
+- FIXED: Alter table operations and constraint sanitization
+- ADDED: Import connections from environment variables (Team Premium)
+
+## 6.7.3
+- FIXED: Fixed problem in analyser core - in PostgreSQL, after dropping table, dropped table still appeared in structure
+- FIXED: PostgreSQL numeric columns do not align right #1254
+- ADDED: Custom thousands separator #1213
+
+## 6.7.2
+- CHANGED: Settings modal redesign - now is settings opened in tab instead of modal, similarily as in VSCode
+- FIXED: Fixed search in table shortcuts #1273
+- CHANGED: Improved foreign key editor UX
+- FIXED: Fixed incremental DB structure refresh for PostgreSQL, optimalized slow loading primary keys in PostgreSQL
+- CHANGED: You could now choose, how to refresh structure, added ability to disconnect or reconnect
+- ADDED: Better processing of table backups, generate table restore script #1274
+- CHANGED: Improved storage of settings, especially for Team Premium edition
+
 ## 6.7.1
 - ADDED: LANGUAGE environment variable for the web version. #1266
 - ADDED: New localizations (Italian, Portugese (Brazil), Japanese)
@@ -65,7 +183,7 @@ Builds:
 - ADDED: SQL AI assistant - powered by database chat, could help you to write SQL queries (Premium)
 - ADDED: Explain SQL error (powered by AI) (Premium)
 - ADDED: Database chat (and SQL AI Assistant) now supports showing charts (Premium)
- FIXED: Fxied editing new files and roles (Team Premium)
+- FIXED: Fixed editing new files and roles (Team Premium)
 - FIXED: Connection to standalone database could be now pinned
 - FIXED: Cannot open up large JSON file #1215

@@ -61,7 +61,7 @@ DbGate is licensed under GPL-3.0 license and is free to use for any purpose.
 * Edit table schema, indexes, primary and foreign keys
 * Compare and synchronize database structure
 * ER diagram
-* Light and dark theme, next themes available as plugins from github community
+* Light and dark theme, next themes available from DbGate Cloud
 * Huge support for work with related data - master/detail views, foreign key lookups, expanding columns from related tables in flat data view
 * Query designer - visual SQL query builder without writing SQL code. Complex conditions like WHERE NOT EXISTS.
 * Query perspectives – innovative nested table view over complex relational data, something like query designer on MongoDB databases
@@ -94,7 +94,8 @@ Any contributions are welcome. If you want to contribute without coding, conside
 * Create some tutorial video on [youtube](https://www.youtube.com/playlist?list=PLCo7KjCVXhr0RfUSjM9wJMsp_ShL1q61A)
 * Become a backer on [GitHub sponsors](https://github.com/sponsors/dbgate) or [Open collective](https://opencollective.com/dbgate)
 * Add a SQL script to [Public Knowledge Base](https://github.com/dbgate/dbgate-knowledge-base)
-* Where a small coding is acceptable for you, you could [create plugin](https://docs.dbgate.io/plugin-development). Plugins for new themes can be created actually without JS coding
+* Where a small coding is acceptable for you, you could [create plugin](https://docs.dbgate.io/plugin-development)
+* Create a new custom theme and share it on [DbGate Cloud](https://github.com/dbgate/dbgate-knowledge-base/tree/master/folder-Themes)

 Thank you!

@@ -13,9 +13,9 @@
        <p>DbGate is cross-platform database manager. It's designed to be simple to use and effective, when working with more databases simultaneously. But there are also many advanced features like schema compare, visual query designer, chart visualisation or batch export and import.</p>
    </description>

-    <url type="homepage">https://dbgate.org/</url>
+    <url type="homepage">https://www.dbgate.io/</url>
    <url type="vcs-browser">https://github.com/dbgate/dbgate</url>
-    <url type="contact">https://dbgate.org/about/</url>
+    <url type="contact">https://www.dbgate.io/contact/</url>
    <url type="donation">https://github.com/sponsors/dbgate</url>
    <url type="bugtracker">https://github.com/dbgate/dbgate/issues</url>

@@ -1,6 +1,6 @@
 {
  "name": "dbgate",
-  "version": "6.0.0-alpha.1",
+  "version": "7.0.0-alpha.1",
  "private": true,
  "author": "Jan Prochazka <jenasoft.database@gmail.com>",
  "description": "Opensource database administration tool",
@@ -15,6 +15,7 @@ const languageNames = {
    'fr.json': 'French',
    'it.json': 'Italian',
    'ja.json': 'Japanese',
+    'ko.json': 'Korean',
    'pt.json': 'Portuguese',
    'sk.json': 'Slovak',
    'zh.json': 'Chinese'
@@ -3,8 +3,58 @@ const os = require('os');
 const fs = require('fs');

 const baseDir = path.join(os.homedir(), '.dbgate');
+const testApiPidFile = path.join(__dirname, 'tmpdata', 'test-api.pid');
+const aigwmockPidFile = path.join(__dirname, 'tmpdata', 'aigwmock.pid');
+
+function readProcessStartTime(pid) {
+  if (process.platform === 'linux') {
+    try {
+      const stat = fs.readFileSync(`/proc/${pid}/stat`, 'utf-8');
+      return stat.split(' ')[21] || null;
+    } catch (err) {
+      return null;
+    }
+  }
+  return null;
+}
+
+function isPidStillOurs(meta) {
+  if (!meta || !(meta.pid > 0)) return false;
+  if (process.platform === 'linux' && meta.startTime) {
+    const current = readProcessStartTime(meta.pid);
+    return current === meta.startTime;
+  }
+  return true;
+}
+
+function stopProcessByPidFile(pidFile) {
+  if (!fs.existsSync(pidFile)) return;
+  try {
+    const content = fs.readFileSync(pidFile, 'utf-8').trim();
+    let meta;
+    try {
+      meta = JSON.parse(content);
+    } catch (_) {
+      const pid = Number(content);
+      meta = Number.isInteger(pid) && pid > 0 ? { pid } : null;
+    }
+    if (isPidStillOurs(meta)) {
+      process.kill(meta.pid);
+    }
+  } catch (err) {
+    // ignore stale PID files and dead processes
+  }
+  try {
+    fs.unlinkSync(pidFile);
+  } catch (err) {
+    // ignore cleanup errors
+  }
+}

 function clearTestingData() {
+  stopProcessByPidFile(testApiPidFile);
+  stopProcessByPidFile(aigwmockPidFile);
+
  if (fs.existsSync(path.join(baseDir, 'connections-e2etests.jsonl'))) {
    fs.unlinkSync(path.join(baseDir, 'connections-e2etests.jsonl'));
  }
@@ -10,6 +10,7 @@ module.exports = defineConfig({
    // baseUrl: 'http://localhost:3000',
    // trashAssetsBeforeRuns: false,
    chromeWebSecurity: false,
+    reporter: process.env.CI ? 'mocha-reporter-gha' : 'spec',

    setupNodeEvents(on, config) {
      // implement node event listeners here
@@ -36,6 +37,9 @@ module.exports = defineConfig({
            case 'browse-data':
              serverProcess = exec('yarn start:browse-data');
              break;
+            case 'rest':
+              serverProcess = exec('yarn start:rest');
+              break;
            case 'team':
              serverProcess = exec('yarn start:team');
              break;
@@ -48,6 +52,12 @@ module.exports = defineConfig({
            case 'charts':
              serverProcess = exec('yarn start:charts');
              break;
+            case 'redis':
+              serverProcess = exec('yarn start:redis');
+              break;
+            case 'ai-chat':
+              serverProcess = exec('yarn start:ai-chat');
+              break;
          }

          await waitOn({ resources: ['http://localhost:3000'] });
@@ -0,0 +1,105 @@
+Cypress.on('uncaught:exception', err => {
+  if (err.message.includes("Failed to execute 'importScripts' on 'WorkerGlobalScope'")) {
+    return false;
+  }
+});
+
+beforeEach(() => {
+  cy.visit('http://localhost:3000');
+  cy.viewport(1250, 900);
+});
+
+describe('Database Chat (MySQL)', () => {
+  it('Database chat - chart of popular genres', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_databaseChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('show me chart of most popular genres');
+    cy.get('body').realPress('Enter');
+    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 30000 }).click();
+    cy.testid('chart-canvas', { timeout: 30000 }).should($c =>
+      expect($c[0].toDataURL()).to.match(/^data:image\/png;base64/)
+    );
+    cy.themeshot('database-chat-chart');
+  });
+
+  it('Database chat - find most popular artist', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_databaseChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('find most popular artist');
+    cy.get('body').realPress('Enter');
+    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 30000 }).click();
+    cy.contains('Iron Maiden', { timeout: 30000 });
+    cy.themeshot('database-chat-popular-artist');
+  });
+});
+
+describe('GraphQL Chat', () => {
+  it('GraphQL chat - list users', () => {
+    cy.contains('REST GraphQL').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_graphqlChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('list all users');
+    cy.get('body').realPress('Enter');
+    cy.testid('GraphQlChatTab_executeAllQueries', { timeout: 30000 }).click();
+    cy.contains('users', { timeout: 30000 });
+    cy.themeshot('graphql-chat-list-users');
+  });
+
+  it('GraphQL chat - product categories chart', () => {
+    cy.contains('REST GraphQL').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_graphqlChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('show me a chart of product categories');
+    cy.get('body').realPress('Enter');
+    cy.testid('GraphQlChatTab_executeAllQueries', { timeout: 30000 }).click();
+    cy.testid('chart-canvas', { timeout: 30000 }).should($c =>
+      expect($c[0].toDataURL()).to.match(/^data:image\/png;base64/)
+    );
+    cy.themeshot('graphql-chat-categories-chart');
+  });
+
+  it('GraphQL chat - find most expensive product', () => {
+    cy.contains('REST GraphQL').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_graphqlChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('find the most expensive product');
+    cy.get('body').realPress('Enter');
+    cy.testid('GraphQlChatTab_executeAllQueries', { timeout: 30000 }).click();
+    cy.contains('products', { timeout: 30000 });
+    cy.themeshot('graphql-chat-expensive-product');
+  });
+
+  it('GraphQL chat - show all categories', () => {
+    cy.contains('REST GraphQL').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_graphqlChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('show all categories');
+    cy.get('body').realPress('Enter');
+    cy.testid('GraphQlChatTab_executeAllQueries', { timeout: 30000 }).click();
+    cy.contains('categories', { timeout: 30000 });
+    cy.themeshot('graphql-chat-all-categories');
+  });
+
+  it('Explain query error', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.testid('TabsPanel_buttonNewObject').click();
+    cy.testid('NewObjectModal_query').click();
+    cy.wait(1000);
+    cy.get('body').realType('select * from Invoice2');
+    cy.contains('Execute').click();
+    cy.testid('MessageViewRow-explainErrorButton-1').click();
+    cy.testid('ChatCodeRenderer_useSqlButton', { timeout: 30000 });
+    cy.themeshot('explain-query-error');
+  });
+});
@@ -85,14 +85,16 @@ describe('Data browser data', () => {
    cy.contains('MySql-connection').click();
    cy.contains('MyChinook').click();
    cy.contains('Album').click();
+
+    // hide what is not needed
+    cy.testid('WidgetIconPanel_database').click();
+    cy.testid('DataGrid_itemReferences').click();
+
    cy.testid('DataFilterControl_input_Title').type('Rock{enter}');
    cy.contains('Rows: 7');
    cy.testid('DataFilterControl_input_AlbumId').type('>10xxx{enter}');
    cy.contains('Rows: 7');
-    cy.testid('DataFilterControl_filtermenu_Title').click();
-    // hide what is not needed
-    cy.testid('WidgetIconPanel_database').click();
-    cy.testid('DataGrid_itemReferences').click();
+    cy.testid('DataFilterControl_filtermenu_ArtistId').click();
    cy.themeshot('data-browser-filter');
    cy.testid('DataGridCore_button_clearFilters').click();
    cy.contains('Rows: 347');
@@ -202,7 +204,7 @@ describe('Data browser data', () => {
    cy.themeshot('query-editor-join-wizard');
  });

-  it('Mongo JSON data view', () => {
+  it('Mongo query JSON data view', () => {
    cy.contains('Mongo-connection').click();
    cy.contains('MgChinook').click();
    cy.contains('Customer').click();
@@ -213,9 +215,10 @@ describe('Data browser data', () => {
    cy.contains('Open query').click();
    cy.wait(1000);
    cy.contains('Execute').click();
-    cy.testid('WidgetIconPanel_cell-data').click();
+    cy.testid('TabContent_1').contains('Leonie').rightclick();
+    cy.contains('Show cell data').click();
    // test JSON view
-    cy.contains('Country: "Brazil"');
+    cy.contains('Country: "Germany"');
    cy.themeshot('mongo-query-json-view');
  });

@@ -293,7 +296,8 @@ describe('Data browser data', () => {
    // cy.contains('location').click();
    cy.contains('14.2').click();
    cy.contains('13.9').click({ shiftKey: true });
-    cy.testid('WidgetIconPanel_cell-data').click();
+    cy.testid('WidgetIconPanel_database').click();
+    cy.testid('TableDataTab_toggleCellDataView').click();
    cy.wait(2000);
    cy.themeshot('cell-map-view');
  });
@@ -337,7 +341,7 @@ describe('Data browser data', () => {
    cy.themeshot('save-changes-mongodb');
  });

-  it('Edit mongo data JSON', () => {
+  it('Mongo JSON cell view', () => {
    // TODO FIX: Auto expand cell view
    cy.contains('Mongo-connection').click();
    cy.contains('MgRivers').click();
@@ -347,7 +351,8 @@ describe('Data browser data', () => {
    cy.testid('ColumnManagerRow_checkbox_countries.1').click();
    cy.testid('ColumnManagerRow_checkbox__id').click();
    cy.testid('DataFilterControl_input_countries.1').type('EXISTS{enter}');
-    cy.testid('WidgetIconPanel_cell-data').click();
+    cy.contains('Austria').click();
+    cy.testid('CollectionDataTab_toggleCellDataView').click();
    cy.themeshot('mongodb-json-cell-view');
  });

@@ -472,4 +477,39 @@ describe('Data browser data', () => {
    cy.testid('DataDeployTab_importIntoDb').click();
    cy.themeshot('data-replicator');
  });
+
+  it('Form cell view', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Invoice').click();
+    cy.contains('Rows: 412');
+    cy.get('[data-row="0"][data-col="header"]').click();
+    cy.get('[data-row="1"][data-col="header"]').click();
+    cy.get('[data-row="0"][data-col="header"]').click();
+    cy.contains('Autodetect - Form');
+    cy.themeshot('form-cell-view');
+  });
+
+  it('Group by', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Album').click();
+    cy.testid('WidgetIconPanel_database').click();
+    cy.testid('ColumnHeaderControl_dropdown_ArtistId').click();
+    cy.contains('Group by').click();
+    cy.testid('ColumnHeaderControl_dropdown_Title').first().click();
+    cy.themeshot('data-browser-group-by');
+  });
+
+  it('Filter by expanded column', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Album').click();
+    cy.testid('WidgetIconPanel_database').click();
+    cy.testid('ColumnManagerRow_expand_ArtistId').click();
+    cy.testid('ColumnManagerRow_checkbox_ArtistId.Name').click();
+    cy.testid('ColumnManagerRow_checkbox_ArtistId').click();
+    cy.testid('DataFilterControl_input_ArtistId.Name').type('mich{enter}');
+    cy.themeshot('data-browser-filter-by-expanded');
+  });
 });
@@ -110,55 +110,6 @@ describe('Charts', () => {
    cy.themeshot('new-object-window');
  });

-  it('Database chat - charts', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_databaseChat').click();
-    cy.wait(1000);
-    cy.get('body').realType('show me chart of most popular genres');
-    cy.get('body').realPress('{enter}');
-    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 30000 }).click();
-    cy.testid('chart-canvas', { timeout: 30000 }).should($c =>
-      expect($c[0].toDataURL()).to.match(/^data:image\/png;base64/)
-    );
-    cy.themeshot('database-chat-chart');
-  });
-
-  it('Database chat', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_databaseChat').click();
-    cy.wait(1000);
-    cy.get('body').realType('find most popular artist');
-    cy.get('body').realPress('{enter}');
-    cy.testid('DatabaseChatTab_executeAllQueries', { timeout: 30000 }).click();
-    cy.wait(30000);
-    // cy.contains('Iron Maiden');
-    cy.themeshot('database-chat');
-
-    // cy.testid('DatabaseChatTab_promptInput').click();
-    // cy.get('body').realType('I need top 10 songs with the biggest income');
-    // cy.get('body').realPress('{enter}');
-    // cy.contains('Hot Girl', { timeout: 20000 });
-    // cy.wait(1000);
-    // cy.themeshot('database-chat');
-  });
-
-  it('Explain query error', () => {
-    cy.contains('MySql-connection').click();
-    cy.contains('MyChinook').click();
-    cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_query').click();
-    cy.wait(1000);
-    cy.get('body').realType('select * from Invoice2');
-    cy.contains('Execute').click();
-    cy.testid('MessageViewRow-explainErrorButton-1').click();
-    cy.testid('ChatCodeRenderer_useSqlButton', { timeout: 30000 });
-    cy.themeshot('explain-query-error');
-  });
-
  it('Switch language', () => {
    cy.contains('MySql-connection').click();
    cy.contains('MyChinook').click();
@@ -198,4 +149,88 @@ describe('Charts', () => {
    cy.testid('ConfirmModal_okButton').click();
    cy.testid('WidgetIconPanel_settings');
  });
+
+  it('Settings', () => {
+    cy.testid('WidgetIconPanel_settings').click();
+    cy.themeshot('app-settings-general');
+
+    cy.contains('Behaviour').click();
+    cy.themeshot('app-settings-behaviour');
+    cy.get('[data-testid=BehaviourSettings_useTabPreviewMode]').uncheck();
+
+    // SQL Editor
+    cy.contains('SQL Editor').click();
+    cy.get('[data-testid=SQLEditorSettings_sqlCommandsCase]').select('lowerCase');
+
+    cy.contains('MySql-connection').click();
+    cy.contains('charts_sample').click();
+    cy.contains('employees').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Customer').rightclick();
+    cy.contains('SQL template').click();
+    cy.contains('CREATE TABLE').click();
+    cy.contains('create table');
+
+    // Default Actions
+    cy.testid('WidgetIconPanel_settings').click();
+    cy.contains('Default Actions').click();
+    cy.get('[data-testid=DefaultActionsSettings_useLastUsedAction]').uncheck();
+
+    // Themes
+    cy.contains('Themes').click();
+    cy.themeshot('app-settings-themes');
+    cy.testid('ThemeSkeleton-Dark-built-in').click();
+    cy.testid('ThemeSkeleton-Light-built-in').click();
+
+    // General
+    cy.contains(/^General$/).click();
+    cy.contains('charts_sample');
+    cy.get('[data-testid=GeneralSettings_lockedDatabaseMode]').check();
+    cy.contains('Connections').click();
+    cy.contains('charts_sample').should('not.exist');
+
+    // Datagrid
+    cy.contains('Data grid').click();
+    cy.get('[data-testid=DataGridSettings_showHintColumns]').uncheck();
+    cy.wait(500);
+    cy.contains('Album').click();
+    cy.contains('AC/DC').should('not.exist');
+
+    cy.testid('WidgetIconPanel_settings').click();
+    cy.contains('Keyboard shortcuts').click();
+    cy.themeshot('app-settings-keyboard-shortcuts');
+    cy.contains('Chart').click();
+    cy.testid('CommandModal_keyboardButton').click();
+    cy.realPress(['Control', 'g']);
+    cy.realPress('Enter');
+    cy.contains('OK').click();
+    cy.contains('Ctrl+G');
+
+    cy.contains('AI').click();
+    cy.themeshot('app-settings-ai');
+    cy.get('[data-testid=AISettings_addProviderButton]').click();
+    cy.contains('Provider 1');
+    cy.get('[data-testid=AiProviderCard_removeButton]').click();
+    cy.contains('Are you sure you want to remove Provider 1 provider?');
+    cy.contains('OK').click();
+    cy.contains('Provider 1').should('not.exist');
+  });
+
+  it('Custom theme', () => {
+    cy.testid('WidgetIconPanel_settings').click();
+    cy.contains('Themes').click();
+    cy.testid('ThemeSettings-themeList').contains('Green-Sample').click();
+    cy.testid('WidgetIconPanel_file').click();
+    cy.themeshot('green-theme', { keepTheme: true });
+
+    cy.testid('ThemeSettings-themeList').contains('Solarized-light').click();
+    cy.testid('WidgetIconPanel_database').click();
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Customer').click();
+    cy.contains('Leonie');
+    cy.testid('WidgetIconPanel_file').click();
+
+    cy.themeshot('solarized-theme', { keepTheme: true });
+  });
 });
@@ -3,6 +3,8 @@ const { formatQueryWithoutParams } = require('dbgate-tools');

 global.DBGATE_PACKAGES = {
  'dbgate-tools': require('dbgate-tools'),
+  'dbgate-sqltree': require('dbgate-sqltree'),
+  'dbgate-datalib': require('dbgate-datalib'),
 };

 function requireEngineDriver(engine) {
@@ -141,7 +143,7 @@ describe('Backup table', () => {
    cy.get('body').realType('111222333{enter}');

    cy.testid('TableDataTab_save').click();
-    cy.testid('ConfirmSqlModal_okButton').click();
+    cy.testid('ConfirmSqlModal_okButton', { timeout: 10000 }).click();
    cy.contains('Rows: 11').should('be.visible'); // wait for save

    cy.testid('app-object-group-items-table-backups').contains('addresses').rightclick();
@@ -161,7 +163,7 @@ describe('Backup table', () => {
    // cy.testid('CloseTabModal_buttonConfirm').click();
    cy.wait(1000);

-    cy.testid('app-object-group-items-tables').contains('addresses').click();
+    cy.testid('app-object-group-items-tables').contains('addresses', { timeout: 10000 }).click();

    // check whether data was successfully restored
    cy.contains('Rows: 12').should('be.visible');
@@ -210,7 +212,8 @@ describe('Import CSV', () => {
    cy.testid('ImportExportConfigurator_tableMappingSection').contains('20 rows written').should('be.visible');

    cy.testid('SqlObjectList_refreshButton').click();
-    cy.contains('Refresh DB structure (incremental)').click();
+    cy.testid('DatabasStatusMenu_refreshFull').click();
+    // cy.contains('Refresh DB structure (incremental)').click();
    cy.testid('SqlObjectList_container').contains('customers-20').click();
    cy.contains('Rows: 20').should('be.visible');

@@ -236,7 +239,7 @@ describe('Import CSV - source error', () => {
    cy.testid('ImportExportTab_preview_content').contains('Invalid Closing Quote').should('be.visible');

    cy.testid('ImportExportTab_executeButton').click();
-    cy.testid('ImportExportConfigurator_errorInfoIcon_customers-20-err').click();
+    cy.testid('ImportExportConfigurator_errorInfoIcon_customers-20-err', { timeout: 10000 }).click();

    cy.testid('ErrorMessageModal_message').contains('Invalid Closing Quote').should('be.visible');
  });
@@ -255,7 +258,7 @@ describe('Import CSV - target error', () => {
    cy.contains('customers-20');
    cy.testid('ImportExportConfigurator_targetName_customers-20').clear().type('system."]`');
    cy.testid('ImportExportTab_executeButton').click();
-    cy.testid('ImportExportConfigurator_errorInfoIcon_customers-20').click();
+    cy.testid('ImportExportConfigurator_errorInfoIcon_customers-20', { timeout: 10000 }).click();
    cy.testid('ErrorMessageModal_message').should('be.visible');
  });
 });
@@ -0,0 +1,120 @@
+Cypress.on('uncaught:exception', (err, runnable) => {
+  // if the error message matches the one about WorkerGlobalScope importScripts
+  if (err.message.includes("Failed to execute 'importScripts' on 'WorkerGlobalScope'")) {
+    // return false to let Cypress know we intentionally want to ignore this error
+    return false;
+  }
+  // otherwise let Cypress throw the error
+});
+
+beforeEach(() => {
+  cy.visit('http://localhost:3000');
+  cy.viewport(1250, 900);
+});
+
+describe('Redis data', () => {
+  it('String test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('app').click();
+    cy.contains('version').click();
+    cy.testid('RedisValueDetail_AceEditor').click().realPress('Backspace').realType('1');
+    cy.contains('Save').click();
+    cy.contains('OK').click();
+  });
+
+  it('Hash test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('user').click();
+    cy.contains('alice').click();
+    cy.testid('RedisKeyDetailTab_RenameKeyButton').click();
+    cy.themeshot('redis-rename-key');
+    cy.realType('3');
+    cy.contains('OK').click();
+    cy.contains('age').click();
+    cy.testid('RedisValueHashDetail_ValueSection').click().realPress('Backspace').realType('8');
+    cy.contains('Add field').click();
+    cy.testid('RedisValueListLikeEdit_key').click().realType('phone');
+    cy.testid('RedisValueListLikeEdit_value').click().realType('123-456-7890');
+    cy.contains('Refresh').click();
+    cy.themeshot('redis-hash-edit');
+    cy.contains('Save').click();
+    cy.themeshot('redis-hash-script-edit');
+    cy.contains('OK').click();
+  });
+
+  it('List test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('queue').click();
+    cy.contains('emails').click();
+    cy.contains('Add field').click();
+    cy.testid('RedisValueListLikeEdit_value').click().realType('reset');
+    cy.contains('Save').click();
+    cy.contains('OK').click();
+  });
+
+  it('Set test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('tags').click();
+    cy.contains('Add field').click();
+    cy.testid('RedisValueListLikeEdit_value').click().realType('newtag');
+    cy.contains('Save').click();
+    cy.contains('OK').click();
+  });
+
+  it('ZSet test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('leaderboard').click();
+    cy.contains('alice').click();
+    cy.testid('RedisValueZSetDetail_score')
+      .click()
+      .realPress('Backspace')
+      .realPress('Backspace')
+      .realPress('Backspace')
+      .realType('35');
+    cy.contains('Save').click();
+    cy.contains('OK').click();
+    cy.contains('35').should('exist');
+  });
+
+  it('JSON test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('user').click();
+    cy.contains('1:*').click();
+    cy.contains('json').click();
+    cy.testid('RedisValueDetail_displaySelect').select('JSON view');
+    cy.themeshot('redis-json-detail');
+  });
+
+  it('Stream test', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.contains('events').click();
+    cy.contains('Add field').click();
+    cy.testid('RedisValueListLikeEdit_field').click().realType('message');
+    cy.testid('RedisValueListLikeEdit_value').click().realType('Hello, World!');
+    cy.contains('Save').click();
+    cy.contains('OK').click();
+    cy.themeshot('redis-stream');
+  });
+
+  it('Add key', () => {
+    cy.contains('Redis-connection').click();
+    cy.contains('db1').click();
+    cy.testid('RedisKeysTree_addKeyDropdown').click();
+    cy.contains('String').click();
+    cy.testid('NewRedisKeyTab_keyName').click().realType('newstringkey');
+    cy.testid('RedisValueDetail_AceEditor').click().realType('This is a new string key.');
+    cy.contains('Save').click();
+    cy.contains('OK').click();
+    cy.contains('newstringkey').should('exist');
+    cy.testid('RedisKeysTree_addKeyDropdown').click();
+    cy.contains('Hash').click();
+    cy.themeshot('redis-add-hash-key');
+  });
+});
@@ -0,0 +1,39 @@
+Cypress.on('uncaught:exception', err => {
+  if (err.message.includes("Failed to execute 'importScripts' on 'WorkerGlobalScope'")) {
+    return false;
+  }
+});
+
+beforeEach(() => {
+  cy.visit('http://localhost:3000');
+  cy.viewport(1250, 900);
+});
+
+describe('REST API connections', () => {
+  it('GraphQL test', () => {
+    cy.contains('REST GraphQL').click();
+    cy.contains('products').click();
+    cy.testid('GraphQlExplorerNode_toggle_products').click();
+    cy.testid('GraphQlExplorerNode_checkbox_products.name').click();
+    cy.testid('GraphQlExplorerNode_checkbox_products.price').click();
+    cy.testid('GraphQlExplorerNode_checkbox_products.description').click();
+    cy.testid('GraphQlExplorerNode_checkbox_products.category').click();
+    cy.testid('GraphQlQueryTab_execute').click();
+    cy.contains('Electronics');
+    cy.themeshot('rest-graphql-query');
+  });
+  it('REST OpenAPI test', () => {
+    cy.contains('REST OpenAPI').click();
+    cy.contains('/api/categories').click();
+    cy.testid('RestApiEndpointTab_execute').click();
+    cy.contains('Electronics');
+    cy.themeshot('rest-openapi-query');
+  });
+  it('REST OData test', () => {
+    cy.contains('REST OData').click();
+    cy.contains('/Users').click();
+    cy.testid('ODataEndpointTab_execute').click();
+    cy.contains('Henry');
+    cy.themeshot('rest-odata-query');
+  });
+});
@@ -36,9 +36,11 @@ Cypress.Commands.add(
    prevSubject: 'optional',
  },
  (subject, file, options) => {
-    cy.window().then(win => {
-      win.__changeCurrentTheme('theme-dark');
-    });
+    if (!options?.keepTheme) {
+      cy.window().then(win => {
+        win.__changeCurrentTheme('dark');
+      });
+    }

    // cy.screenshot(`${file}-dark`, {
    //   onAfterScreenshot: (doc, props) => {
@@ -63,9 +65,11 @@ Cypress.Commands.add(
    //   });
    // });

-    cy.window().then(win => {
-      win.__changeCurrentTheme('theme-light');
-    });
+    if (!options?.keepTheme) {
+      cy.window().then(win => {
+        win.__changeCurrentTheme('light');
+      });
+    }

    if (subject) {
      cy.wrap(subject).screenshot(`${file}-light`, options);
@@ -0,0 +1,253 @@
+{
+  "themeName": "Green-Sample",
+  "themeType": "light",
+  "themeVariables": {
+    "--theme-generic-font": "oklch(27% 0.07 130)",
+    "--theme-generic-font-hover": "oklch(40% 0.15 130)",
+    "--theme-generic-font-grayed": "oklch(65% 0.05 130)",
+    "--theme-link-foreground": "oklch(40% 0.25 130)",
+    "--theme-content-background": "oklch(95% 0.05 130)",
+    "--theme-widget-panel-background": "oklch(80% 0.1 130)",
+    "--theme-widget-panel-foreground": "oklch(27% 0.07 130)",
+    "--theme-widget-icon-background-active": "oklch(50% 0.12 130)",
+    "--theme-widget-icon-foreground-active": "white",
+    "--theme-widget-icon-foreground-hover": "white",
+    "--theme-widget-icon-border-active": "1px solid white",
+    "--theme-scrollbar-background": "oklch(90% 0.08 130)",
+    "--theme-scrollbar-thumb-background": "oklch(70% 0.12 130)",
+    "--theme-scrollbar-thumb-background-hover": "oklch(40% 0.15 130)",
+    "--theme-scrollbar-corner-background": "oklch(85% 0.1 130)",
+    "--theme-tabs-panel-border": "1px solid oklch(95% 0.05 130)",
+    "--theme-tabs-panel-foreground": "oklch(20% 0.06 130)",
+    "--theme-tabs-panel-active-foreground": "oklch(10% 0.06 130)",
+    "--theme-tabs-panel-background": "oklch(95.5% 0.04 130)",
+    "--theme-tabs-panel-active-background": "oklch(80% 0.12 130)",
+    "--theme-tabs-panel-item-background": "oklch(90% 0.1 130)",
+    "--theme-tabs-panel-active-border": "1px solid oklch(50% 0.2 130)",
+    "--theme-splitter-active": "oklch(50% 0.2 130)",
+    "--theme-splitter-button-background": "oklch(90% 0.1 130)",
+    "--theme-splitter-button-background-active": "oklch(85% 0.15 130)",
+    "--theme-splitter-button-foreground": "oklch(10% 0.06 130)",
+    "--theme-sidebar-background": "oklch(90% 0.1 130)",
+    "--theme-sidebar-background-hover": "oklch(80% 0.12 130)",
+    "--theme-sidebar-background-active": "oklch(75% 0.14 130)",
+    "--theme-sidebar-background-focused": "oklch(70% 0.18 130)",
+    "--theme-sidebar-foreground": "oklch(20% 0.06 130)",
+    "--theme-sidebar-foreground-button": "oklch(40% 0.12 130)",
+    "--theme-sidebar-foreground-grayed": "oklch(65% 0.05 130)",
+    "--theme-sidebar-foreground-hover": "oklch(50% 0.25 130)",
+    "--theme-sidebar-section-background": "oklch(65% 0.05 130)",
+    "--theme-sidebar-section-border": "none",
+    "--theme-sidebar-section-border-top": "1px solid oklch(80% 0.1 130)",
+    "--theme-sidebar-section-foreground": "oklch(10% 0.06 130)",
+    "--theme-sidebar-border": "none",
+    "--theme-altsidebar-background": "oklch(95% 0.05 130)",
+    "--theme-altsidebar-background-grayed": "oklch(97% 0.02 130)",
+    "--theme-altsidebar-background-hover": "oklch(85% 0.1 130)",
+    "--theme-altsidebar-background-active": "oklch(80% 0.12 130)",
+    "--theme-altsidebar-background-focused": "oklch(75% 0.15 130)",
+    "--theme-altsidebar-foreground": "oklch(20% 0.06 130)",
+    "--theme-altsidebar-foreground-button": "oklch(40% 0.12 130)",
+    "--theme-altsidebar-foreground-grayed": "oklch(65% 0.05 130)",
+    "--theme-altsidebar-foreground-hover": "oklch(50% 0.25 130)",
+    "--theme-altsidebar-section-background": "oklch(97% 0.02 130)",
+    "--theme-altsidebar-section-border": "none",
+    "--theme-altsidebar-section-border-top": "1px solid oklch(85% 0.1 130)",
+    "--theme-altsidebar-section-foreground": "oklch(10% 0.06 130)",
+    "--theme-altsidebar-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-searchbox-background": "oklch(80% 0.12 130)",
+    "--theme-searchbox-placeholder": "oklch(65% 0.05 130)",
+    "--theme-searchbox-border": "1px solid oklch(70% 0.15 130)",
+    "--theme-searchbox-background-filtered": "oklch(95% 0.04 110)",
+    "--theme-altsearchbox-background": "oklch(90% 0.1 130)",
+    "--theme-altsearchbox-placeholder": "oklch(65% 0.05 130)",
+    "--theme-altsearchbox-border": "1px solid oklch(80% 0.1 130)",
+    "--theme-inlinebutton-foreground": "oklch(40% 0.12 130)",
+    "--theme-inlinebutton-foreground-disabled": "oklch(65% 0.05 130)",
+    "--theme-inlinebutton-foreground-hover": "black",
+    "--theme-inlinebutton-circle-hover-background": "oklch(85% 0.1 130)",
+    "--theme-inlinebutton-bordered-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-inlinebutton-bordered-hover-border": "1px solid oklch(70% 0.15 130)",
+    "--theme-inlinebutton-bordered-background": "linear-gradient(to bottom, oklch(95% 0.04 130) 5%, oklch(90% 0.1 130) 100%)",
+    "--theme-inlinebutton-bordered-hover-background": "linear-gradient(to bottom, oklch(90% 0.1 130) 5%, oklch(95% 0.04 130) 100%)",
+    "--theme-datagrid-background": "oklch(95% 0.04 130)",
+    "--theme-datagrid-foreground": "oklch(20% 0.06 130)",
+    "--theme-datagrid-foreground-grayed": "oklch(65% 0.05 130)",
+    "--theme-datagrid-border-horizontal": "1px solid oklch(90% 0.1 130)",
+    "--theme-datagrid-border-vertical": "1px solid oklch(95% 0.04 130)",
+    "--theme-datagrid-cell-background": "oklch(97% 0.02 130)",
+    "--theme-datagrid-headercell-background": "oklch(95% 0.04 130)",
+    "--theme-datagrid-cell-background-alt": "oklch(95% 0.04 130)",
+    "--theme-datagrid-cell-background-alt2": "oklch(90% 0.1 130)",
+    "--theme-datagrid-filter-background": "oklch(90% 0.1 130)",
+    "--theme-datagrid-filter-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-datagrid-filter-ok-background": "oklch(95% 0.1 135)",
+    "--theme-datagrid-filter-error-background": "oklch(95% 0.12 30)",
+    "--theme-datagrid-modified-row-background": "oklch(95% 0.1 135)",
+    "--theme-datagrid-modified-cell-background": "oklch(90% 0.15 135)",
+    "--theme-datagrid-inserted-row-background": "oklch(95% 0.1 110)",
+    "--theme-datagrid-deleted-row-background": "oklch(95% 0.1 25)",
+    "--theme-datagrid-selected-cell-background": "oklch(80% 0.1 130)",
+    "--theme-datagrid-focused-cell-background": "oklch(75% 0.15 130)",
+    "--theme-datagrid-focused-cell-border-horizontal": "1px solid oklch(70% 0.2 130)",
+    "--theme-datagrid-focused-cell-border-vertical": "1px solid oklch(70% 0.2 130)",
+    "--theme-datagrid-selected-point-marker": "oklch(50% 0.25 130)",
+    "--theme-datagrid-corner-label-background": "oklch(75% 0.15 130)",
+    "--theme-datagrid-corner-label-border": "1px solid oklch(70% 0.2 130)",
+    "--theme-datagrid-detail-header-background": "oklch(85% 0.05 130)",
+    "--theme-datagrid-detail-header-border": "1px solid oklch(80% 0.1 130)",
+    "--theme-datagrid-cell-foreground-value-green": "oklch(45% 0.2 140)",
+    "--theme-checkbox-check": "oklch(90% 0.1 130)",
+    "--theme-checkbox-background": "oklch(40% 0.25 130)",
+    "--theme-checkbox-border": "1px solid oklch(70% 0.15 130)",
+    "--theme-checkbox-mark": "white",
+    "--theme-checkbox-background-disabled": "oklch(95% 0.04 130)",
+    "--theme-checkbox-background-disabled-before": "oklch(70% 0.15 130)",
+    "--theme-checkbox-hover-not-disabled": "oklch(65% 0.05 130)",
+    "--theme-checkbox-background-inherited": "oklch(85% 0.1 130)",
+    "--theme-table-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-table-cell-background": "oklch(97% 0.02 130)",
+    "--theme-table-cell-empty-background": "oklch(95% 0.04 130)",
+    "--theme-table-cell-empty-foreground": "oklch(65% 0.05 130)",
+    "--theme-table-header-background": "oklch(95% 0.04 130)",
+    "--theme-table-selected-background": "oklch(75% 0.15 130)",
+    "--theme-table-active-background": "oklch(80% 0.1 130)",
+    "--theme-table-hover-background": "oklch(95% 0.04 130)",
+    "--theme-table-added-background": "oklch(95% 0.1 110)",
+    "--theme-table-changed-background": "oklch(95% 0.1 135)",
+    "--theme-table-deleted-background": "oklch(95% 0.1 25)",
+    "--theme-cell-active-border": "2px solid oklch(50% 0.25 130)",
+    "--theme-object-header-background": "oklch(95% 0.04 130)",
+    "--theme-modal-background": "oklch(97% 0.02 130)",
+    "--theme-modal-header-background": "oklch(85% 0.1 130)",
+    "--theme-modal-footer-background": "oklch(97% 0.02 130)",
+    "--theme-modal-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-modal-overlay-background": "color-mix(in srgb, #124012 40%, transparent)",
+    "--theme-modal-shadow": "0 20px 25px -5px color-mix(in srgb, #124012 10%, transparent)",
+    "--theme-modal-close-hover-background": "oklch(70% 0.15 130)",
+    "--theme-formbutton-foreground": "white",
+    "--theme-formbutton-border": "1px solid oklch(40% 0.25 130)",
+    "--theme-formbutton-border-hover": "1px solid oklch(50% 0.3 130)",
+    "--theme-formbutton-border-active": "2px solid oklch(55% 0.35 130)",
+    "--theme-formbutton-background": "oklch(40% 0.25 130)",
+    "--theme-formbutton-background-disabled": "oklch(85% 0.1 130)",
+    "--theme-formbutton-border-disabled": "1px solid oklch(85% 0.1 130)",
+    "--theme-formbutton-foreground-disabled": "oklch(65% 0.05 130)",
+    "--theme-formbutton-background-hover": "oklch(35% 0.3 130)",
+    "--theme-formbutton-background-active": "oklch(35% 0.3 130)",
+    "--theme-outlinebutton-foreground": "oklch(10% 0.06 130)",
+    "--theme-outlinebutton-border": "1px solid oklch(40% 0.25 130)",
+    "--theme-outlinebutton-hover-foreground": "oklch(40% 0.25 130)",
+    "--theme-outlinebutton-hover-border": "2px solid oklch(50% 0.3 130)",
+    "--theme-tabs-control-background": "oklch(95% 0.04 130)",
+    "--theme-tabs-control-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-tabs-control-selected-background": "oklch(98% 0.01 130)",
+    "--theme-tabs-control-selected-border": "2px solid oklch(50% 0.25 130)",
+    "--theme-inline-tabs-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-inline-tabs-border-active": "2px solid oklch(50% 0.25 130)",
+    "--theme-toolstrip-background": "oklch(97% 0.02 130)",
+    "--theme-toolstrip-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-toolstrip-button-foreground": "oklch(27% 0.07 130)",
+    "--theme-panel-border-subtle": "1px solid color-mix(in srgb, oklch(20% 0.06 130) 5%, transparent)",
+    "--theme-panel-type-label-color": "oklch(65% 0.05 130)",
+    "--theme-toolstrip-button-foreground-disabled": "oklch(65% 0.05 130)",
+    "--theme-toolstrip-button-foreground-icon": "oklch(40% 0.12 130)",
+    "--theme-toolstrip-button-background": "oklch(97% 0.02 130)",
+    "--theme-toolstrip-button-background-hover": "oklch(95% 0.04 130)",
+    "--theme-toolstrip-button-background-active": "oklch(90% 0.1 130)",
+    "--theme-toolstrip-button-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-toolstrip-button-border-hover": "1px solid oklch(85% 0.1 130)",
+    "--theme-toolstrip-button-border-disabled": "1px solid oklch(90% 0.1 130)",
+    "--theme-toolstrip-button-split-separator-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-designer-background": "oklch(97% 0.02 130)",
+    "--theme-designer-item-background": "oklch(95% 0.04 130)",
+    "--theme-designer-selection-marker": "oklch(35% 0.3 130)",
+    "--theme-designer-item-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-designer-stroke-color": "oklch(65% 0.05 130)",
+    "--theme-designer-arrow-color": "oklch(27% 0.07 130)",
+    "--theme-designer-select-reactangle-foreground": "oklch(50% 0.25 130)",
+    "--theme-designer-header-background-1": "oklch(70% 0.15 130)",
+    "--theme-designer-header-background-2": "oklch(70% 0.18 180)",
+    "--theme-designer-header-background-3": "oklch(68% 0.15 100)",
+    "--theme-designer-header-background-grayed": "oklch(85% 0.1 130)",
+    "--theme-designer-close-background": "oklch(90% 0.1 130)",
+    "--theme-designer-close-background-hover": "oklch(85% 0.1 130)",
+    "--theme-designer-close-background-active": "oklch(70% 0.15 130)",
+    "--theme-designer-drag-column-background": "oklch(90% 0.2 110)",
+    "--theme-designer-select-column-background": "oklch(90% 0.1 130)",
+    "--theme-statusbar-background": "oklch(40% 0.25 130)",
+    "--theme-statusbar-foreground": "oklch(95% 0.04 130)",
+    "--theme-statusbar-background-hover": "oklch(35% 0.3 130)",
+    "--theme-statusbar-button-background": "oklch(85% 0.1 130)",
+    "--theme-statusbar-button-foreground": "oklch(27% 0.07 130)",
+    "--theme-statusbar-icon-error": "oklch(80% 0.1 25)",
+    "--theme-statusbar-icon-ok": "oklch(85% 0.2 130)",
+    "--theme-aichat-user-background": "oklch(93% 0.06 130)",
+    "--theme-aichat-assistant-background": "oklch(95% 0.04 130)",
+    "--theme-applog-details-background": "oklch(98% 0.01 130)",
+    "--theme-input-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-input-border-hover": "1px solid oklch(70% 0.15 130)",
+    "--theme-input-border-hover-color": "oklch(70% 0.15 130)",
+    "--theme-input-border-focus": "1px solid oklch(50% 0.25 130)",
+    "--theme-input-border-focus-color": "oklch(50% 0.25 130)",
+    "--theme-input-border-disabled": "1px solid oklch(90% 0.1 130)",
+    "--theme-input-background": "white",
+    "--theme-input-foreground": "oklch(20% 0.06 130)",
+    "--theme-input-placeholder": "oklch(65% 0.05 130)",
+    "--theme-input-background-disabled": "oklch(95% 0.04 130)",
+    "--theme-input-foreground-disabled": "oklch(65% 0.05 130)",
+    "--theme-input-focus-ring": "0 0 0 3px color-mix(in srgb, oklch(50% 0.25 130) 10%, transparent)",
+    "--theme-input-multi-clear-background": "oklch(90% 0.1 130)",
+    "--theme-input-multi-clear-foreground": "oklch(40% 0.12 130)",
+    "--theme-input-multi-clear-hover": "oklch(85% 0.1 130)",
+    "--theme-input-shadow": "0 1px 2px 0 color-mix(in srgb, oklch(20% 0.06 130) 5%, transparent)",
+    "--theme-input-shadow-hover": "0 4px 6px -2px color-mix(in srgb, oklch(20% 0.06 130) 8%, transparent)",
+    "--theme-input-shadow-focus": "0 1px 2px 0 color-mix(in srgb, oklch(20% 0.06 130) 5%, transparent)",
+    "--theme-input-inplace-select-shadow": "0 1px 10px 1px oklch(40% 0.12 130)",
+    "--theme-color-selected-border": "2px solid oklch(27% 0.07 130)",
+    "--theme-new-object-button-background": "oklch(90% 0.1 130)",
+    "--theme-new-object-button-background-hover": "oklch(85% 0.1 130)",
+    "--theme-status-valid-background": "oklch(95% 0.1 110)",
+    "--theme-status-testing-background": "oklch(95% 0.1 135)",
+    "--theme-status-error-background": "oklch(95% 0.1 25)",
+    "--theme-status-unconfigured-background": "oklch(95% 0.04 130)",
+    "--theme-status-untested-background": "oklch(94% 0.1 65)",
+    "--theme-dropdown-icon-hover": "oklch(45% 0.3 130)",
+    "--theme-icon-picker-background": "oklch(90% 0.1 130)",
+    "--theme-icon-picker-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-icon-picker-hover": "oklch(85% 0.1 130)",
+    "--theme-icon-picker-selected": "oklch(80% 0.15 130)",
+    "--theme-dbkey-background": "oklch(98% 0.01 130)",
+    "--theme-dbkey-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-dbkey-icon-hover": "oklch(70% 0.15 130)",
+    "--theme-chip-background": "oklch(85% 0.1 130)",
+    "--theme-titlebar-background": "oklch(85% 0.1 130)",
+    "--theme-titlebar-button-hover": "oklch(70% 0.15 130)",
+    "--theme-card-background": "oklch(90% 0.1 130)",
+    "--theme-card-border": "1px solid oklch(85% 0.1 130)",
+    "--theme-content-background-hover": "oklch(95% 0.04 130)",
+    "--theme-admin-menu-item-hover": "oklch(95% 0.04 130)",
+    "--theme-admin-menu-item-active": "oklch(85% 0.1 130)",
+    "--theme-admin-menu-background": "oklch(90% 0.1 130)",
+    "--theme-admin-menu-border": "1px solid oklch(90% 0.1 130)",
+    "--theme-json-tree-string-color": "oklch(45% 0.3 110)",
+    "--theme-json-tree-symbol-color": "oklch(45% 0.3 110)",
+    "--theme-json-tree-boolean-color": "oklch(40% 0.25 130)",
+    "--theme-json-tree-function-color": "oklch(40% 0.25 130)",
+    "--theme-json-tree-number-color": "oklch(50% 0.3 130)",
+    "--theme-json-tree-label-color": "oklch(55% 0.3 140)",
+    "--theme-json-tree-arrow-color": "oklch(65% 0.05 130)",
+    "--theme-json-tree-null-color": "oklch(65% 0.05 130)",
+    "--theme-json-tree-undefined-color": "oklch(65% 0.05 130)",
+    "--theme-json-tree-date-color": "oklch(65% 0.05 130)",
+    "--theme-json-tree-deleted-background": "oklch(95% 0.1 25)",
+    "--theme-json-tree-modified-background": "oklch(95% 0.1 135)",
+    "--theme-json-tree-inserted-background": "oklch(95% 0.1 110)",
+    "--theme-icon-blue": "oklch(40% 0.25 130)",
+    "--theme-icon-green": "oklch(45% 0.2 140)",
+    "--theme-icon-red": "oklch(40% 0.3 25)",
+    "--theme-icon-gold": "oklch(50% 0.2 60)",
+    "--theme-icon-yellow": "oklch(50% 0.15 80)",
+    "--theme-icon-magenta": "oklch(45% 0.3 135)"
+  }
+}
@@ -0,0 +1,15 @@
+HSET "actor:1000" "first_name" "Sandra"
+HSET "actor:1000" "last_name" "Bullock"
+HSET "actor:1000" "date_of_birth" "1964"
+
+HSET "actor:1001" "first_name" "Jon"
+HSET "actor:1001" "last_name" "Hamm"
+HSET "actor:1001" "date_of_birth" "1971"
+
+HSET "actor:1002" "first_name" "Allison"
+HSET "actor:1002" "last_name" "Janney"
+HSET "actor:1002" "date_of_birth" "1959"
+
+HSET "actor:1003" "first_name" "Steve"
+HSET "actor:1003" "last_name" "Coogan"
+HSET "actor:1003" "date_of_birth" "1965"
@@ -0,0 +1,14 @@
+SET app:name "App"
+SET app:version "1.0.0"
+SET app:env "test"
+SET user:1:json "{\"id\":1,\"name\":\"Alice\",\"email\":\"alice@app.test\",\"roles\":[\"admin\",\"user\"],\"settings\":{\"theme\":\"dark\",\"language\":\"sk\"}}"
+SET user:2:json "{\"id\":2,\"name\":\"Bob\",\"email\":\"bob@app.test\",\"roles\":[\"user\"],\"settings\":{\"theme\":\"light\",\"language\":\"en\"}}"
+RPUSH queue:emails "welcome" "reset-password" "newsletter" "promotion" "weekly-digest"
+HSET user:alice name "Alice" email "alice@app.test" active "true" age "29" country "SK"
+HSET user:bob name "Bob" email "bob@app.test" active "false" age "34" country "CZ"
+SADD tags "app" "backend" "database" "redis" "test" "production"
+ZADD leaderboard 100 "alice" 250 "bob" 180 "carol" 90 "dave" 300 "eve"
+XADD events * type "login" userId "1" ip "127.0.0.1" device "web"
+XADD events * type "update-profile" userId "1" field "email" old "alice@app.test" new "alice@new.app"
+XADD events * type "login" userId "2" ip "10.0.0.5" device "mobile"
+XADD events * type "logout" userId "1" reason "manual"
@@ -0,0 +1,14 @@
+CONNECTIONS=mysql,graphql
+
+LOCAL_AI_GATEWAY=true
+
+LABEL_mysql=MySql-connection
+SERVER_mysql=localhost
+USER_mysql=root
+PASSWORD_mysql=Pwd2020Db
+PORT_mysql=16004
+ENGINE_mysql=mysql@dbgate-plugin-mysql
+
+LABEL_graphql=REST GraphQL
+ENGINE_graphql=graphql@rest
+APISERVERURL1_graphql=http://localhost:4444/graphql/noauth
@@ -1,4 +1,4 @@
-CONNECTIONS=mysql,postgres,mongo,redis
+CONNECTIONS=mysql,postgres,mongo

 LABEL_mysql=MySql-connection
 SERVER_mysql=localhost
@@ -22,8 +22,3 @@ USER_mongo=root
 PASSWORD_mongo=Pwd2020Db
 PORT_mongo=16010
 ENGINE_mongo=mongo@dbgate-plugin-mongo
-
-LABEL_redis=Redis-connection
-SERVER_redis=localhost
-ENGINE_redis=redis@dbgate-plugin-redis
-PORT_redis=16011
@@ -0,0 +1,6 @@
+CONNECTIONS=redis
+
+LABEL_redis=Redis-connection
+SERVER_redis=localhost
+ENGINE_redis=redis@dbgate-plugin-redis
+PORT_redis=16011
@@ -0,0 +1,14 @@
+CONNECTIONS=odata,openapi,graphql
+
+LABEL_odata=REST OData
+ENGINE_odata=odata@rest
+APISERVERURL1_odata=http://localhost:4444/odata/noauth
+    
+LABEL_openapi=REST OpenAPI
+ENGINE_openapi=openapi@rest
+APISERVERURL1_openapi=http://localhost:4444/openapi.json
+APISERVERURL2_openapi=http://localhost:4444/openapi/noauth
+
+LABEL_graphql=REST GraphQL
+ENGINE_graphql=graphql@rest
+APISERVERURL1_graphql=http://localhost:4444/graphql/noauth
@@ -0,0 +1,168 @@
+const fs = require('fs');
+const path = require('path');
+const { spawn, spawnSync } = require('child_process');
+
+const rootDir = path.resolve(__dirname, '..', '..');
+const testApiDir = path.join(rootDir, 'test-api');
+const aigwmockDir = path.join(rootDir, 'packages', 'aigwmock');
+const tmpDataDir = path.resolve(__dirname, '..', 'tmpdata');
+const testApiPidFile = path.join(tmpDataDir, 'test-api.pid');
+const aigwmockPidFile = path.join(tmpDataDir, 'aigwmock.pid');
+const isWindows = process.platform === 'win32';
+
+const dbgateApi = require('dbgate-api');
+dbgateApi.initializeApiEnvironment();
+const dbgatePluginMysql = require('dbgate-plugin-mysql');
+dbgateApi.registerPlugins(dbgatePluginMysql);
+
+function delay(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+// --- MySQL setup (same as charts init) ---
+
+async function initMySqlDatabase(dbname, inputFile) {
+  const connection = {
+    server: process.env.SERVER_mysql,
+    user: process.env.USER_mysql,
+    password: process.env.PASSWORD_mysql,
+    port: process.env.PORT_mysql,
+    engine: 'mysql@dbgate-plugin-mysql',
+  };
+
+  await dbgateApi.executeQuery({
+    connection,
+    sql: `DROP DATABASE IF EXISTS ${dbname}`,
+  });
+
+  await dbgateApi.executeQuery({
+    connection,
+    sql: `CREATE DATABASE ${dbname}`,
+  });
+
+  await dbgateApi.importDatabase({
+    connection: { ...connection, database: dbname },
+    inputFile,
+  });
+}
+
+// --- Process management helpers ---
+
+function readProcessStartTime(pid) {
+  if (process.platform === 'linux') {
+    try {
+      const stat = fs.readFileSync(`/proc/${pid}/stat`, 'utf-8');
+      return stat.split(' ')[21] || null;
+    } catch (err) {
+      return null;
+    }
+  }
+  return null;
+}
+
+function isPidStillOurs(meta) {
+  if (!meta || !(meta.pid > 0)) return false;
+  if (process.platform === 'linux' && meta.startTime) {
+    const current = readProcessStartTime(meta.pid);
+    return current === meta.startTime;
+  }
+  return true;
+}
+
+function stopProcess(pidFile) {
+  if (!fs.existsSync(pidFile)) return;
+  try {
+    const content = fs.readFileSync(pidFile, 'utf-8').trim();
+    let meta;
+    try {
+      meta = JSON.parse(content);
+    } catch (_) {
+      const pid = Number(content);
+      meta = Number.isInteger(pid) && pid > 0 ? { pid } : null;
+    }
+    if (isPidStillOurs(meta)) {
+      process.kill(meta.pid);
+    }
+  } catch (err) {
+    // ignore stale pid or already terminated
+  }
+  try {
+    fs.unlinkSync(pidFile);
+  } catch (err) {
+    // ignore
+  }
+}
+
+function ensureDependencies(dir, checkFile) {
+  if (fs.existsSync(checkFile)) return;
+  const command = isWindows ? 'cmd.exe' : 'yarn';
+  const args = isWindows ? ['/c', 'yarn install --silent'] : ['install', '--silent'];
+  const result = spawnSync(command, args, {
+    cwd: dir,
+    stdio: 'inherit',
+    env: process.env,
+  });
+  if (result.status !== 0) {
+    throw new Error(`DBGM-00000 Failed to install dependencies in ${dir}`);
+  }
+}
+
+function startBackgroundProcess(dir, pidFile, port) {
+  const command = isWindows ? 'cmd.exe' : 'yarn';
+  const args = isWindows ? ['/c', 'yarn start'] : ['start'];
+  const child = spawn(command, args, {
+    cwd: dir,
+    env: { ...process.env, PORT: String(port) },
+    detached: true,
+    stdio: 'ignore',
+  });
+  child.unref();
+  fs.mkdirSync(path.dirname(pidFile), { recursive: true });
+  const meta = { pid: child.pid };
+  const startTime = readProcessStartTime(child.pid);
+  if (startTime) meta.startTime = startTime;
+  fs.writeFileSync(pidFile, JSON.stringify(meta));
+}
+
+async function waitForReady(url, timeoutMs = 30000) {
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < timeoutMs) {
+    try {
+      const response = await fetch(url);
+      if (response.ok) return;
+    } catch (err) {
+      // continue waiting
+    }
+    await delay(500);
+  }
+  throw new Error(`DBGM-00000 Server at ${url} did not start in time`);
+}
+
+// --- Main ---
+
+async function run() {
+  // 1. Set up MyChinook MySQL database
+  console.log('[ai-chat init] Setting up MyChinook database...');
+  await initMySqlDatabase('MyChinook', path.resolve(path.join(__dirname, '../data/chinook-mysql.sql')));
+
+  // 2. Start test-api (GraphQL/REST server on port 4444)
+  console.log('[ai-chat init] Starting test-api on port 4444...');
+  stopProcess(testApiPidFile);
+  ensureDependencies(testApiDir, path.join(testApiDir, 'node_modules', 'swagger-jsdoc', 'package.json'));
+  startBackgroundProcess(testApiDir, testApiPidFile, 4444);
+  await waitForReady('http://localhost:4444/openapi.json');
+  console.log('[ai-chat init] test-api is ready');
+
+  // 3. Start aigwmock (AI Gateway mock on port 3110)
+  console.log('[ai-chat init] Starting aigwmock on port 3110...');
+  stopProcess(aigwmockPidFile);
+  ensureDependencies(aigwmockDir, path.join(aigwmockDir, 'node_modules', 'express', 'package.json'));
+  startBackgroundProcess(aigwmockDir, aigwmockPidFile, 3110);
+  await waitForReady('http://localhost:3110/openrouter/v1/models');
+  console.log('[ai-chat init] aigwmock is ready');
+}
+
+run().catch(err => {
+  console.error(err);
+  process.exit(1);
+});
@@ -125,46 +125,6 @@ async function initMongoDatabase(dbname, inputDirectory) {
  // });
 }

-async function initRedisDatabase(inputDirectory) {
-  await dbgateApi.executeQuery({
-    connection: {
-      server: process.env.SERVER_redis,
-      user: process.env.USER_redis,
-      password: process.env.PASSWORD_redis,
-      port: process.env.PORT_redis,
-      engine: 'redis@dbgate-plugin-redis',
-    },
-    sql: 'FLUSHALL',
-  });
-
-  for (const file of fs.readdirSync(inputDirectory)) {
-    await dbgateApi.executeQuery({
-      connection: {
-        server: process.env.SERVER_redis,
-        user: process.env.USER_redis,
-        password: process.env.PASSWORD_redis,
-        port: process.env.PORT_redis,
-        engine: 'redis@dbgate-plugin-redis',
-        database: 0,
-      },
-      sqlFile: path.join(inputDirectory, file),
-      // logScriptItems: true,
-    });
-  }
-
-  // await dbgateApi.importDatabase({
-  //   connection: {
-  //     server: process.env.SERVER_postgres,
-  //     user: process.env.USER_postgres,
-  //     password: process.env.PASSWORD_postgres,
-  //     port: process.env.PORT_postgres,
-  //     database: dbname,
-  //     engine: 'postgres@dbgate-plugin-postgres',
-  //   },
-  //   inputFile,
-  // });
-}
-
 const baseDir = path.join(os.homedir(), '.dbgate');

 async function copyFolder(source, target) {
@@ -188,8 +148,6 @@ async function run() {
  await initMongoDatabase('MgChinook', path.resolve(path.join(__dirname, '../data/chinook-jsonl')));
  await initMongoDatabase('MgRivers', path.resolve(path.join(__dirname, '../data/rivers-jsonl')));

-  await initRedisDatabase(path.resolve(path.join(__dirname, '../data/redis')));
-
  await copyFolder(
    path.resolve(path.join(__dirname, '../data/chinook-jsonl')),
    path.join(baseDir, 'archive-e2etests', 'default')
@@ -90,6 +90,11 @@ async function run() {
    path.join(baseDir, 'files-e2etests', 'sql')
  );

+  await copyFolder(
+    path.resolve(path.join(__dirname, '../data/files/themes')),
+    path.join(baseDir, 'files-e2etests', 'themes')
+  );
+
  await initMySqlDatabase('MyChinook', path.resolve(path.join(__dirname, '../data/chinook-mysql.sql')));
 }

@@ -0,0 +1,55 @@
+const path = require('path');
+const fs = require('fs');
+
+const dbgateApi = require('dbgate-api');
+dbgateApi.initializeApiEnvironment();
+const dbgatePluginRedis = require('dbgate-plugin-redis');
+dbgateApi.registerPlugins(dbgatePluginRedis);
+
+async function initRedisDatabase() {
+  await dbgateApi.executeQuery({
+    connection: {
+      server: process.env.SERVER_redis,
+      user: process.env.USER_redis,
+      password: process.env.PASSWORD_redis,
+      port: process.env.PORT_redis,
+      engine: 'redis@dbgate-plugin-redis',
+    },
+    sql: 'FLUSHALL',
+  });
+
+  const files = [
+    {
+      file: path.resolve(__dirname, '../data/redis-db1.redis'),
+      database: 0,
+    },
+    {
+      file: path.resolve(__dirname, '../data/redis-db2.redis'),
+      database: 1,
+    },
+  ];
+
+  for (const { file, database } of files) {
+    await dbgateApi.executeQuery({
+      connection: {
+        server: process.env.SERVER_redis,
+        user: process.env.USER_redis,
+        password: process.env.PASSWORD_redis,
+        port: process.env.PORT_redis,
+        engine: 'redis@dbgate-plugin-redis',
+        database,
+      },
+      sqlFile: file,
+    });
+  }
+}
+
+async function run() {
+  await initRedisDatabase();
+}
+
+dbgateApi.runScript(run);
+
+module.exports = {
+  initRedisDatabase,
+};
@@ -0,0 +1,133 @@
+const fs = require('fs');
+const path = require('path');
+const { spawn, spawnSync } = require('child_process');
+
+const rootDir = path.resolve(__dirname, '..', '..');
+const testApiDir = path.join(rootDir, 'test-api');
+const pidFile = path.resolve(__dirname, '..', 'tmpdata', 'test-api.pid');
+const isWindows = process.platform === 'win32';
+
+function delay(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+async function waitForApiReady(timeoutMs = 30000) {
+  const startedAt = Date.now();
+
+  while (Date.now() - startedAt < timeoutMs) {
+    try {
+      const response = await fetch('http://localhost:4444/openapi.json');
+      if (response.ok) {
+        return;
+      }
+    } catch (err) {
+      // continue waiting
+    }
+
+    await delay(500);
+  }
+
+  throw new Error('DBGM-00000 test-api did not start on port 4444 in time');
+}
+
+function readProcessStartTime(pid) {
+  if (process.platform === 'linux') {
+    try {
+      const stat = fs.readFileSync(`/proc/${pid}/stat`, 'utf-8');
+      return stat.split(' ')[21] || null;
+    } catch (err) {
+      return null;
+    }
+  }
+  return null;
+}
+
+function isPidStillOurs(meta) {
+  if (!meta || !(meta.pid > 0)) return false;
+  if (process.platform === 'linux' && meta.startTime) {
+    const current = readProcessStartTime(meta.pid);
+    return current === meta.startTime;
+  }
+  return true;
+}
+
+function stopPreviousTestApi() {
+  if (!fs.existsSync(pidFile)) {
+    return;
+  }
+
+  try {
+    const content = fs.readFileSync(pidFile, 'utf-8').trim();
+    let meta;
+    try {
+      meta = JSON.parse(content);
+    } catch (_) {
+      const pid = Number(content);
+      meta = Number.isInteger(pid) && pid > 0 ? { pid } : null;
+    }
+    if (isPidStillOurs(meta)) {
+      process.kill(meta.pid);
+    }
+  } catch (err) {
+    // ignore stale pid file or already terminated process
+  }
+
+  try {
+    fs.unlinkSync(pidFile);
+  } catch (err) {
+    // ignore
+  }
+}
+
+function startTestApi() {
+  const command = isWindows ? 'cmd.exe' : 'yarn';
+  const args = isWindows ? ['/c', 'yarn start'] : ['start'];
+
+  const child = spawn(command, args, {
+    cwd: testApiDir,
+    env: {
+      ...process.env,
+      PORT: '4444',
+    },
+    detached: true,
+    stdio: 'ignore',
+  });
+
+  child.unref();
+  fs.mkdirSync(path.dirname(pidFile), { recursive: true });
+  const meta = { pid: child.pid };
+  const startTime = readProcessStartTime(child.pid);
+  if (startTime) meta.startTime = startTime;
+  fs.writeFileSync(pidFile, JSON.stringify(meta));
+}
+
+function ensureTestApiDependencies() {
+  const dependencyCheckFile = path.join(testApiDir, 'node_modules', 'swagger-jsdoc', 'package.json');
+  if (fs.existsSync(dependencyCheckFile)) {
+    return;
+  }
+
+  const installCommand = isWindows ? 'cmd.exe' : 'yarn';
+  const installArgs = isWindows ? ['/c', 'yarn install --silent'] : ['install', '--silent'];
+  const result = spawnSync(installCommand, installArgs, {
+    cwd: testApiDir,
+    stdio: 'inherit',
+    env: process.env,
+  });
+
+  if (result.status !== 0) {
+    throw new Error('DBGM-00000 Failed to install test-api dependencies');
+  }
+}
+
+async function run() {
+  stopPreviousTestApi();
+  ensureTestApiDependencies();
+  startTestApi();
+  await waitForApiReady();
+}
+
+run().catch(err => {
+  console.error(err);
+  process.exit(1);
+});
@@ -10,39 +10,45 @@
    "cypress-real-events": "^1.13.0",
    "env-cmd": "^10.1.0",
    "kill-port": "^2.0.1",
+    "mocha-reporter-gha": "^1.1.1",
    "start-server-and-test": "^2.0.8"
  },
  "scripts": {
    "cy:open": "cypress open --config experimentalInteractiveRunEvents=true",
-
    "cy:run:add-connection": "cypress run --spec cypress/e2e/add-connection.cy.js",
    "cy:run:portal": "cypress run --spec cypress/e2e/portal.cy.js",
    "cy:run:oauth": "cypress run --spec cypress/e2e/oauth.cy.js",
    "cy:run:browse-data": "cypress run --spec cypress/e2e/browse-data.cy.js",
+    "cy:run:rest": "cypress run --spec cypress/e2e/rest.cy.js",
    "cy:run:team": "cypress run --spec cypress/e2e/team.cy.js",
    "cy:run:multi-sql": "cypress run --spec cypress/e2e/multi-sql.cy.js",
    "cy:run:cloud": "cypress run --spec cypress/e2e/cloud.cy.js",
    "cy:run:charts": "cypress run --spec cypress/e2e/charts.cy.js",
-
+    "cy:run:redis": "cypress run --spec cypress/e2e/redis.cy.js",
+    "cy:run:ai-chat": "cypress run --spec cypress/e2e/ai-chat.cy.js",
    "start:add-connection": "node clearTestingData && cd .. && node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:portal": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/portal/.env node e2e-tests/init/portal.js && env-cmd -f e2e-tests/env/portal/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:oauth": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/oauth/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:browse-data": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/browse-data/.env node e2e-tests/init/browse-data.js && env-cmd -f e2e-tests/env/browse-data/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
+    "start:rest": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/rest/.env node e2e-tests/init/rest.js && env-cmd -f e2e-tests/env/rest/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:team": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/team/.env node e2e-tests/init/team.js && env-cmd -f e2e-tests/env/team/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:multi-sql": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/multi-sql/.env node e2e-tests/init/multi-sql.js && env-cmd -f e2e-tests/env/multi-sql/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:cloud": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/cloud/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "start:charts": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/charts/.env node e2e-tests/init/charts.js && env-cmd -f e2e-tests/env/charts/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
-
+    "start:redis": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/redis/.env node e2e-tests/init/redis.js && env-cmd -f e2e-tests/env/redis/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
+    "start:ai-chat": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/ai-chat/.env node e2e-tests/init/ai-chat.js && env-cmd -f e2e-tests/env/ai-chat/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
    "test:add-connection": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection",
    "test:portal": "start-server-and-test start:portal http://localhost:3000 cy:run:portal",
    "test:oauth": "start-server-and-test start:oauth http://localhost:3000 cy:run:oauth",
    "test:browse-data": "start-server-and-test start:browse-data http://localhost:3000 cy:run:browse-data",
+    "test:rest": "start-server-and-test start:rest http://localhost:3000 cy:run:rest",
    "test:team": "start-server-and-test start:team http://localhost:3000 cy:run:team",
    "test:multi-sql": "start-server-and-test start:multi-sql http://localhost:3000 cy:run:multi-sql",
    "test:cloud": "start-server-and-test start:cloud http://localhost:3000 cy:run:cloud",
    "test:charts": "start-server-and-test start:charts http://localhost:3000 cy:run:charts",
-
-    "test": "yarn test:add-connection && yarn test:portal && yarn test:oauth && yarn test:browse-data && yarn test:team && yarn test:multi-sql && yarn test:cloud && yarn test:charts",
+    "test:redis": "start-server-and-test start:redis http://localhost:3000 cy:run:redis",
+    "test:ai-chat": "start-server-and-test start:ai-chat http://localhost:3000 cy:run:ai-chat",
+    "test": "yarn test:add-connection && yarn test:portal && yarn test:oauth && yarn test:browse-data && yarn test:rest && yarn test:team && yarn test:multi-sql && yarn test:cloud && yarn test:charts && yarn test:redis && yarn test:ai-chat",
    "test:ci": "yarn test"
  },
  "dependencies": {}
@@ -0,0 +1,2 @@
+test-api.pid
+aigwmock.pid
@@ -2,6 +2,34 @@
 # yarn lockfile v1


+"@actions/core@^1.10.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.11.1.tgz#ae683aac5112438021588030efb53b1adb86f172"
+  integrity sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==
+  dependencies:
+    "@actions/exec" "^1.1.1"
+    "@actions/http-client" "^2.0.1"
+
+"@actions/exec@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.1.tgz#2e43f28c54022537172819a7cf886c844221a611"
+  integrity sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==
+  dependencies:
+    "@actions/io" "^1.0.1"
+
+"@actions/http-client@^2.0.1":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.2.3.tgz#31fc0b25c0e665754ed39a9f19a8611fc6dab674"
+  integrity sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==
+  dependencies:
+    tunnel "^0.0.6"
+    undici "^5.25.4"
+
+"@actions/io@^1.0.1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.3.tgz#4cdb6254da7962b07473ff5c335f3da485d94d71"
+  integrity sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==
+
 "@colors/colors@1.5.0":
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -39,6 +67,11 @@
    debug "^3.1.0"
    lodash.once "^4.1.1"

+"@fastify/busboy@^2.0.0":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
+  integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
+
 "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
  version "9.3.0"
  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
@@ -947,6 +980,13 @@ minimist@^1.2.8:
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==

+mocha-reporter-gha@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/mocha-reporter-gha/-/mocha-reporter-gha-1.1.1.tgz#e1248abd0769f55b57b36ccd7db2b0b6573d5adf"
+  integrity sha512-CFbcgM56V4yWlbF91XuwrE6a5X/IqjVXTPefO7m8cY8Es8G1UhJ2KKOrk16AcSemRzVWXp2Fdy3bWJ7j45snWw==
+  dependencies:
+    "@actions/core" "^1.10.1"
+
 ms@^2.1.1, ms@^2.1.3:
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -1292,6 +1332,11 @@ tunnel-agent@^0.6.0:
  dependencies:
    safe-buffer "^5.0.1"

+tunnel@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -1307,6 +1352,13 @@ undici-types@~6.20.0:
  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
  integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==

+undici@^5.25.4:
+  version "5.29.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3"
+  integrity sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==
+  dependencies:
+    "@fastify/busboy" "^2.0.0"
+
 universalify@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
@@ -26,13 +26,15 @@ function pickImportantTableInfo(engine, table) {
      .map(props =>
        _.omitBy(props, (v, k) => k == 'defaultValue' && v == 'NULL' && engine.setNullDefaultInsteadOfDrop)
      ),
-    // foreignKeys: table.foreignKeys
-    //   .sort((a, b) => a.refTableName.localeCompare(b.refTableName))
-    //   .map(fk => ({
-    //     constraintType: fk.constraintType,
-    //     refTableName: fk.refTableName,
-    //     columns: fk.columns.map(col => ({ columnName: col.columnName, refColumnName: col.refColumnName })),
-    //   })),
+
+      // TODO:
+    foreignKeys: table.foreignKeys
+      .sort((a, b) => a.refTableName.localeCompare(b.refTableName))
+      .map(fk => ({
+        constraintType: fk.constraintType,
+        refTableName: fk.refTableName,
+        columns: fk.columns.map(col => ({ columnName: col.columnName, refColumnName: col.refColumnName })),
+      })),
  };
 }

@@ -103,6 +105,7 @@ async function testTableDiff(engine, conn, driver, mangle, changedTable = 't1')

  await driver.script(conn, sql);

+  // TODO:
  // if (!engine.skipIncrementalAnalysis) {
  //   const structure2RealIncremental = await driver.analyseIncremental(conn, structure1Source);
  //   checkTableStructure(engine, tget(structure2RealIncremental), tget(structure2));
@@ -116,6 +119,7 @@ async function testTableDiff(engine, conn, driver, mangle, changedTable = 't1')

 const TESTED_COLUMNS = ['col_pk', 'col_std', 'col_def', 'col_fk', 'col_ref', 'col_idx', 'col_uq'];
 // const TESTED_COLUMNS = ['col_pk'];
+// const TESTED_COLUMNS = ['col_fk'];
 // const TESTED_COLUMNS = ['col_idx'];
 // const TESTED_COLUMNS = ['col_def'];
 // const TESTED_COLUMNS = ['col_std'];
@@ -179,11 +183,25 @@ describe('Alter table', () => {
  )(
    'Drop column - %s - %s',
    testWrapper(async (conn, driver, column, engine) => {
-      await testTableDiff(engine, conn, driver, tbl => (tbl.columns = tbl.columns.filter(x => x.columnName != column)));
+      await testTableDiff(engine, conn, driver, 
+        tbl => {
+          tbl.columns = tbl.columns.filter(x => x.columnName != column);
+          tbl.foreignKeys = tbl.foreignKeys
+            .map(fk => ({
+              ...fk, 
+              columns: fk.columns.filter(col => col.columnName != column)
+            }))
+            .filter(fk => fk.columns.length > 0);
+        }
+      );
    })
  );

-  test.each(createEnginesColumnsSource(engines.filter(x => !x.skipNullable && !x.skipChangeNullability)))(
+  test.each(
+    createEnginesColumnsSource(engines.filter(x => !x.skipNullability && !x.skipChangeNullability)).filter(
+      ([_label, col]) => !col.endsWith('_pk')
+    )
+  )(
    'Change nullability - %s - %s',
    testWrapper(async (conn, driver, column, engine) => {
      await testTableDiff(
@@ -202,7 +220,11 @@ describe('Alter table', () => {
        engine,
        conn,
        driver,
-        tbl => (tbl.columns = tbl.columns.map(x => (x.columnName == column ? { ...x, columnName: 'col_renamed' } : x)))
+        tbl => {
+          tbl.columns = tbl.columns.map(x => (x.columnName == column ? { ...x, columnName: 'col_renamed' } : x));
+          tbl.foreignKeys = tbl.foreignKeys.map(fk => ({...fk, columns: fk.columns.map(col => col.columnName == column ? { ...col, columnName: 'col_renamed' } : col)
+          }));
+        }
      );
    })
  );
@@ -303,4 +303,52 @@ describe('Data replicator', () => {
    }),
    15 * 1000
  );
+
+  test.each(engines.filter(x => !x.skipDataReplicator).map(engine => [engine.label, engine]))(
+    'Skip columns for update - %s',
+    testWrapper(async (conn, driver, engine) => {
+      runCommandOnDriver(conn, driver, dmp =>
+        dmp.createTable({
+          pureName: 't1',
+          columns: [
+            { columnName: 'id', dataType: 'int', autoIncrement: true, notNull: true },
+            { columnName: 'key', dataType: 'varchar(50)', notNull: true },
+            { columnName: 'val', dataType: 'varchar(50)' },
+          ],
+          primaryKey: {
+            columns: [{ columnName: 'id' }],
+          },
+        })
+      );
+
+      const getcfg = (v1 = 'v1') => ({
+        systemConnection: conn,
+        driver,
+        items: [
+          {
+            name: 't1',
+            matchColumns: ['key'],
+            skipUpdateColumns: ['val'],
+            findExisting: true,
+            updateExisting: true,
+            createNew: true,
+            jsonArray: [
+              { key: '1', val: v1 },
+              { key: '2', val: 'v2' },
+              { key: '3', val: 'v3' },
+            ],
+          },
+        ],
+      });
+
+      await dataReplicator(getcfg('v1'));
+
+      const res1 = await runQueryOnDriver(conn, driver, dmp => dmp.put(`select ~val from ~t1 where ~key='1'`));
+      expect(res1.rows[0].val).toEqual('v1');
+
+      await dataReplicator(getcfg('v2'));
+      const res2 = await runQueryOnDriver(conn, driver, dmp => dmp.put(`select ~val from ~t1 where ~key='1'`));
+      expect(res2.rows[0].val).toEqual('v1');
+    })
+  );
 });
@@ -28,12 +28,12 @@ describe('Schema tests', () => {
      const count = schemas1.length;
      expect(structure1.tables.length).toEqual(2);
      await runCommandOnDriver(conn, driver, dmp => dmp.createSchema('myschema'));
+      const structure2 = await driver.analyseIncremental(conn, structure1);
+      const schemas2 = await driver.listSchemas(conn);
+      expect(schemas2.find(x => x.schemaName == 'myschema')).toBeTruthy();
+      expect(schemas2.length).toEqual(count + 1);
+      expect(schemas2.find(x => x.isDefault).schemaName).toEqual(engine.defaultSchemaName);
      if (!engine.skipIncrementalAnalysis) {
-        const structure2 = await driver.analyseIncremental(conn, structure1);
-        const schemas2 = await driver.listSchemas(conn);
-        expect(schemas2.find(x => x.schemaName == 'myschema')).toBeTruthy();
-        expect(schemas2.length).toEqual(count + 1);
-        expect(schemas2.find(x => x.isDefault).schemaName).toEqual(engine.defaultSchemaName);
        expect(structure2).toBeNull();
      }
    })
@@ -50,10 +50,10 @@ describe('Schema tests', () => {
      expect(schemas1.find(x => x.schemaName == 'myschema')).toBeTruthy();
      expect(structure1.tables.length).toEqual(2);
      await runCommandOnDriver(conn, driver, dmp => dmp.dropSchema('myschema'));
+      const structure2 = await driver.analyseIncremental(conn, structure1);
+      const schemas2 = await driver.listSchemas(conn);
+      expect(schemas2.find(x => x.schemaName == 'myschema')).toBeFalsy();
      if (!engine.skipIncrementalAnalysis) {
-        const structure2 = await driver.analyseIncremental(conn, structure1);
-        const schemas2 = await driver.listSchemas(conn);
-        expect(schemas2.find(x => x.schemaName == 'myschema')).toBeFalsy();
        expect(structure2).toBeNull();
      }
    })
@@ -94,7 +94,7 @@ describe('Table analyse', () => {
    })
  );

-  test.each(engines.filter(x => !x.skipIncrementalAnalysis).map(engine => [engine.label, engine]))(
+  test.each(engines.map(engine => [engine.label, engine]))(
    'Table add - incremental analysis - %s',
    testWrapper(async (conn, driver, engine) => {
      await runCommandOnDriver(conn, driver, dmp => dmp.put(t2Sql(engine)));
@@ -112,7 +112,7 @@ describe('Table analyse', () => {
    })
  );

-  test.each(engines.filter(x => !x.skipIncrementalAnalysis).map(engine => [engine.label, engine]))(
+  test.each(engines.map(engine => [engine.label, engine]))(
    'Table remove - incremental analysis - %s',
    testWrapper(async (conn, driver, engine) => {
      await runCommandOnDriver(conn, driver, dmp => dmp.put(t1Sql(engine)));
@@ -130,7 +130,7 @@ describe('Table analyse', () => {
    })
  );

-  test.each(engines.filter(x => !x.skipIncrementalAnalysis).map(engine => [engine.label, engine]))(
+  test.each(engines.map(engine => [engine.label, engine]))(
    'Table change - incremental analysis - %s',
    testWrapper(async (conn, driver, engine) => {
      await runCommandOnDriver(conn, driver, dmp => dmp.put(t1Sql(engine)));
@@ -44,7 +44,7 @@ services:
  #     - 15942:9042
  #
  # clickhouse:
-  #   image: bitnami/clickhouse:24.8.4
+  #   image: bitnamilegacy/clickhouse:24.8.4
  #   restart: always
  #   ports:
  #     - 15005:8123
@@ -1,7 +1,7 @@
 {
  "name": "dbgate-integration-tests",
-  "version": "6.0.0-alpha.1",
-  "homepage": "https://dbgate.org/",
+  "version": "7.0.0-alpha.1",
+  "homepage": "https://www.dbgate.io/",
  "repository": {
    "type": "git",
    "url": "https://github.com/dbgate/dbgate.git"
@@ -1,6 +1,7 @@
 global.DBGATE_PACKAGES = {
  'dbgate-tools': require('dbgate-tools'),
  'dbgate-sqltree': require('dbgate-sqltree'),
+  'dbgate-datalib': require('dbgate-datalib'),
 };

 const { prettyFactory } = require('pino-pretty');
@@ -22,7 +22,9 @@ async function connect(engine, database) {
  if (engine.generateDbFile) {
    const conn = await driver.connect({
      ...connection,
-      databaseFile: (engine.databaseFileLocationOnServer ?? 'dbtemp/') + database,
+      databaseFile:
+        (engine.databaseFileLocationOnServer ?? (process.env.CITEST ? 'dbtemp/' : 'integration-tests/dbtemp/')) +
+        database,
    });
    return conn;
  } else {
@@ -3,6 +3,7 @@ const engines = require('./engines');
 global.DBGATE_PACKAGES = {
  'dbgate-tools': require('dbgate-tools'),
  'dbgate-sqltree': require('dbgate-sqltree'),
+  'dbgate-datalib': require('dbgate-datalib'),
 };

 async function connectEngine(engine) {
@@ -1,6 +1,6 @@
 {
  "private": true,
-  "version": "6.7.2-premium-beta.4",
+  "version": "7.1.2",
  "name": "dbgate-all",
  "workspaces": [
    "packages/*",
@@ -22,6 +22,7 @@
    "start:api:auth": "yarn workspace dbgate-api start:auth | pino-pretty",
    "start:api:dblogin": "yarn workspace dbgate-api start:dblogin | pino-pretty",
    "start:api:storage": "yarn workspace dbgate-api start:storage | pino-pretty",
+    "start:api:sfill": "yarn workspace dbgate-api start:sfill | pino-pretty",
    "start:api:storage:built": "yarn workspace dbgate-api start:storage:built | pino-pretty",
    "start:api:azure": "yarn workspace dbgate-api start:azure | pino-pretty",
    "start:api:e2e:team": "yarn workspace dbgate-api start:e2e:team | pino-pretty",
@@ -29,13 +30,15 @@
    "start:web": "yarn workspace dbgate-web dev",
    "start:sqltree": "yarn workspace dbgate-sqltree start",
    "start:tools": "yarn workspace dbgate-tools start",
+    "start:rest": "yarn workspace dbgate-rest start",
    "start:datalib": "yarn workspace dbgate-datalib start",
    "start:filterparser": "yarn workspace dbgate-filterparser start",
    "build:sqltree": "yarn workspace dbgate-sqltree build",
    "build:datalib": "yarn workspace dbgate-datalib build",
    "build:filterparser": "yarn workspace dbgate-filterparser build",
    "build:tools": "yarn workspace dbgate-tools build",
-    "build:lib": "yarn build:sqltree && yarn build:tools && yarn build:filterparser && yarn build:datalib",
+    "build:rest": "yarn workspace dbgate-rest build",
+    "build:lib": "yarn build:sqltree && yarn build:tools && yarn build:filterparser && yarn build:datalib && yarn build:rest",
    "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build",
    "build:api": "yarn workspace dbgate-api build",
    "build:api:doc": "yarn workspace dbgate-api build:doc",
@@ -62,7 +65,7 @@
    "prepare:packer": "yarn plugins:copydist && yarn build:web && yarn build:api && yarn copy:packer:build",
    "build:e2e": "yarn build:lib && yarn prepare:packer",
    "start": "concurrently --kill-others-on-fail \"yarn start:api\" \"yarn start:web\"",
-    "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\" \"yarn build:plugins:frontend:watch\"",
+    "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\" \"yarn start:rest\" \"yarn build:plugins:frontend:watch\"",
    "ts:api": "yarn workspace dbgate-api ts",
    "ts:web": "yarn workspace dbgate-web ts",
    "ts": "yarn ts:api && yarn ts:web",
@@ -0,0 +1,14 @@
+{
+  "name": "dbgate-aigwmock",
+  "version": "1.0.0",
+  "description": "Mock AI Gateway server for E2E testing",
+  "main": "src/index.js",
+  "scripts": {
+    "start": "node src/index.js"
+  },
+  "license": "GPL-3.0",
+  "dependencies": {
+    "cors": "^2.8.6",
+    "express": "^5.2.1"
+  }
+}
@@ -0,0 +1,202 @@
+const express = require('express');
+const cors = require('cors');
+const fs = require('fs');
+const path = require('path');
+
+const app = express();
+app.use(cors());
+app.use(express.json({ limit: '50mb' }));
+
+const responses = JSON.parse(fs.readFileSync(path.join(__dirname, 'mockResponses.json'), 'utf-8'));
+
+let callCounter = 0;
+
+// GET /openrouter/v1/models
+app.get('/openrouter/v1/models', (req, res) => {
+  res.json({
+    data: [{ id: 'mock-model', name: 'Mock Model' }],
+    preferredModel: 'mock-model',
+  });
+});
+
+// POST /openrouter/v1/chat/completions
+app.post('/openrouter/v1/chat/completions', (req, res) => {
+  const messages = req.body.messages || [];
+
+  // Find the first user message (skip system messages)
+  const userMessage = messages.find(m => m.role === 'user');
+  if (!userMessage) {
+    return streamTextResponse(res, "I don't have enough context to help. Please ask a question.");
+  }
+
+  // Count assistant messages to determine the current step
+  const assistantCount = messages.filter(m => m.role === 'assistant').length;
+
+  // Find matching scenario by regex
+  const scenario = responses.scenarios.find(s => {
+    const regex = new RegExp(s.match, 'i');
+    return regex.test(userMessage.content);
+  });
+
+  if (!scenario) {
+    console.log(`[aigwmock] No scenario matched for: "${userMessage.content}"`);
+    return streamTextResponse(res, "I'm a mock AI assistant. I don't have a prepared response for that question.");
+  }
+
+  const step = scenario.steps[assistantCount];
+  if (!step) {
+    console.log(`[aigwmock] No more steps for scenario (step ${assistantCount})`);
+    return streamTextResponse(res, "I've completed my analysis of this topic.");
+  }
+
+  console.log(`[aigwmock] Scenario matched: "${scenario.match}", step ${assistantCount}, type: ${step.type}`);
+
+  if (step.type === 'tool_calls') {
+    return streamToolCallResponse(res, step.tool_calls);
+  } else {
+    return streamTextResponse(res, step.content);
+  }
+});
+
+function streamTextResponse(res, content) {
+  res.writeHead(200, {
+    'Content-Type': 'text/event-stream',
+    'Cache-Control': 'no-cache',
+    Connection: 'keep-alive',
+  });
+
+  const id = `chatcmpl-mock-${Date.now()}`;
+  const created = Math.floor(Date.now() / 1000);
+
+  // Split content into chunks for realistic streaming
+  const chunkSize = 20;
+  const chunks = [];
+  for (let i = 0; i < content.length; i += chunkSize) {
+    chunks.push(content.substring(i, i + chunkSize));
+  }
+
+  // Send initial role chunk
+  writeSSE(res, {
+    id,
+    object: 'chat.completion.chunk',
+    created,
+    model: 'mock-model',
+    choices: [{ index: 0, delta: { role: 'assistant', content: '' }, finish_reason: null }],
+  });
+
+  // Send content chunks
+  for (const chunk of chunks) {
+    writeSSE(res, {
+      id,
+      object: 'chat.completion.chunk',
+      created,
+      model: 'mock-model',
+      choices: [{ index: 0, delta: { content: chunk }, finish_reason: null }],
+    });
+  }
+
+  // Send finish
+  writeSSE(res, {
+    id,
+    object: 'chat.completion.chunk',
+    created,
+    model: 'mock-model',
+    choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
+  });
+
+  res.write('data: [DONE]\n\n');
+  res.end();
+}
+
+function streamToolCallResponse(res, toolCalls) {
+  res.writeHead(200, {
+    'Content-Type': 'text/event-stream',
+    'Cache-Control': 'no-cache',
+    Connection: 'keep-alive',
+  });
+
+  const id = `chatcmpl-mock-${Date.now()}`;
+  const created = Math.floor(Date.now() / 1000);
+
+  for (let i = 0; i < toolCalls.length; i++) {
+    const tc = toolCalls[i];
+    const callId = `call_mock_${++callCounter}`;
+    const args = JSON.stringify(tc.arguments);
+
+    if (i === 0) {
+      // First tool call: include role
+      writeSSE(res, {
+        id,
+        object: 'chat.completion.chunk',
+        created,
+        model: 'mock-model',
+        choices: [
+          {
+            index: 0,
+            delta: {
+              role: 'assistant',
+              content: null,
+              tool_calls: [{ index: i, id: callId, type: 'function', function: { name: tc.name, arguments: '' } }],
+            },
+            finish_reason: null,
+          },
+        ],
+      });
+    } else {
+      // Additional tool calls
+      writeSSE(res, {
+        id,
+        object: 'chat.completion.chunk',
+        created,
+        model: 'mock-model',
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [{ index: i, id: callId, type: 'function', function: { name: tc.name, arguments: '' } }],
+            },
+            finish_reason: null,
+          },
+        ],
+      });
+    }
+
+    // Stream the arguments
+    writeSSE(res, {
+      id,
+      object: 'chat.completion.chunk',
+      created,
+      model: 'mock-model',
+      choices: [
+        {
+          index: 0,
+          delta: {
+            tool_calls: [{ index: i, function: { arguments: args } }],
+          },
+          finish_reason: null,
+        },
+      ],
+    });
+  }
+
+  // Send finish with tool_calls reason
+  writeSSE(res, {
+    id,
+    object: 'chat.completion.chunk',
+    created,
+    model: 'mock-model',
+    choices: [{ index: 0, delta: {}, finish_reason: 'tool_calls' }],
+  });
+
+  res.write('data: [DONE]\n\n');
+  res.end();
+}
+
+function writeSSE(res, data) {
+  res.write(`data: ${JSON.stringify(data)}\n\n`);
+}
+
+const port = process.env.PORT || 3110;
+app.listen(port, () => {
+  console.log(`[aigwmock] AI Gateway mock server listening on port ${port}`);
+});
@@ -0,0 +1,193 @@
+{
+  "scenarios": [
+    {
+      "match": "chart.*popular.*genre|popular.*genre.*chart|most popular genre",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "get_table_schema", "arguments": { "table": "Genre" } }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "get_table_schema", "arguments": { "table": "Track" } }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            {
+              "name": "execute_sql_select",
+              "arguments": {
+                "sql": "SELECT g.Name AS genre, COUNT(t.TrackId) AS track_count FROM Genre g JOIN Track t ON g.GenreId = t.GenreId GROUP BY g.Name ORDER BY track_count DESC LIMIT 10"
+              }
+            }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "Here is a chart showing the most popular genres by track count:\n\n```chart\n{\"type\":\"bar\",\"data\":{\"labels\":[\"Rock\",\"Latin\",\"Metal\",\"Alternative & Punk\",\"Jazz\",\"Blues\",\"Classical\",\"R&B/Soul\",\"Reggae\",\"Pop\"],\"datasets\":[{\"label\":\"Track Count\",\"data\":[1297,579,374,332,130,81,74,61,58,48]}]},\"options\":{\"plugins\":{\"title\":{\"display\":true,\"text\":\"Most Popular Genres by Track Count\"}}}}\n```"
+        }
+      ]
+    },
+    {
+      "match": "most popular artist|popular artist|top artist",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "get_table_schema", "arguments": { "table": "Artist" } }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "get_table_schema", "arguments": { "table": "Album" } }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "get_table_schema", "arguments": { "table": "Track" } }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            {
+              "name": "execute_sql_select",
+              "arguments": {
+                "sql": "SELECT ar.Name AS artist, COUNT(t.TrackId) AS track_count FROM Artist ar JOIN Album al ON ar.ArtistId = al.ArtistId JOIN Track t ON al.AlbumId = t.AlbumId GROUP BY ar.Name ORDER BY track_count DESC LIMIT 10"
+              }
+            }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "The most popular artist by number of tracks is **Iron Maiden** with 213 tracks, followed by **U2** with 135 tracks and **Led Zeppelin** with 114 tracks."
+        }
+      ]
+    },
+    {
+      "match": "list.*user|show.*user|get.*user",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "graphql_introspect_schema", "arguments": {} }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            {
+              "name": "execute_graphql_query",
+              "arguments": {
+                "query": "{ users { id firstName lastName email } }"
+              }
+            }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "Here are the users from the GraphQL API. The system contains multiple registered users with their names and email addresses."
+        }
+      ]
+    },
+    {
+      "match": "chart.*product.*categor|product.*categor.*chart|chart.*categor",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "graphql_introspect_schema", "arguments": {} }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            {
+              "name": "execute_graphql_query",
+              "arguments": {
+                "query": "{ products { category } }"
+              }
+            }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "Here is a bar chart showing the distribution of products across categories:\n\n```chart\n{\"type\":\"bar\",\"data\":{\"labels\":[\"Electronics\",\"Clothing\",\"Books\",\"Home & Garden\",\"Sports\",\"Toys\"],\"datasets\":[{\"label\":\"Number of Products\",\"data\":[35,30,33,38,32,32]}]},\"options\":{\"plugins\":{\"title\":{\"display\":true,\"text\":\"Products by Category\"}}}}\n```"
+        }
+      ]
+    },
+    {
+      "match": "most expensive product|expensive.*product|highest price",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "graphql_introspect_schema", "arguments": {} }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            {
+              "name": "execute_graphql_query",
+              "arguments": {
+                "query": "{ products { id name price category } }"
+              }
+            }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "Based on the query results, I found the most expensive product in the system. The product details are shown in the query results above."
+        }
+      ]
+    },
+    {
+      "match": "show.*categor|list.*categor|all.*categor",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "graphql_introspect_schema", "arguments": {} }
+          ]
+        },
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            {
+              "name": "execute_graphql_query",
+              "arguments": {
+                "query": "{ categories { id name description active } }"
+              }
+            }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "Here are all the categories available in the system. Each category has a name, description, and active status indicating whether it is currently in use."
+        }
+      ]
+    },
+    {
+      "match": "Explain the following error|doesn't exist|does not exist",
+      "steps": [
+        {
+          "type": "tool_calls",
+          "tool_calls": [
+            { "name": "get_table_schema", "arguments": { "table": "Invoice" } }
+          ]
+        },
+        {
+          "type": "text",
+          "content": "The error occurs because the table `Invoice2` does not exist in the `MyChinook` database. The correct table name is `Invoice`. Here is the corrected query:\n\n```sql\nSELECT * FROM Invoice\n```\n\nThe table name had a typo — `Invoice2` instead of `Invoice`. The `Invoice` table contains columns like `InvoiceId`, `CustomerId`, `InvoiceDate`, `Total`, and billing address fields."
+        }
+      ]
+    }
+  ]
+}
@@ -1,6 +1,7 @@
 DEVMODE=1
+DEVWEB=1

-CONNECTIONS=mysql,postgres,mongo,redis,mssql,oracle
+CONNECTIONS=mysql,postgres,mongo,redis,mssql,oracle,mongourl

 LABEL_mysql=MySql
 SERVER_mysql=dbgatedckstage1.sprinx.cz
@@ -43,6 +44,10 @@ PORT_oracle=1521
 ENGINE_oracle=oracle@dbgate-plugin-oracle
 SERVICE_NAME_oracle=xe

+LABEL_mongourl=Mongo URL
+URL_mongourl=mongodb://root:Pwd2020Db@dbgatedckstage1.sprinx.cz:27017
+ENGINE_mongourl=mongo@dbgate-plugin-mongo
+
 # SETTINGS_dataGrid.showHintColumns=1

 # docker run -p 3000:3000 -e CONNECTIONS=mongo -e URL_mongo=mongodb://localhost:27017 -e ENGINE_mongo=mongo@dbgate-plugin-mongo -e LABEL_mongo=mongo dbgate/dbgate:beta
@@ -0,0 +1,54 @@
+DEVMODE=1
+DEVWEB=1 
+
+# STORAGE_SERVER=localhost
+# STORAGE_USER=root
+# STORAGE_PASSWORD=Pwd2020Db
+# STORAGE_PORT=3306
+# STORAGE_DATABASE=dbgate-filled
+# STORAGE_ENGINE=mysql@dbgate-plugin-mysql
+
+STORAGE_SERVER=localhost
+STORAGE_USER=postgres
+STORAGE_PASSWORD=Pwd2020Db
+STORAGE_PORT=5432
+STORAGE_DATABASE=dbgate_sfill
+STORAGE_ENGINE=postgres@dbgate-plugin-postgres
+
+
+CONNECTIONS=mysql,postgres,mongo,redis
+
+LABEL_mysql=MySql
+SERVER_mysql=dbgatedckstage1.sprinx.cz
+USER_mysql=root
+PASSWORD_mysql=Pwd2020Db
+PORT_mysql=3306
+ENGINE_mysql=mysql@dbgate-plugin-mysql
+
+LABEL_postgres=Postgres
+SERVER_postgres=dbgatedckstage1.sprinx.cz
+USER_postgres=postgres
+PASSWORD_postgres=Pwd2020Db
+PORT_postgres=5432
+ENGINE_postgres=postgres@dbgate-plugin-postgres
+
+LABEL_mongo=Mongo
+SERVER_mongo=dbgatedckstage1.sprinx.cz
+USER_mongo=root
+PASSWORD_mongo=Pwd2020Db
+PORT_mongo=27017
+ENGINE_mongo=mongo@dbgate-plugin-mongo
+
+LABEL_redis=Redis
+SERVER_redis=dbgatedckstage1.sprinx.cz
+ENGINE_redis=redis@dbgate-plugin-redis
+PORT_redis=6379
+
+ROLE_test1_CONNECTIONS=mysql
+ROLE_test1_PERMISSIONS=widgets/*
+ROLE_test1_DATABASES_db1_CONNECTION=mysql
+ROLE_test1_DATABASES_db1_PERMISSION=run_script
+ROLE_test1_DATABASES_db1_DATABASES=db1
+ROLE_test1_DATABASES_db2_CONNECTION=redis
+ROLE_test1_DATABASES_db2_PERMISSION=run_script
+ROLE_test1_DATABASES_db2_DATABASES=db2 
@@ -1,8 +1,8 @@
 {
  "name": "dbgate-api",
  "main": "src/index.js",
-  "version": "6.0.0-alpha.1",
-  "homepage": "https://dbgate.org/",
+  "version": "7.0.0-alpha.1",
+  "homepage": "https://www.dbgate.io/",
  "repository": {
    "type": "git",
    "url": "https://github.com/dbgate/dbgate.git"
@@ -24,16 +24,17 @@
    "activedirectory2": "^2.1.0",
    "archiver": "^7.0.1",
    "async-lock": "^1.2.6",
-    "axios": "^0.21.1",
+    "axios": "^1.13.2",
    "body-parser": "^1.19.0",
    "byline": "^5.0.0",
    "compare-versions": "^3.6.0",
    "cors": "^2.8.5",
    "cross-env": "^6.0.3",
-    "dbgate-datalib": "^6.0.0-alpha.1",
-    "dbgate-query-splitter": "^4.11.9",
-    "dbgate-sqltree": "^6.0.0-alpha.1",
-    "dbgate-tools": "^6.0.0-alpha.1",
+    "dbgate-datalib": "^7.0.0-alpha.1",
+    "dbgate-query-splitter": "^4.12.0",
+    "dbgate-rest": "^7.0.0-alpha.1",
+    "dbgate-sqltree": "^7.0.0-alpha.1",
+    "dbgate-tools": "^7.0.0-alpha.1",
    "debug": "^4.3.4",
    "diff": "^5.0.0",
    "diff2html": "^3.4.13",
@@ -75,6 +76,7 @@
    "start:dblogin": "env-cmd -f env/dblogin/.env node src/index.js --listen-api",
    "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db --listen-api",
    "start:storage": "env-cmd -f env/storage/.env node src/index.js --listen-api",
+    "start:sfill": "env-cmd -f env/sfill/.env node src/index.js --listen-api",
    "start:storage:built": "env-cmd -f env/storage/.env cross-env DEVMODE= BUILTWEBMODE=1 node dist/bundle.js --listen-api",
    "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test --listen-api",
    "start:azure": "env-cmd -f env/azure/.env node src/index.js --listen-api",
@@ -86,7 +88,7 @@
  "devDependencies": {
    "@types/fs-extra": "^9.0.11",
    "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.0.0-alpha.1",
+    "dbgate-types": "^7.0.0-alpha.1",
    "env-cmd": "^10.1.0",
    "jsdoc-to-markdown": "^9.0.5",
    "node-loader": "^1.0.2",
@@ -55,6 +55,8 @@ function authMiddleware(req, res, next) {
    '/stream',
    '/storage/get-connections-for-login-page',
    '/storage/set-admin-password',
+    '/storage/request-password-reset',
+    '/storage/reset-password',
    '/auth/get-providers',
    '/connections/dblogin-web',
    '/connections/dblogin-app',
@@ -289,16 +289,11 @@ module.exports = {
    const res = await lock.acquire('settings', async () => {
      const currentValue = await this.loadSettings();
      try {
-        let updated = currentValue;
+        let updated = {
+          ...currentValue,
+          ...values,
+        };
        if (process.env.STORAGE_DATABASE) {
-          updated = {
-            ...currentValue,
-            ..._.mapValues(values, v => {
-              if (v === true) return 'true';
-              if (v === false) return 'false';
-              return v;
-            }),
-          };
          await storage.writeConfig({
            group: 'settings',
            config: updated,
@@ -23,10 +23,13 @@ const pipeForkLogs = require('../utility/pipeForkLogs');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const { getAuthProviderById } = require('../auth/authProvider');
 const { startTokenChecking } = require('../utility/authProxy');
+const { extractConnectionsFromEnv } = require('../utility/envtools');
+const { MissingCredentialsError } = require('../utility/exceptions');

 const logger = getLogger('connections');

 let volatileConnections = {};
+let pendingTestSubprocesses = {}; // Map of conid -> subprocess for MS Entra auth flows

 function getNamedArgs() {
  const res = {};
@@ -61,55 +64,7 @@ function getDatabaseFileLabel(databaseFile) {

 function getPortalCollections() {
  if (process.env.CONNECTIONS) {
-    const connections = _.compact(process.env.CONNECTIONS.split(',')).map(id => ({
-      _id: id,
-      engine: process.env[`ENGINE_${id}`],
-      server: process.env[`SERVER_${id}`],
-      user: process.env[`USER_${id}`],
-      password: process.env[`PASSWORD_${id}`],
-      passwordMode: process.env[`PASSWORD_MODE_${id}`],
-      port: process.env[`PORT_${id}`],
-      databaseUrl: process.env[`URL_${id}`],
-      useDatabaseUrl: !!process.env[`URL_${id}`],
-      databaseFile: process.env[`FILE_${id}`]?.replace(
-        '%%E2E_TEST_DATA_DIRECTORY%%',
-        path.join(path.dirname(path.dirname(__dirname)), 'e2e-tests', 'tmpdata')
-      ),
-      socketPath: process.env[`SOCKET_PATH_${id}`],
-      serviceName: process.env[`SERVICE_NAME_${id}`],
-      authType: process.env[`AUTH_TYPE_${id}`] || (process.env[`SOCKET_PATH_${id}`] ? 'socket' : undefined),
-      defaultDatabase:
-        process.env[`DATABASE_${id}`] ||
-        (process.env[`FILE_${id}`] ? getDatabaseFileLabel(process.env[`FILE_${id}`]) : null),
-      singleDatabase: !!process.env[`DATABASE_${id}`] || !!process.env[`FILE_${id}`],
-      displayName: process.env[`LABEL_${id}`],
-      isReadOnly: process.env[`READONLY_${id}`],
-      databases: process.env[`DBCONFIG_${id}`] ? safeJsonParse(process.env[`DBCONFIG_${id}`]) : null,
-      allowedDatabases: process.env[`ALLOWED_DATABASES_${id}`]?.replace(/\|/g, '\n'),
-      allowedDatabasesRegex: process.env[`ALLOWED_DATABASES_REGEX_${id}`],
-      parent: process.env[`PARENT_${id}`] || undefined,
-      useSeparateSchemas: !!process.env[`USE_SEPARATE_SCHEMAS_${id}`],
-      localDataCenter: process.env[`LOCAL_DATA_CENTER_${id}`],
-
-      // SSH tunnel
-      useSshTunnel: process.env[`USE_SSH_${id}`],
-      sshHost: process.env[`SSH_HOST_${id}`],
-      sshPort: process.env[`SSH_PORT_${id}`],
-      sshMode: process.env[`SSH_MODE_${id}`],
-      sshLogin: process.env[`SSH_LOGIN_${id}`],
-      sshPassword: process.env[`SSH_PASSWORD_${id}`],
-      sshKeyfile: process.env[`SSH_KEY_FILE_${id}`],
-      sshKeyfilePassword: process.env[`SSH_KEY_FILE_PASSWORD_${id}`],
-
-      // SSL
-      useSsl: process.env[`USE_SSL_${id}`],
-      sslCaFile: process.env[`SSL_CA_FILE_${id}`],
-      sslCertFile: process.env[`SSL_CERT_FILE_${id}`],
-      sslCertFilePassword: process.env[`SSL_CERT_FILE_PASSWORD_${id}`],
-      sslKeyFile: process.env[`SSL_KEY_FILE_${id}`],
-      sslRejectUnauthorized: process.env[`SSL_REJECT_UNAUTHORIZED_${id}`],
-      trustServerCertificate: process.env[`SSL_TRUST_CERTIFICATE_${id}`],
-    }));
+    const connections = extractConnectionsFromEnv(process.env);

    for (const conn of connections) {
      for (const prop in process.env) {
@@ -229,6 +184,15 @@ module.exports = {
      );
    }
    await this.checkUnsavedConnectionsLimit();
+
+    if (process.env.STORAGE_DATABASE && process.env.CONNECTIONS) {
+      const storage = require('./storage');
+      try {
+        await storage.fillStorageConnectionsFromEnv();
+      } catch (err) {
+        logger.error(extractErrorLogData(err), 'DBGM-00268 Error filling storage connections from env');
+      }
+    }
  },

  list_meta: true,
@@ -238,10 +202,10 @@ module.exports = {

    const storageConnections = await storage.connections(req);
    if (storageConnections) {
-      return storageConnections;
+      return storageConnections.map(maskConnection);
    }
    if (portalConnections) {
-      if (platformInfo.allowShellConnection) return portalConnections;
+      if (platformInfo.allowShellConnection) return portalConnections.map(x => encryptConnection(x));
      return portalConnections.map(maskConnection).filter(x => connectionHasPermission(x, loadedPermissions));
    }
    return (await this.datastore.find()).filter(x => connectionHasPermission(x, loadedPermissions));
@@ -277,14 +241,60 @@ module.exports = {
    );
    pipeForkLogs(subprocess);
    subprocess.send({ ...connection, requestDbList });
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
+      let isWaitingForVolatile = false;
+
+      const cleanup = () => {
+        if (connection._id && pendingTestSubprocesses[connection._id]) {
+          delete pendingTestSubprocesses[connection._id];
+        }
+      };
+
      subprocess.on('message', resp => {
        if (handleProcessCommunication(resp, subprocess)) return;
        // @ts-ignore
-        const { msgtype } = resp;
+        const { msgtype, missingCredentialsDetail } = resp;
        if (msgtype == 'connected' || msgtype == 'error') {
+          cleanup();
          resolve(resp);
        }
+        if (msgtype == 'missingCredentials') {
+          if (missingCredentialsDetail?.redirectToDbLogin) {
+            // Store the subprocess for later when volatile connection is ready
+            isWaitingForVolatile = true;
+            pendingTestSubprocesses[connection._id] = {
+              subprocess,
+              requestDbList,
+            };
+            // Return immediately with redirectToDbLogin status in the old format
+            resolve({
+              missingCredentials: true,
+              detail: {
+                ...missingCredentialsDetail,
+                keepErrorResponseFromApi: true,
+              },
+            });
+            return;
+          }
+          reject(new MissingCredentialsError(missingCredentialsDetail));
+        }
+      });
+
+      subprocess.on('exit', code => {
+        // If exit happens while waiting for volatile, that's expected
+        if (isWaitingForVolatile && code === 0) {
+          cleanup();
+          return;
+        }
+        cleanup();
+        if (code !== 0) {
+          reject(new Error(`Test subprocess exited with code ${code}`));
+        }
+      });
+
+      subprocess.on('error', err => {
+        cleanup();
+        reject(err);
      });
    });
  },
@@ -317,6 +327,38 @@ module.exports = {
      return testRes;
    } else {
      volatileConnections[res._id] = res;
+
+      // Check if there's a pending test subprocess waiting for this volatile connection
+      const pendingTest = pendingTestSubprocesses[conid];
+      if (pendingTest) {
+        const { subprocess, requestDbList } = pendingTest;
+        try {
+          // Send the volatile connection to the waiting subprocess
+          subprocess.send({ ...res, requestDbList, isVolatileResolved: true });
+
+          // Wait for the test result and emit it as an event
+          subprocess.once('message', resp => {
+            if (handleProcessCommunication(resp, subprocess)) return;
+            const { msgtype } = resp;
+            if (msgtype == 'connected' || msgtype == 'error') {
+              // Emit SSE event with test result
+              socket.emit(`connection-test-result-${conid}`, {
+                ...resp,
+                volatileConId: res._id,
+              });
+              delete pendingTestSubprocesses[conid];
+            }
+          });
+        } catch (err) {
+          logger.error(extractErrorLogData(err), 'DBGM-00118 Error sending volatile connection to test subprocess');
+          socket.emit(`connection-test-result-${conid}`, {
+            msgtype: 'error',
+            error: err.message,
+          });
+          delete pendingTestSubprocesses[conid];
+        }
+      }
+
      return res;
    }
  },
@@ -442,12 +484,12 @@ module.exports = {

    const storageConnection = await storage.getConnection({ conid });
    if (storageConnection) {
-      return storageConnection;
+      return mask ? maskConnection(storageConnection) : storageConnection;
    }

    if (portalConnections) {
      const res = portalConnections.find(x => x._id == conid) || null;
-      return mask && !platformInfo.allowShellConnection ? maskConnection(res) : res;
+      return mask && !platformInfo.allowShellConnection ? maskConnection(res) : encryptConnection(res);
    }
    const res = await this.datastore.get(conid);
    return res || null;
@@ -460,6 +502,9 @@ module.exports = {
        _id: '__model',
      };
    }
+    if (!conid) {
+      return null;
+    }
    await testConnectionPermission(conid, req);
    return this.getCore({ conid, mask: true });
  },
@@ -15,6 +15,7 @@ const {
  getLogger,
  extractErrorLogData,
  filterStructureBySchema,
+  serializeJsTypesForJsonStringify,
 } = require('dbgate-tools');
 const { html, parse } = require('diff2html');
 const { handleProcessCommunication } = require('../utility/processComm');
@@ -165,6 +166,11 @@ module.exports = {
    if (!connection) {
      throw new Error(`databaseConnections: Connection with conid="${conid}" not found`);
    }
+
+    if (connection.engine?.endsWith('@rest')) {
+      return { isApiConnection: true };
+    }
+
    if (connection.passwordMode == 'askPassword' || connection.passwordMode == 'askUser') {
      throw new MissingCredentialsError({ conid, passwordMode: connection.passwordMode });
    }
@@ -219,12 +225,13 @@ module.exports = {
      this.close(conid, database, false);
    });

-    subprocess.send({
+    const connectMessage = serializeJsTypesForJsonStringify({
      msgtype: 'connect',
      connection: { ...connection, database },
      structure: lastClosed ? lastClosed.structure : null,
      globalSettings: await config.getSettings(),
    });
+    subprocess.send(connectMessage);
    return newOpened;
  },

@@ -234,7 +241,8 @@ module.exports = {
    const promise = new Promise((resolve, reject) => {
      this.requests[msgid] = [resolve, reject, additionalData];
      try {
-        conn.subprocess.send({ msgid, ...message });
+        const serializedMessage = serializeJsTypesForJsonStringify({ msgid, ...message });
+        conn.subprocess.send(serializedMessage);
      } catch (err) {
        logger.error(extractErrorLogData(err), 'DBGM-00115 Error sending request do process');
        this.close(conn.conid, conn.database);
@@ -393,6 +401,12 @@ module.exports = {
    return null;
  },

+  dispatchRedisKeysChanged_meta: true,
+  dispatchRedisKeysChanged({ conid, database }) {
+    socket.emit(`redis-keys-changed-${conid}-${database}`);
+    return null;
+  },
+
  loadKeys_meta: true,
  async loadKeys({ conid, database, root, filter, limit }, req) {
    await testConnectionPermission(conid, req);
@@ -462,6 +476,7 @@ module.exports = {

    const databasePermissions = await loadDatabasePermissionsFromRequest(req);
    const tablePermissions = await loadTablePermissionsFromRequest(req);
+    const databasePermissionRole = getDatabasePermissionRole(conid, database, databasePermissions);
    const fieldsAndRoles = [
      [changeSet.inserts, 'create_update_delete'],
      [changeSet.deletes, 'create_update_delete'],
@@ -476,7 +491,7 @@ module.exports = {
          operation.schemaName,
          operation.pureName,
          tablePermissions,
-          databasePermissions
+          databasePermissionRole
        );
        if (getTablePermissionRoleLevelIndex(role) < getTablePermissionRoleLevelIndex(requiredRole)) {
          throw new Error('DBGM-00262 Permission not granted');
@@ -494,6 +509,20 @@ module.exports = {
    return res.result || null;
  },

+  multiCallMethod_meta: true,
+  async multiCallMethod({ conid, database, callList }, req) {
+    await testConnectionPermission(conid, req);
+
+    const opened = await this.ensureOpened(conid, database);
+    const res = await this.sendRequest(opened, { msgtype: 'multiCallMethod', callList });
+    if (res.errorMessage) {
+      return {
+        errorMessage: res.errorMessage,
+      };
+    }
+    return res.result || null;
+  },
+
  status_meta: true,
  async status({ conid, database }, req) {
    if (!conid) {
@@ -68,6 +68,7 @@ module.exports = {
    await fs.unlink(path.join(filesdir(), folder, file));
    socket.emitChanged(`files-changed`, { folder });
    socket.emitChanged(`all-files-changed`);
+    this.emitChangedFolder(folder);
    return true;
  },

@@ -140,6 +141,15 @@ module.exports = {
    return deserialize(format, text);
  },

+  emitChangedFolder(folder) {
+    if (folder == 'themes') {
+      socket.emitChanged(`file-themes-changed`);
+    }
+    if (folder == 'favorites') {
+      socket.emitChanged('files-changed-favorites');
+    }
+  },
+
  save_meta: true,
  async save({ folder, file, data, format }, req) {
    const loadedPermissions = await loadPermissionsFromRequest(req);
@@ -173,6 +183,8 @@ module.exports = {
      if (folder == 'shell') {
        scheduler.reload();
      }
+      this.emitChangedFolder(folder);
+
      return true;
    }
  },
@@ -240,8 +252,8 @@ module.exports = {
  },

  exportDiagram_meta: true,
-  async exportDiagram({ filePath, html, css, themeType, themeClassName, watermark }) {
-    await fs.writeFile(filePath, getDiagramExport(html, css, themeType, themeClassName, watermark));
+  async exportDiagram({ filePath, html, css, themeType, themeVariables, watermark }) {
+    await fs.writeFile(filePath, getDiagramExport(html, css, themeType, themeVariables, watermark));
    return true;
  },

@@ -346,4 +358,20 @@ module.exports = {
    }
    return res;
  },
+
+  getFileThemes_meta: true,
+  async getFileThemes(_params, req) {
+    const loadedPermissions = await loadPermissionsFromRequest(req);
+    if (!hasPermission(`files/themes/read`, loadedPermissions)) return [];
+    const dir = path.join(filesdir(), 'themes');
+    if (!(await fs.exists(dir))) return [];
+    const files = await fs.readdir(dir);
+    const res = [];
+    for (const file of files) {
+      const filePath = path.join(dir, file);
+      const text = await fs.readFile(filePath, { encoding: 'utf-8' });
+      res.push(JSON.parse(text));
+    }
+    return res;
+  },
 };
@@ -0,0 +1,41 @@
+module.exports = {
+  disconnect_meta: true,
+  async disconnect({ conid }, req) {
+    return null;
+  },
+
+  getApiInfo_meta: true,
+  async getApiInfo({ conid }, req) {
+    return null;
+  },
+
+  restStatus_meta: true,
+  async restStatus() {
+    return {};
+  },
+
+  ping_meta: true,
+  async ping({ conidArray, strmid }) {
+    return null;
+  },
+
+  refresh_meta: true,
+  async refresh({ conid, keepOpen }, req) {
+    return null;
+  },
+
+  testConnection_meta: true,
+  async testConnection({ conid }, req) {
+    return null;
+  },
+
+  execute_meta: true,
+  async execute({ conid, method, endpoint, parameters, server }, req) {
+    return null;
+  },
+
+  apiQuery_meta: true,
+  async apiQuery({ conid, server, query, variables }, req) {
+    return null;
+  },
+};
@@ -172,7 +172,7 @@ module.exports = {
    byline(subprocess.stderr).on('data', pipeDispatcher('error'));
    subprocess.on('exit', code => {
      // console.log('... EXITED', code);
-      this.rejectRequest(runid, { message: 'No data returned, maybe input data source is too big' });
+      this.rejectRequest(runid, { message: 'DBGM-00281 No data returned, maybe input data source is too big' });
      logger.info({ code, pid: subprocess.pid }, 'DBGM-00016 Exited process');
      socket.emit(`runner-done-${runid}`, code);
      this.opened = this.opened.filter(x => x.runid != runid);
@@ -225,7 +225,7 @@ module.exports = {
    subprocess.on('exit', code => {
      console.log('... EXITED', code);
      logger.info({ code, pid: subprocess.pid }, 'DBGM-00017 Exited process');
-      this.dispatchMessage(runid, `Finished external process with code ${code}`);
+      this.dispatchMessage(runid, `DBGM-00282 Finished external process with code ${code}`);
      socket.emit(`runner-done-${runid}`, code);
      if (onFinished) {
        onFinished();
@@ -233,7 +233,7 @@ module.exports = {
      this.opened = this.opened.filter(x => x.runid != runid);
    });
    subprocess.on('spawn', () => {
-      this.dispatchMessage(runid, `Started external process ${command}`);
+      this.dispatchMessage(runid, `DBGM-00283 Started external process ${command}`);
    });
    subprocess.on('error', error => {
      console.log('... ERROR subprocess', error);
@@ -279,7 +279,7 @@ module.exports = {
    if (script.type == 'json') {
      if (!platformInfo.isElectron) {
        if (!checkSecureDirectoriesInScript(script)) {
-          return { errorMessage: 'Unallowed directories in script' };
+          return { errorMessage: 'DBGM-00284 Unallowed directories in script' };
        }
      }

@@ -299,10 +299,10 @@ module.exports = {
        action: 'script',
        severity: 'warn',
        detail: script,
-        message: 'Scripts are not allowed',
+        message: 'DBGM-00285 Scripts are not allowed',
      });

-      return { errorMessage: 'Shell scripting is not allowed' };
+      return { errorMessage: 'DBGM-00286 Shell scripting is not allowed' };
    }

    sendToAuditLog(req, {
@@ -312,7 +312,7 @@ module.exports = {
      action: 'script',
      severity: 'info',
      detail: script,
-      message: 'Running JS script',
+      message: 'DBGM-00287 Running JS script',
    });

    return this.startCore(runid, scriptTemplate(script, false));
@@ -327,7 +327,7 @@ module.exports = {
  async cancel({ runid }) {
    const runner = this.opened.find(x => x.runid == runid);
    if (!runner) {
-      throw new Error('Invalid runner');
+      throw new Error('DBGM-00288 Invalid runner');
    }
    runner.subprocess.kill();
    return { state: 'ok' };
@@ -353,7 +353,7 @@ module.exports = {
  async loadReader({ functionName, props }) {
    if (!platformInfo.isElectron) {
      if (props?.fileName && !checkSecureDirectories(props.fileName)) {
-        return { errorMessage: 'Unallowed file' };
+        return { errorMessage: 'DBGM-00289 Unallowed file' };
      }
    }
    const prefix = extractShellApiPlugins(functionName)
@@ -371,7 +371,7 @@ module.exports = {
  scriptResult_meta: true,
  async scriptResult({ script }) {
    if (script.type != 'json') {
-      return { errorMessage: 'Only JSON scripts are allowed' };
+      return { errorMessage: 'DBGM-00290 Only JSON scripts are allowed' };
    }

    const promise = new Promise(async (resolve, reject) => {
@@ -171,7 +171,7 @@ module.exports = {
      const databasePermissions = await loadDatabasePermissionsFromRequest(req);
      const res = [];
      for (const db of opened?.databases ?? []) {
-        const databasePermissionRole = getDatabasePermissionRole(db.id, db.name, databasePermissions);
+        const databasePermissionRole = getDatabasePermissionRole(conid, db.name, databasePermissions);
        if (databasePermissionRole != 'deny') {
          res.push({
            ...db,
@@ -1,5 +1,5 @@

 module.exports = { 
-  version: '6.0.0-alpha.1',
+  version: '7.0.0-alpha.1',
  buildTime: '2024-12-01T00:00:00Z'
 };
@@ -147,6 +147,7 @@ const shell = require('./shell/index');
 global.DBGATE_PACKAGES = {
  'dbgate-tools': require('dbgate-tools'),
  'dbgate-sqltree': require('dbgate-sqltree'),
+  'dbgate-datalib': require('dbgate-datalib'),
 };

 if (processArgs.startProcess) {
@@ -14,6 +14,7 @@ const socket = require('./utility/socket');
 const connections = require('./controllers/connections');
 const serverConnections = require('./controllers/serverConnections');
 const databaseConnections = require('./controllers/databaseConnections');
+const restConnections = require('./controllers/restConnections');
 const metadata = require('./controllers/metadata');
 const sessions = require('./controllers/sessions');
 const runners = require('./controllers/runners');
@@ -267,6 +268,7 @@ function useAllControllers(app, electron) {
  useController(app, electron, '/auth', auth);
  useController(app, electron, '/cloud', cloud);
  useController(app, electron, '/team-files', teamFiles);
+  useController(app, electron, '/rest-connections', restConnections);
 }

 function setElectronSender(electronSender) {
@@ -1,6 +1,6 @@
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const { connectUtility } = require('../utility/connectUtility');
+const { connectUtility, getRestAuthFromConnection } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { pickSafeConnectionInfo } = require('../utility/crypting');
 const _ = require('lodash');
@@ -18,13 +18,39 @@ Platform: ${process.platform}

 function start() {
  childProcessChecker();
-  process.on('message', async connection => {
+
+  let isWaitingForVolatile = false;
+
+  const handleConnection = async connection => {
    // @ts-ignore
    const { requestDbList } = connection;
    if (handleProcessCommunication(connection)) return;
+
    try {
      const driver = requireEngineDriver(connection);
-      const dbhan = await connectUtility(driver, connection, 'app');
+      const connectionChanged = driver?.beforeConnectionSave ? driver.beforeConnectionSave(connection) : connection;
+      if (driver?.databaseEngineTypes?.includes('rest')) {
+        connectionChanged.restAuth = getRestAuthFromConnection(connection);
+      }
+
+      if (!connection.isVolatileResolved) {
+        if (connectionChanged.useRedirectDbLogin) {
+          process.send({
+            msgtype: 'missingCredentials',
+            missingCredentialsDetail: {
+              // @ts-ignore
+              conid: connection._id,
+              redirectToDbLogin: true,
+              keepErrorResponseFromApi: true,
+            },
+          });
+          // Don't exit - wait for volatile connection to be sent
+          isWaitingForVolatile = true;
+          return;
+        }
+      }
+
+      const dbhan = await connectUtility(driver, connectionChanged, 'app');
      let version = {
        version: 'Unknown',
      };
@@ -45,6 +71,16 @@ function start() {
    }

    process.exit(0);
+  };
+
+  process.on('message', async connection => {
+    // If we're waiting for volatile and receive a new connection, use it
+    if (isWaitingForVolatile) {
+      isWaitingForVolatile = false;
+      await handleConnection(connection);
+    } else {
+      await handleConnection(connection);
+    }
  });
 }

@@ -368,6 +368,107 @@ async function handleSaveTableData({ msgid, changeSet }) {
  }
 }

+async function handleMultiCallMethod({ msgid, callList }) {
+  try {
+    const driver = requireEngineDriver(storedConnection);
+    await driver.invokeMethodCallList(dbhan, callList);
+
+    // for (const change of changeSet.changes) {
+    //   if (change.type === 'string') {
+    //     await driver.query(dbhan, `SET "${change.key}" "${change.value}"`);
+    //   } else if (change.type === 'json') {
+    //     await driver.query(dbhan, `JSON.SET "${change.key}" $ '${change.value.replace(/'/g, "\\'")}'`);
+    //   } else if (change.type === 'hash') {
+    //     if (change.updates && Array.isArray(change.updates)) {
+    //       for (const update of change.updates) {
+    //         await driver.query(dbhan, `HSET "${change.key}" "${update.key}" "${update.value}"`);
+          
+    //         if (update.ttl !== undefined && update.ttl !== null && update.ttl !== -1) {
+    //           try {
+    //             await dbhan.client.call('HEXPIRE', change.key, update.ttl, 'FIELDS', 1, update.key);
+    //           } catch (e) {}
+    //         }
+    //       }
+    //     }
+    //     if (change.inserts && Array.isArray(change.inserts)) {
+    //       for (const insert of change.inserts) {
+    //         await driver.query(dbhan, `HSET "${change.key}" "${insert.key}" "${insert.value}"`);
+            
+    //         if (insert.ttl !== undefined && insert.ttl !== null && insert.ttl !== -1) {
+    //           try {
+    //             await dbhan.client.call('HEXPIRE', change.key, insert.ttl, 'FIELDS', 1, insert.key);
+    //           } catch (e) {}
+    //         }
+    //       }
+    //     }
+    //     if (change.deletes && Array.isArray(change.deletes)) {
+    //       for (const delKey of change.deletes) {
+    //         await driver.query(dbhan, `HDEL "${change.key}" "${delKey}"`);
+    //       }
+    //     }
+    //   } else if (change.type === 'zset') {
+    //     if (change.updates && Array.isArray(change.updates)) {
+    //       for (const update of change.updates) {
+    //         await driver.query(dbhan, `ZADD "${change.key}" ${update.score} "${update.member}"`);
+    //       }
+    //     }
+    //     if (change.inserts && Array.isArray(change.inserts)) {
+    //       for (const insert of change.inserts) {
+    //         await driver.query(dbhan, `ZADD "${change.key}" ${insert.score} "${insert.member}"`);
+    //       }
+    //     }
+    //     if (change.deletes && Array.isArray(change.deletes)) {
+    //       for (const delMember of change.deletes) {
+    //         await driver.query(dbhan, `ZREM "${change.key}" "${delMember}"`);
+    //       }
+    //     }
+    //   } else if (change.type === 'list') {
+    //     if (change.updates && Array.isArray(change.updates)) {
+    //       for (const update of change.updates) {
+    //         await driver.query(dbhan, `LSET "${change.key}" ${update.index} "${update.value}"`);
+    //       }
+    //     }
+    //     if (change.inserts && Array.isArray(change.inserts)) {
+    //       for (const insert of change.inserts) {
+    //         await driver.query(dbhan, `RPUSH "${change.key}" "${insert.value}"`);
+    //       }
+    //     }
+    //   } else if (change.type === 'set') {
+    //     if (change.inserts && Array.isArray(change.inserts)) {
+    //       for (const insert of change.inserts) {
+    //         await driver.query(dbhan, `SADD "${change.key}" "${insert.value}"`);
+    //       }
+    //     }
+    //     if (change.deletes && Array.isArray(change.deletes)) {
+    //       for (const delValue of change.deletes) {
+    //         await driver.query(dbhan, `SREM "${change.key}" "${delValue}"`);
+    //       }
+    //     }
+    //   } else if (change.type === 'stream') {
+    //     if (change.inserts && Array.isArray(change.inserts)) {
+    //       for (const insert of change.inserts) {
+    //         const streamId = insert.id === '*' || !insert.id ? '*' : insert.id;
+    //         await driver.query(dbhan, `XADD "${change.key}" ${streamId} value "${insert.value}"`);
+    //       }
+    //     }
+    //     if (change.deletes && Array.isArray(change.deletes)) {
+    //       for (const delId of change.deletes) {
+    //         await driver.query(dbhan, `XDEL "${change.key}" "${delId}"`);
+    //       }
+    //     }
+    //   }
+    // }
+
+    process.send({ msgtype: 'response', msgid });
+  } catch (err) {
+    process.send({
+      msgtype: 'response',
+      msgid,
+      errorMessage: extractErrorMessage(err, 'Error saving Redis data'),
+    });
+  }
+}
+
 async function handleSqlPreview({ msgid, objects, options }) {
  await waitStructure();
  const driver = requireEngineDriver(storedConnection);
@@ -501,6 +602,7 @@ const messageHandlers = {
  schemaList: handleSchemaList,
  executeSessionQuery: handleExecuteSessionQuery,
  evalJsonScript: handleEvalJsonScript,
+  multiCallMethod: handleMultiCallMethod,
  // runCommand: handleRunCommand,
 };

@@ -1,6 +1,7 @@
 const connectProcess = require('./connectProcess');
 const databaseConnectionProcess = require('./databaseConnectionProcess');
 const serverConnectionProcess = require('./serverConnectionProcess');
+const restConnectionProcess = require('./restConnectionProcess');
 const sessionProcess = require('./sessionProcess');
 const jslDatastoreProcess = require('./jslDatastoreProcess');
 const sshForwardProcess = require('./sshForwardProcess');
@@ -9,6 +10,7 @@ module.exports = {
  connectProcess,
  databaseConnectionProcess,
  serverConnectionProcess,
+  restConnectionProcess,
  sessionProcess,
  jslDatastoreProcess,
  sshForwardProcess,
@@ -0,0 +1,7 @@
+const childProcessChecker = require('../utility/childProcessChecker');
+
+function start() {
+  childProcessChecker();
+}
+
+module.exports = { start };
@@ -65,6 +65,8 @@ async function copyStream(input, output, options) {
      });
    }
  } catch (err) {
+    logger.error(extractErrorLogData(err, { progressName }), 'DBGM-00157 Import/export job failed');
+
    process.send({
      msgtype: 'copyStreamError',
      copyStreamError: {
@@ -82,8 +84,6 @@ async function copyStream(input, output, options) {
        errorMessage: extractErrorMessage(err),
      });
    }
-
-    logger.error(extractErrorLogData(err, { progressName }), 'DBGM-00157 Import/export job failed');
    // throw err;
  }
 }
@@ -64,6 +64,7 @@ async function dataReplicator({
          createNew: compileOperationFunction(item.createNew, item.createCondition),
          updateExisting: compileOperationFunction(item.updateExisting, item.updateCondition),
          deleteMissing: !!item.deleteMissing,
+          skipUpdateColumns: item.skipUpdateColumns,
          deleteRestrictionColumns: item.deleteRestrictionColumns ?? [],
          openStream: item.openStream
            ? item.openStream
@@ -4,7 +4,8 @@ const { pluginsdir, packagedPluginsDir, getPluginBackendPath } = require('../uti
 const platformInfo = require('../utility/platformInfo');
 const authProxy = require('../utility/authProxy');
 const { getLogger } = require('dbgate-tools');
-// 
+const { openApiDriver, graphQlDriver, oDataDriver } = require('dbgate-rest');
+//
 const logger = getLogger('requirePlugin');

 const loadedPlugins = {};
@@ -13,16 +14,21 @@ const dbgateEnv = {
  dbgateApi: null,
  platformInfo,
  authProxy,
-  isProApp: () =>{
+  isProApp: () => {
    const { isProApp } = require('../utility/checkLicense');
    return isProApp();
-  }
+  },
 };
 function requirePlugin(packageName, requiredPlugin = null) {
  if (!packageName) throw new Error('Missing packageName in plugin');
  if (loadedPlugins[packageName]) return loadedPlugins[packageName];

  if (requiredPlugin == null) {
+    if (packageName.endsWith('@rest') || packageName === 'rest') {
+      return {
+        drivers: [openApiDriver, graphQlDriver, oDataDriver],
+      };
+    }
    let module;
    const modulePath = getPluginBackendPath(packageName);
    logger.info(`DBGM-00062 Loading module ${packageName} from ${modulePath}`);
@@ -360,6 +360,12 @@ module.exports = {
          "columnName": "value",
          "dataType": "varchar(1000)",
          "notNull": false
+        },
+        {
+          "pureName": "config",
+          "columnName": "valueType",
+          "dataType": "varchar(50)",
+          "notNull": false
        }
      ],
      "foreignKeys": [],
@@ -680,9 +686,34 @@ module.exports = {
          "columnName": "connectionDefinition",
          "dataType": "text",
          "notNull": false
+        },
+        {
+          "pureName": "connections",
+          "columnName": "import_source_id",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "connections",
+          "columnName": "id_original",
+          "dataType": "varchar(250)",
+          "notNull": false
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_connections_import_source_id",
+          "pureName": "connections",
+          "refTableName": "import_sources",
+          "columns": [
+            {
+              "columnName": "import_source_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
-      "foreignKeys": [],
      "primaryKey": {
        "pureName": "connections",
        "constraintType": "primaryKey",
@@ -784,6 +815,41 @@ module.exports = {
        }
      ]
    },
+    {
+      "pureName": "import_sources",
+      "columns": [
+        {
+          "pureName": "import_sources",
+          "columnName": "id",
+          "dataType": "int",
+          "autoIncrement": true,
+          "notNull": true
+        },
+        {
+          "pureName": "import_sources",
+          "columnName": "name",
+          "dataType": "varchar(250)",
+          "notNull": true
+        }
+      ],
+      "foreignKeys": [],
+      "primaryKey": {
+        "pureName": "import_sources",
+        "constraintType": "primaryKey",
+        "constraintName": "PK_import_sources",
+        "columns": [
+          {
+            "columnName": "id"
+          }
+        ]
+      },
+      "preloadedRows": [
+        {
+          "id": -1,
+          "name": "env"
+        }
+      ]
+    },
    {
      "pureName": "roles",
      "columns": [
@@ -799,9 +865,34 @@ module.exports = {
          "columnName": "name",
          "dataType": "varchar(250)",
          "notNull": false
+        },
+        {
+          "pureName": "roles",
+          "columnName": "import_source_id",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "roles",
+          "columnName": "id_original",
+          "dataType": "varchar(250)",
+          "notNull": false
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_roles_import_source_id",
+          "pureName": "roles",
+          "refTableName": "import_sources",
+          "columns": [
+            {
+              "columnName": "import_source_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
-      "foreignKeys": [],
      "primaryKey": {
        "pureName": "roles",
        "constraintType": "primaryKey",
@@ -848,6 +939,12 @@ module.exports = {
          "columnName": "connection_id",
          "dataType": "int",
          "notNull": true
+        },
+        {
+          "pureName": "role_connections",
+          "columnName": "import_source_id",
+          "dataType": "int",
+          "notNull": false
        }
      ],
      "foreignKeys": [
@@ -876,6 +973,18 @@ module.exports = {
              "refColumnName": "id"
            }
          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_role_connections_import_source_id",
+          "pureName": "role_connections",
+          "refTableName": "import_sources",
+          "columns": [
+            {
+              "columnName": "import_source_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
      "primaryKey": {
@@ -928,6 +1037,18 @@ module.exports = {
          "columnName": "database_permission_role_id",
          "dataType": "int",
          "notNull": true
+        },
+        {
+          "pureName": "role_databases",
+          "columnName": "import_source_id",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "role_databases",
+          "columnName": "id_original",
+          "dataType": "varchar(250)",
+          "notNull": false
        }
      ],
      "foreignKeys": [
@@ -968,6 +1089,18 @@ module.exports = {
              "refColumnName": "id"
            }
          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_role_databases_import_source_id",
+          "pureName": "role_databases",
+          "refTableName": "import_sources",
+          "columns": [
+            {
+              "columnName": "import_source_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
      "primaryKey": {
@@ -1081,6 +1214,12 @@ module.exports = {
          "columnName": "permission",
          "dataType": "varchar(250)",
          "notNull": true
+        },
+        {
+          "pureName": "role_permissions",
+          "columnName": "import_source_id",
+          "dataType": "int",
+          "notNull": false
        }
      ],
      "foreignKeys": [
@@ -1096,6 +1235,18 @@ module.exports = {
              "refColumnName": "id"
            }
          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_role_permissions_import_source_id",
+          "pureName": "role_permissions",
+          "refTableName": "import_sources",
+          "columns": [
+            {
+              "columnName": "import_source_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
      "primaryKey": {
@@ -1178,6 +1329,18 @@ module.exports = {
          "columnName": "table_permission_scope_id",
          "dataType": "int",
          "notNull": true
+        },
+        {
+          "pureName": "role_tables",
+          "columnName": "import_source_id",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "role_tables",
+          "columnName": "id_original",
+          "dataType": "varchar(250)",
+          "notNull": false
        }
      ],
      "foreignKeys": [
@@ -1230,6 +1393,18 @@ module.exports = {
              "refColumnName": "id"
            }
          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_role_tables_import_source_id",
+          "pureName": "role_tables",
+          "refTableName": "import_sources",
+          "columns": [
+            {
+              "columnName": "import_source_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
      "primaryKey": {
@@ -1323,6 +1498,86 @@ module.exports = {
        ]
      }
    },
+    {
+      "pureName": "role_team_folders",
+      "columns": [
+        {
+          "pureName": "role_team_folders",
+          "columnName": "id",
+          "dataType": "int",
+          "autoIncrement": true,
+          "notNull": true
+        },
+        {
+          "pureName": "role_team_folders",
+          "columnName": "role_id",
+          "dataType": "int",
+          "notNull": true
+        },
+        {
+          "pureName": "role_team_folders",
+          "columnName": "team_folder_id",
+          "dataType": "int",
+          "notNull": true
+        },
+        {
+          "pureName": "role_team_folders",
+          "columnName": "allow_read_files",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "role_team_folders",
+          "columnName": "allow_write_files",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "role_team_folders",
+          "columnName": "allow_use_files",
+          "dataType": "int",
+          "notNull": false
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_role_team_folders_role_id",
+          "pureName": "role_team_folders",
+          "refTableName": "roles",
+          "deleteAction": "CASCADE",
+          "columns": [
+            {
+              "columnName": "role_id",
+              "refColumnName": "id"
+            }
+          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_role_team_folders_team_folder_id",
+          "pureName": "role_team_folders",
+          "refTableName": "team_folders",
+          "deleteAction": "CASCADE",
+          "columns": [
+            {
+              "columnName": "team_folder_id",
+              "refColumnName": "id"
+            }
+          ]
+        }
+      ],
+      "primaryKey": {
+        "pureName": "role_team_folders",
+        "constraintType": "primaryKey",
+        "constraintName": "PK_role_team_folders",
+        "columns": [
+          {
+            "columnName": "id"
+          }
+        ]
+      }
+    },
    {
      "pureName": "table_permission_roles",
      "columns": [
@@ -1480,6 +1735,14 @@ module.exports = {
          "columnName": "metadata",
          "dataType": "varchar(1000)",
          "notNull": false
+        },
+        {
+          "pureName": "team_files",
+          "columnName": "team_folder_id",
+          "dataType": "int",
+          "notNull": true,
+          "defaultValue": -1,
+          "defaultConstraint": "DF_team_files_team_folder_id"
        }
      ],
      "foreignKeys": [
@@ -1506,6 +1769,18 @@ module.exports = {
              "refColumnName": "id"
            }
          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_team_files_team_folder_id",
+          "pureName": "team_files",
+          "refTableName": "team_folders",
+          "columns": [
+            {
+              "columnName": "team_folder_id",
+              "refColumnName": "id"
+            }
+          ]
        }
      ],
      "primaryKey": {
@@ -1590,6 +1865,41 @@ module.exports = {
        }
      ]
    },
+    {
+      "pureName": "team_folders",
+      "columns": [
+        {
+          "pureName": "team_folders",
+          "columnName": "id",
+          "dataType": "int",
+          "autoIncrement": true,
+          "notNull": true
+        },
+        {
+          "pureName": "team_folders",
+          "columnName": "folder_name",
+          "dataType": "varchar(250)",
+          "notNull": false
+        }
+      ],
+      "foreignKeys": [],
+      "primaryKey": {
+        "pureName": "team_folders",
+        "constraintType": "primaryKey",
+        "constraintName": "PK_team_folders",
+        "columns": [
+          {
+            "columnName": "id"
+          }
+        ]
+      },
+      "preloadedRows": [
+        {
+          "id": -1,
+          "folder_name": "default"
+        }
+      ]
+    },
    {
      "pureName": "users",
      "columns": [
@@ -1864,6 +2174,84 @@ module.exports = {
        ]
      }
    },
+    {
+      "pureName": "user_password_reset_tokens",
+      "columns": [
+        {
+          "pureName": "user_password_reset_tokens",
+          "columnName": "id",
+          "dataType": "int",
+          "autoIncrement": true,
+          "notNull": true
+        },
+        {
+          "pureName": "user_password_reset_tokens",
+          "columnName": "user_id",
+          "dataType": "int",
+          "notNull": true
+        },
+        {
+          "pureName": "user_password_reset_tokens",
+          "columnName": "token",
+          "dataType": "varchar(500)",
+          "notNull": true
+        },
+        {
+          "pureName": "user_password_reset_tokens",
+          "columnName": "created_at",
+          "dataType": "varchar(32)",
+          "notNull": true
+        },
+        {
+          "pureName": "user_password_reset_tokens",
+          "columnName": "expires_at",
+          "dataType": "varchar(32)",
+          "notNull": true
+        },
+        {
+          "pureName": "user_password_reset_tokens",
+          "columnName": "used_at",
+          "dataType": "varchar(32)",
+          "notNull": false
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_user_password_reset_tokens_user_id",
+          "pureName": "user_password_reset_tokens",
+          "refTableName": "users",
+          "columns": [
+            {
+              "columnName": "user_id",
+              "refColumnName": "id"
+            }
+          ]
+        }
+      ],
+      "indexes": [
+        {
+          "constraintName": "idx_token",
+          "pureName": "user_password_reset_tokens",
+          "constraintType": "index",
+          "columns": [
+            {
+              "columnName": "token"
+            }
+          ]
+        }
+      ],
+      "primaryKey": {
+        "pureName": "user_password_reset_tokens",
+        "constraintType": "primaryKey",
+        "constraintName": "PK_user_password_reset_tokens",
+        "columns": [
+          {
+            "columnName": "id"
+          }
+        ]
+      }
+    },
    {
      "pureName": "user_permissions",
      "columns": [
@@ -2188,6 +2576,86 @@ module.exports = {
          }
        ]
      }
+    },
+    {
+      "pureName": "user_team_folders",
+      "columns": [
+        {
+          "pureName": "user_team_folders",
+          "columnName": "id",
+          "dataType": "int",
+          "autoIncrement": true,
+          "notNull": true
+        },
+        {
+          "pureName": "user_team_folders",
+          "columnName": "user_id",
+          "dataType": "int",
+          "notNull": true
+        },
+        {
+          "pureName": "user_team_folders",
+          "columnName": "team_folder_id",
+          "dataType": "int",
+          "notNull": true
+        },
+        {
+          "pureName": "user_team_folders",
+          "columnName": "allow_read_files",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "user_team_folders",
+          "columnName": "allow_write_files",
+          "dataType": "int",
+          "notNull": false
+        },
+        {
+          "pureName": "user_team_folders",
+          "columnName": "allow_use_files",
+          "dataType": "int",
+          "notNull": false
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_user_team_folders_user_id",
+          "pureName": "user_team_folders",
+          "refTableName": "users",
+          "deleteAction": "CASCADE",
+          "columns": [
+            {
+              "columnName": "user_id",
+              "refColumnName": "id"
+            }
+          ]
+        },
+        {
+          "constraintType": "foreignKey",
+          "constraintName": "FK_user_team_folders_team_folder_id",
+          "pureName": "user_team_folders",
+          "refTableName": "team_folders",
+          "deleteAction": "CASCADE",
+          "columns": [
+            {
+              "columnName": "team_folder_id",
+              "refColumnName": "id"
+            }
+          ]
+        }
+      ],
+      "primaryKey": {
+        "pureName": "user_team_folders",
+        "constraintType": "primaryKey",
+        "constraintName": "PK_user_team_folders",
+        "columns": [
+          {
+            "columnName": "id"
+          }
+        ]
+      }
    }
  ],
  "collections": [],
@@ -1,9 +1,10 @@
 const fs = require('fs-extra');
-const { decryptConnection } = require('./crypting');
+const { decryptConnection, decryptPasswordString } = require('./crypting');
 const { getSshTunnelProxy } = require('./sshTunnelProxy');
 const platformInfo = require('../utility/platformInfo');
 const connections = require('../controllers/connections');
 const _ = require('lodash');
+const axios = require('axios');

 async function loadConnection(driver, storedConnection, connectionMode) {
  const { allowShellConnection, allowConnectionFromEnvVariables } = platformInfo;
@@ -131,12 +132,39 @@ async function connectUtility(driver, storedConnection, connectionMode, addition
  }

  connection.ssl = await extractConnectionSslParams(connection);
+  connection.axios = axios.default;

  const conn = await driver.connect({ conid: connectionLoaded?._id, ...connection, ...additionalOptions });
  return conn;
 }

+function getRestAuthFromConnection(connection) {
+  if (!connection) return null;
+  if (connection.authType == 'basic') {
+    return {
+      type: 'basic',
+      user: connection.user,
+      password: decryptPasswordString(connection.password),
+    };
+  }
+  if (connection.authType == 'bearer') {
+    return {
+      type: 'bearer',
+      token: connection.authToken,
+    };
+  }
+  if (connection.authType == 'apikey') {
+    return {
+      type: 'apikey',
+      header: connection.apiKeyHeader,
+      value: connection.apiKeyValue,
+    };
+  }
+  return null;
+}
+
 module.exports = {
  extractConnectionSslParams,
  connectUtility,
+  getRestAuthFromConnection,
 };
@@ -102,6 +102,26 @@ function decryptObjectPasswordField(obj, field, encryptor = null) {
 }

 const fieldsToEncrypt = ['password', 'sshPassword', 'sshKeyfilePassword', 'connectionDefinition'];
+const additionalFieldsToMask = [
+  'databaseUrl',
+  'server',
+  'port',
+  'user',
+  'sshBastionHost',
+  'sshHost',
+  'sshKeyFile',
+  'sshLogin',
+  'sshMode',
+  'sshPort',
+  'sslCaFile',
+  'sslCertFilePassword',
+  'sslKeyFile',
+  'sslRejectUnauthorized',
+  'secretAccessKey',
+  'accessKeyId',
+  'endpoint',
+  'endpointKey',
+];

 function encryptConnection(connection, encryptor = null) {
  if (connection.passwordMode != 'saveRaw') {
@@ -114,7 +134,7 @@ function encryptConnection(connection, encryptor = null) {

 function maskConnection(connection) {
  if (!connection) return connection;
-  return _.omit(connection, fieldsToEncrypt);
+  return _.omit(connection, [...fieldsToEncrypt, ...additionalFieldsToMask]);
 }

 function decryptConnection(connection) {
@@ -0,0 +1,465 @@
+const path = require('path');
+const _ = require('lodash');
+const { safeJsonParse, getDatabaseFileLabel } = require('dbgate-tools');
+const crypto = require('crypto');
+
+function extractConnectionsFromEnv(env) {
+  if (!env?.CONNECTIONS) {
+    return null;
+  }
+
+  const connections = _.compact(env.CONNECTIONS.split(',')).map(id => ({
+    _id: id,
+    engine: env[`ENGINE_${id}`],
+    server: env[`SERVER_${id}`],
+    user: env[`USER_${id}`],
+    password: env[`PASSWORD_${id}`],
+    passwordMode: env[`PASSWORD_MODE_${id}`],
+    port: env[`PORT_${id}`],
+    databaseUrl: env[`URL_${id}`],
+    useDatabaseUrl: !!env[`URL_${id}`],
+    databaseFile: env[`FILE_${id}`]?.replace(
+      '%%E2E_TEST_DATA_DIRECTORY%%',
+      path.join(path.dirname(path.dirname(__dirname)), 'e2e-tests', 'tmpdata')
+    ),
+    socketPath: env[`SOCKET_PATH_${id}`],
+    serviceName: env[`SERVICE_NAME_${id}`],
+    authType: env[`AUTH_TYPE_${id}`] || (env[`SOCKET_PATH_${id}`] ? 'socket' : undefined),
+    defaultDatabase:
+      env[`DATABASE_${id}`] ||
+      (env[`FILE_${id}`]
+        ? getDatabaseFileLabel(env[`FILE_${id}`])
+        : env[`APISERVERURL1_${id}`]
+        ? '_api_database_'
+        : null),
+    singleDatabase: !!env[`DATABASE_${id}`] || !!env[`FILE_${id}`] || !!env[`APISERVERURL1_${id}`],
+    displayName: env[`LABEL_${id}`],
+    isReadOnly: env[`READONLY_${id}`],
+    databases: env[`DBCONFIG_${id}`] ? safeJsonParse(env[`DBCONFIG_${id}`]) : null,
+    allowedDatabases: env[`ALLOWED_DATABASES_${id}`]?.replace(/\|/g, '\n'),
+    allowedDatabasesRegex: env[`ALLOWED_DATABASES_REGEX_${id}`],
+    parent: env[`PARENT_${id}`] || undefined,
+    useSeparateSchemas: !!env[`USE_SEPARATE_SCHEMAS_${id}`],
+    localDataCenter: env[`LOCAL_DATA_CENTER_${id}`],
+
+    // SSH tunnel
+    useSshTunnel: env[`USE_SSH_${id}`],
+    sshHost: env[`SSH_HOST_${id}`],
+    sshPort: env[`SSH_PORT_${id}`],
+    sshMode: env[`SSH_MODE_${id}`],
+    sshLogin: env[`SSH_LOGIN_${id}`],
+    sshPassword: env[`SSH_PASSWORD_${id}`],
+    sshKeyfile: env[`SSH_KEY_FILE_${id}`],
+    sshKeyfilePassword: env[`SSH_KEY_FILE_PASSWORD_${id}`],
+
+    // SSL
+    useSsl: env[`USE_SSL_${id}`],
+    sslCaFile: env[`SSL_CA_FILE_${id}`],
+    sslCertFile: env[`SSL_CERT_FILE_${id}`],
+    sslCertFilePassword: env[`SSL_CERT_FILE_PASSWORD_${id}`],
+    sslKeyFile: env[`SSL_KEY_FILE_${id}`],
+    sslRejectUnauthorized: env[`SSL_REJECT_UNAUTHORIZED_${id}`],
+    trustServerCertificate: env[`SSL_TRUST_CERTIFICATE_${id}`],
+
+    apiServerUrl1: env[`APISERVERURL1_${id}`],
+    apiServerUrl2: env[`APISERVERURL2_${id}`],
+    apiKeyHeader: env[`APIKEYHEADER_${id}`],
+    apiKeyValue: env[`APIKEYVALUE_${id}`],
+  }));
+
+  return connections;
+}
+
+function extractImportEntitiesFromEnv(env) {
+  const portalConnections = extractConnectionsFromEnv(env) || [];
+
+  const connections = portalConnections.map((conn, index) => ({
+    ...conn,
+    id_original: conn._id,
+    import_source_id: -1,
+    conid: crypto.randomUUID(),
+    _id: undefined,
+    id: index + 1, // autoincrement id
+
+    useDatabaseUrl: conn.useDatabaseUrl ? 1 : 0,
+    isReadOnly: conn.isReadOnly ? 1 : 0,
+    useSeparateSchemas: conn.useSeparateSchemas ? 1 : 0,
+    trustServerCertificate: conn.trustServerCertificate ? 1 : 0,
+    singleDatabase: conn.singleDatabase ? 1 : 0,
+    useSshTunnel: conn.useSshTunnel ? 1 : 0,
+    useSsl: conn.useSsl ? 1 : 0,
+    sslRejectUnauthorized: conn.sslRejectUnauthorized ? 1 : 0,
+  }));
+
+  const connectionEnvIdToDbId = {};
+  for (const conn of connections) {
+    connectionEnvIdToDbId[conn.id_original] = conn.id;
+  }
+
+  const connectionsRegex = /^ROLE_(.+)_CONNECTIONS$/;
+  const permissionsRegex = /^ROLE_(.+)_PERMISSIONS$/;
+
+  const dbConnectionRegex = /^ROLE_(.+)_DATABASES_(.+)_CONNECTION$/;
+  const dbDatabasesRegex = /^ROLE_(.+)_DATABASES_(.+)_DATABASES$/;
+  const dbDatabasesRegexRegex = /^ROLE_(.+)_DATABASES_(.+)_DATABASES_REGEX$/;
+  const dbPermissionRegex = /^ROLE_(.+)_DATABASES_(.+)_PERMISSION$/;
+
+  const tableConnectionRegex = /^ROLE_(.+)_TABLES_(.+)_CONNECTION$/;
+  const tableDatabasesRegex = /^ROLE_(.+)_TABLES_(.+)_DATABASES$/;
+  const tableDatabasesRegexRegex = /^ROLE_(.+)_TABLES_(.+)_DATABASES_REGEX$/;
+  const tableSchemasRegex = /^ROLE_(.+)_TABLES_(.+)_SCHEMAS$/;
+  const tableSchemasRegexRegex = /^ROLE_(.+)_TABLES_(.+)_SCHEMAS_REGEX$/;
+  const tableTablesRegex = /^ROLE_(.+)_TABLES_(.+)_TABLES$/;
+  const tableTablesRegexRegex = /^ROLE_(.+)_TABLES_(.+)_TABLES_REGEX$/;
+  const tablePermissionRegex = /^ROLE_(.+)_TABLES_(.+)_PERMISSION$/;
+  const tableScopeRegex = /^ROLE_(.+)_TABLES_(.+)_SCOPE$/;
+
+  const roles = [];
+  const role_connections = [];
+  const role_permissions = [];
+  const role_databases = [];
+  const role_tables = [];
+
+  // Permission name to ID mappings
+  const databasePermissionMap = {
+    view: -1,
+    read_content: -2,
+    write_data: -3,
+    run_script: -4,
+    deny: -5,
+  };
+
+  const tablePermissionMap = {
+    read: -1,
+    update_only: -2,
+    create_update_delete: -3,
+    run_script: -4,
+    deny: -5,
+  };
+
+  const tableScopeMap = {
+    all_objects: -1,
+    tables: -2,
+    views: -3,
+    tables_views_collections: -4,
+    procedures: -5,
+    functions: -6,
+    triggers: -7,
+    sql_objects: -8,
+    collections: -9,
+  };
+
+  // Collect database and table permissions data
+  const databasePermissions = {};
+  const tablePermissions = {};
+
+  // First pass: collect all database and table permission data
+  for (const key in env) {
+    const dbConnMatch = key.match(dbConnectionRegex);
+    const dbDatabasesMatch = key.match(dbDatabasesRegex);
+    const dbDatabasesRegexMatch = key.match(dbDatabasesRegexRegex);
+    const dbPermMatch = key.match(dbPermissionRegex);
+
+    const tableConnMatch = key.match(tableConnectionRegex);
+    const tableDatabasesMatch = key.match(tableDatabasesRegex);
+    const tableDatabasesRegexMatch = key.match(tableDatabasesRegexRegex);
+    const tableSchemasMatch = key.match(tableSchemasRegex);
+    const tableSchemasRegexMatch = key.match(tableSchemasRegexRegex);
+    const tableTablesMatch = key.match(tableTablesRegex);
+    const tableTablesRegexMatch = key.match(tableTablesRegexRegex);
+    const tablePermMatch = key.match(tablePermissionRegex);
+    const tableScopeMatch = key.match(tableScopeRegex);
+
+    // Database permissions
+    if (dbConnMatch) {
+      const [, roleName, permId] = dbConnMatch;
+      if (!databasePermissions[roleName]) databasePermissions[roleName] = {};
+      if (!databasePermissions[roleName][permId]) databasePermissions[roleName][permId] = {};
+      databasePermissions[roleName][permId].connection = env[key];
+    }
+    if (dbDatabasesMatch) {
+      const [, roleName, permId] = dbDatabasesMatch;
+      if (!databasePermissions[roleName]) databasePermissions[roleName] = {};
+      if (!databasePermissions[roleName][permId]) databasePermissions[roleName][permId] = {};
+      databasePermissions[roleName][permId].databases = env[key]?.replace(/\|/g, '\n');
+    }
+    if (dbDatabasesRegexMatch) {
+      const [, roleName, permId] = dbDatabasesRegexMatch;
+      if (!databasePermissions[roleName]) databasePermissions[roleName] = {};
+      if (!databasePermissions[roleName][permId]) databasePermissions[roleName][permId] = {};
+      databasePermissions[roleName][permId].databasesRegex = env[key];
+    }
+    if (dbPermMatch) {
+      const [, roleName, permId] = dbPermMatch;
+      if (!databasePermissions[roleName]) databasePermissions[roleName] = {};
+      if (!databasePermissions[roleName][permId]) databasePermissions[roleName][permId] = {};
+      databasePermissions[roleName][permId].permission = env[key];
+    }
+
+    // Table permissions
+    if (tableConnMatch) {
+      const [, roleName, permId] = tableConnMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].connection = env[key];
+    }
+    if (tableDatabasesMatch) {
+      const [, roleName, permId] = tableDatabasesMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].databases = env[key]?.replace(/\|/g, '\n');
+    }
+    if (tableDatabasesRegexMatch) {
+      const [, roleName, permId] = tableDatabasesRegexMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].databasesRegex = env[key];
+    }
+    if (tableSchemasMatch) {
+      const [, roleName, permId] = tableSchemasMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].schemas = env[key];
+    }
+    if (tableSchemasRegexMatch) {
+      const [, roleName, permId] = tableSchemasRegexMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].schemasRegex = env[key];
+    }
+    if (tableTablesMatch) {
+      const [, roleName, permId] = tableTablesMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].tables = env[key]?.replace(/\|/g, '\n');
+    }
+    if (tableTablesRegexMatch) {
+      const [, roleName, permId] = tableTablesRegexMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].tablesRegex = env[key];
+    }
+    if (tablePermMatch) {
+      const [, roleName, permId] = tablePermMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].permission = env[key];
+    }
+    if (tableScopeMatch) {
+      const [, roleName, permId] = tableScopeMatch;
+      if (!tablePermissions[roleName]) tablePermissions[roleName] = {};
+      if (!tablePermissions[roleName][permId]) tablePermissions[roleName][permId] = {};
+      tablePermissions[roleName][permId].scope = env[key];
+    }
+  }
+
+  // Second pass: process roles, connections, and permissions
+  for (const key in env) {
+    const connMatch = key.match(connectionsRegex);
+    const permMatch = key.match(permissionsRegex);
+    if (connMatch) {
+      const roleName = connMatch[1];
+      let role = roles.find(r => r.name === roleName);
+      if (!role) {
+        role = {
+          id: roles.length + 1,
+          name: roleName,
+          import_source_id: -1,
+        };
+        roles.push(role);
+      }
+      const connIds = env[key]
+        .split(',')
+        .map(id => id.trim())
+        .filter(id => id.length > 0);
+      for (const connId of connIds) {
+        const dbId = connectionEnvIdToDbId[connId];
+        if (dbId) {
+          role_connections.push({
+            role_id: role.id,
+            connection_id: dbId,
+            import_source_id: -1,
+          });
+        }
+      }
+    }
+    if (permMatch) {
+      const roleName = permMatch[1];
+      let role = roles.find(r => r.name === roleName);
+      if (!role) {
+        role = {
+          id: roles.length + 1,
+          name: roleName,
+          import_source_id: -1,
+        };
+        roles.push(role);
+      }
+      const permissions = env[key]
+        .split(',')
+        .map(p => p.trim())
+        .filter(p => p.length > 0);
+      for (const permission of permissions) {
+        role_permissions.push({
+          role_id: role.id,
+          permission,
+          import_source_id: -1,
+        });
+      }
+    }
+  }
+
+  // Process database permissions
+  for (const roleName in databasePermissions) {
+    let role = roles.find(r => r.name === roleName);
+    if (!role) {
+      role = {
+        id: roles.length + 1,
+        name: roleName,
+        import_source_id: -1,
+      };
+      roles.push(role);
+    }
+
+    for (const permId in databasePermissions[roleName]) {
+      const perm = databasePermissions[roleName][permId];
+      if (perm.connection && perm.permission) {
+        const dbId = connectionEnvIdToDbId[perm.connection];
+        const permissionId = databasePermissionMap[perm.permission];
+        if (dbId && permissionId) {
+          role_databases.push({
+            role_id: role.id,
+            connection_id: dbId,
+            database_names_list: perm.databases || null,
+            database_names_regex: perm.databasesRegex || null,
+            database_permission_role_id: permissionId,
+            id_original: permId,
+            import_source_id: -1,
+          });
+        }
+      }
+    }
+  }
+
+  // Process table permissions
+  for (const roleName in tablePermissions) {
+    let role = roles.find(r => r.name === roleName);
+    if (!role) {
+      role = {
+        id: roles.length + 1,
+        name: roleName,
+        import_source_id: -1,
+      };
+      roles.push(role);
+    }
+
+    for (const permId in tablePermissions[roleName]) {
+      const perm = tablePermissions[roleName][permId];
+      if (perm.connection && perm.permission) {
+        const dbId = connectionEnvIdToDbId[perm.connection];
+        const permissionId = tablePermissionMap[perm.permission];
+        const scopeId = tableScopeMap[perm.scope || 'all_objects'];
+        if (dbId && permissionId && scopeId) {
+          role_tables.push({
+            role_id: role.id,
+            connection_id: dbId,
+            database_names_list: perm.databases || null,
+            database_names_regex: perm.databasesRegex || null,
+            schema_names_list: perm.schemas || null,
+            schema_names_regex: perm.schemasRegex || null,
+            table_names_list: perm.tables || null,
+            table_names_regex: perm.tablesRegex || null,
+            table_permission_role_id: permissionId,
+            table_permission_scope_id: scopeId,
+            id_original: permId,
+            import_source_id: -1,
+          });
+        }
+      }
+    }
+  }
+
+  if (connections.length == 0 && roles.length == 0) {
+    return null;
+  }
+
+  return {
+    connections,
+    roles,
+    role_connections,
+    role_permissions,
+    role_databases,
+    role_tables,
+  };
+}
+
+function createStorageFromEnvReplicatorItems(importEntities) {
+  return [
+    {
+      name: 'connections',
+      findExisting: true,
+      createNew: true,
+      updateExisting: true,
+      matchColumns: ['id_original', 'import_source_id'],
+      deleteMissing: true,
+      deleteRestrictionColumns: ['import_source_id'],
+      skipUpdateColumns: ['conid'],
+      jsonArray: importEntities.connections,
+    },
+    {
+      name: 'roles',
+      findExisting: true,
+      createNew: true,
+      updateExisting: true,
+      matchColumns: ['name', 'import_source_id'],
+      deleteMissing: true,
+      deleteRestrictionColumns: ['import_source_id'],
+      jsonArray: importEntities.roles,
+    },
+    {
+      name: 'role_connections',
+      findExisting: true,
+      createNew: true,
+      updateExisting: false,
+      deleteMissing: true,
+      matchColumns: ['role_id', 'connection_id', 'import_source_id'],
+      jsonArray: importEntities.role_connections,
+      deleteRestrictionColumns: ['import_source_id'],
+    },
+    {
+      name: 'role_permissions',
+      findExisting: true,
+      createNew: true,
+      updateExisting: false,
+      deleteMissing: true,
+      matchColumns: ['role_id', 'permission', 'import_source_id'],
+      jsonArray: importEntities.role_permissions,
+      deleteRestrictionColumns: ['import_source_id'],
+    },
+    {
+      name: 'role_databases',
+      findExisting: true,
+      createNew: true,
+      updateExisting: true,
+      deleteMissing: true,
+      matchColumns: ['role_id', 'id_original', 'import_source_id'],
+      jsonArray: importEntities.role_databases,
+      deleteRestrictionColumns: ['import_source_id'],
+    },
+    {
+      name: 'role_tables',
+      findExisting: true,
+      createNew: true,
+      updateExisting: true,
+      deleteMissing: true,
+      matchColumns: ['role_id', 'id_original', 'import_source_id'],
+      jsonArray: importEntities.role_tables,
+      deleteRestrictionColumns: ['import_source_id'],
+    },
+  ];
+}
+
+module.exports = {
+  extractConnectionsFromEnv,
+  extractImportEntitiesFromEnv,
+  createStorageFromEnvReplicatorItems,
+};
@@ -1,21 +1,29 @@
-const getDiagramExport = (html, css, themeType, themeClassName, watermark) => {
+const getDiagramExport = (html, css, themeType, themeVariables, watermark) => {
  const watermarkHtml = watermark
    ? `
-        <div style="position: fixed; bottom: 0; right: 0; padding: 5px; font-size: 12px; color: var(--theme-font-2); background-color: var(--theme-bg-2); border-top-left-radius: 5px; border: 1px solid var(--theme-border);">
+        <div style="position: fixed; bottom: 0; right: 0; padding: 5px; font-size: 12px; color: var(--theme-generic-font-grayed); background-color: var(--theme-datagrid-background); border-top-left-radius: 5px; border: var(--theme-card-border);">
        ${watermark}
      </div>
  `
    : '';
+  
+  // Convert theme variables object to CSS custom properties
+  const themeVariablesCSS = themeVariables 
+    ? `:root {\n${Object.entries(themeVariables).map(([key, value]) => `  ${key}: ${value};`).join('\n')}\n}`
+    : '';
+  
  return `<html>
  <meta charset='utf-8'>
  
  <head>
      <style>
+        ${themeVariablesCSS}
+        
        ${css}

        body {
-          background: var(--theme-bg-1);
-          color: var(--theme-font-1);
+          background: var(--theme-datagrid-background);
+          color: var(--theme-generic-font);
        }
      </style>

@@ -55,7 +63,7 @@ const getDiagramExport = (html, css, themeType, themeClassName, watermark) => {
      </script>
  </head>
  
-  <body class='${themeType == 'dark' ? 'theme-type-dark' : 'theme-type-light'} ${themeClassName}' style='user-select:none; cursor:pointer'>
+  <body class='${themeType == 'dark' ? 'theme-type-dark' : 'theme-type-light'}' style='user-select:none; cursor:pointer'>
      ${html}
      ${watermarkHtml}
  </body>
@@ -96,8 +96,9 @@ async function loadFilePermissionsFromRequest(req) {
 }

 function matchDatabasePermissionRow(conid, database, permissionRow) {
-  if (permissionRow.connection_id) {
-    if (conid != permissionRow.connection_id) {
+  const connectionIdentifier = permissionRow.connection_conid ?? permissionRow.connection_id;
+  if (connectionIdentifier) {
+    if (conid != connectionIdentifier) {
      return false;
    }
  }
@@ -1,5 +1,5 @@
 {
-  "version": "6.0.0-alpha.1",
+  "version": "7.0.0-alpha.1",
  "name": "dbgate-datalib",
  "main": "lib/index.js",
  "typings": "lib/index.d.ts",
@@ -19,14 +19,14 @@
  ],
  "dependencies": {
    "date-fns": "^4.1.0",
-    "dbgate-filterparser": "^6.0.0-alpha.1",
-    "dbgate-sqltree": "^6.0.0-alpha.1",
-    "dbgate-tools": "^6.0.0-alpha.1",
+    "dbgate-filterparser": "^7.0.0-alpha.1",
+    "dbgate-sqltree": "^7.0.0-alpha.1",
+    "dbgate-tools": "^7.0.0-alpha.1",
    "uuid": "^3.4.0"
  },
  "devDependencies": {
    "@types/node": "^13.7.0",
-    "dbgate-types": "^6.0.0-alpha.1",
+    "dbgate-types": "^7.0.0-alpha.1",
    "jest": "^28.1.3",
    "ts-jest": "^28.0.7",
    "typescript": "^4.4.3"
@@ -0,0 +1,210 @@
+import { DatabaseMethodCallItem, DatabaseMethodCallList } from 'dbgate-types';
+
+export interface ChangeSetRedis_String {
+  key: string;
+  type: 'string';
+  value: string;
+}
+
+export interface ChangeSetRedis_JSON {
+  key: string;
+  type: 'json';
+  value: string;
+}
+
+export interface ChangeSetRedis_Hash {
+  key: string;
+  type: 'hash';
+  inserts: { key: string; value: string; ttl: number; editorRowId: string }[];
+  updates: { key: string; value: string; ttl: number }[];
+  deletes: string[];
+}
+
+export interface ChangeSetRedis_List {
+  key: string;
+  type: 'list';
+  inserts: { value: string; editorRowId: string }[];
+  updates: { index: number; value: string }[];
+  deletes: number[];
+}
+
+export interface ChangeSetRedis_Set {
+  key: string;
+  type: 'set';
+  inserts: { value: string; editorRowId: string }[];
+  deletes: string[];
+}
+
+export interface ChangeSetRedis_ZSet {
+  key: string;
+  type: 'zset';
+  inserts: { member: string; score: number; editorRowId: string }[];
+  updates: { member: string; score: number }[];
+  deletes: string[];
+}
+
+export interface ChangeSetRedis_Stream {
+  key: string;
+  type: 'stream';
+  generatedId?: string;
+  inserts: { field: string; value: string; editorRowId: string }[];
+  deletes: string[];
+}
+
+export type ChangeSetRedisType =
+  | ChangeSetRedis_String
+  | ChangeSetRedis_JSON
+  | ChangeSetRedis_Hash
+  | ChangeSetRedis_List
+  | ChangeSetRedis_Set
+  | ChangeSetRedis_ZSet
+  | ChangeSetRedis_Stream;
+
+export interface ChangeSetRedis {
+  changes: ChangeSetRedisType[];
+}
+
+export function redisChangeSetToRedisCommands(changeSet: ChangeSetRedis): DatabaseMethodCallList {
+  const calls: DatabaseMethodCallItem[] = [];
+
+  for (const change of changeSet.changes) {
+    if (change.type === 'string') {
+      calls.push({
+        method: 'SET',
+        args: [change.key, change.value],
+      });
+    } else if (change.type === 'json') {
+      calls.push({
+        method: 'JSON.SET',
+        args: [change.key, '$', change.value],
+      });
+    } else if (change.type === 'hash') {
+      if (change.updates && Array.isArray(change.updates)) {
+        for (const update of change.updates) {
+          calls.push({
+            method: 'HSET',
+            args: [change.key, update.key, update.value],
+          });
+
+          if (update.ttl !== undefined && update.ttl !== null && update.ttl !== -1) {
+            calls.push({
+              method: 'HEXPIRE',
+              args: [change.key, update.ttl, 'FIELDS', 1, update.key],
+            });
+          }
+        }
+      }
+
+      if (change.inserts && Array.isArray(change.inserts)) {
+        for (const insert of change.inserts) {
+          calls.push({
+            method: 'HSET',
+            args: [change.key, insert.key, insert.value],
+          });
+
+          if (insert.ttl !== undefined && insert.ttl !== null && insert.ttl !== -1) {
+            calls.push({
+              method: 'HEXPIRE',
+              args: [change.key, insert.ttl, 'FIELDS', 1, insert.key],
+            });
+          }
+        }
+      }
+
+      if (change.deletes && Array.isArray(change.deletes)) {
+        for (const delKey of change.deletes) {
+          calls.push({
+            method: 'HDEL',
+            args: [change.key, delKey],
+          });
+        }
+      }
+    } else if (change.type === 'zset') {
+      if (change.updates && Array.isArray(change.updates)) {
+        for (const update of change.updates) {
+          calls.push({
+            method: 'ZADD',
+            args: [change.key, update.score, update.member],
+          });
+        }
+      }
+
+      if (change.inserts && Array.isArray(change.inserts)) {
+        for (const insert of change.inserts) {
+          calls.push({
+            method: 'ZADD',
+            args: [change.key, insert.score, insert.member],
+          });
+        }
+      }
+
+      if (change.deletes && Array.isArray(change.deletes)) {
+        for (const delMember of change.deletes) {
+          calls.push({
+            method: 'ZREM',
+            args: [change.key, delMember],
+          });
+        }
+      }
+    } else if (change.type === 'list') {
+      if (change.updates && Array.isArray(change.updates)) {
+        for (const update of change.updates) {
+          calls.push({
+            method: 'LSET',
+            args: [change.key, update.index, update.value],
+          });
+        }
+      }
+
+      if (change.inserts && Array.isArray(change.inserts)) {
+        for (const insert of change.inserts) {
+          calls.push({
+            method: 'RPUSH',
+            args: [change.key, insert.value],
+          });
+        }
+      }
+    } else if (change.type === 'set') {
+      if (change.inserts && Array.isArray(change.inserts)) {
+        for (const insert of change.inserts) {
+          calls.push({
+            method: 'SADD',
+            args: [change.key, insert.value],
+          });
+        }
+      }
+
+      if (change.deletes && Array.isArray(change.deletes)) {
+        for (const delValue of change.deletes) {
+          calls.push({
+            method: 'SREM',
+            args: [change.key, delValue],
+          });
+        }
+      }
+    } else if (change.type === 'stream') {
+      if (change.inserts.length > 0) {
+        calls.push({
+          method: 'XADD',
+          args: [change.key, change.generatedId || '*', ...change.inserts.flatMap(f => [f.field, f.value])],
+        });
+      }
+      for (const delValue of change.deletes) {
+        calls.push({
+          method: 'XDEL',
+          args: [change.key, delValue],
+        });
+      }
+    }
+  }
+
+  return { calls };
+}
+
+export function convertRedisCallListToScript(callList: DatabaseMethodCallList): string {
+  let script = '';
+  for (const call of callList.calls) {
+    script += `${call.method} ${call.args.map(arg => (typeof arg === 'string' ? `"${arg}"` : arg)).join(' ')}\n`;
+  }
+  return script;
+}
@@ -84,8 +84,12 @@ export function analyseCollectionDisplayColumns(rows, display) {
    if (res.find(x => x.uniqueName == added)) continue;
    res.push(getDisplayColumn([], added, display));
  }
+  
+  // Use driver-specific column sorting if available
+  const sortedColumns = display?.driver?.sortCollectionDisplayColumns ? display.driver.sortCollectionDisplayColumns(res) : res;
+  
  return (
-    res.map(col => ({
+    sortedColumns.map(col => ({
      ...col,
      isChecked: display.isColumnChecked(col),
    })) || []
@@ -23,6 +23,7 @@ export interface DataReplicatorItem {
  deleteMissing: boolean;
  deleteRestrictionColumns: string[];
  matchColumns: string[];
+  skipUpdateColumns?: string[];
 }

 export interface DataReplicatorOptions {
@@ -151,7 +152,12 @@ class ReplicatorItemHolder {
        chunk,
        this.table.columns.map(x => x.columnName)
      ),
-      [this.autoColumn, ...this.backReferences.map(x => x.columnName), ...this.references.map(x => x.columnName)]
+      [
+        this.autoColumn,
+        ...this.backReferences.map(x => x.columnName),
+        ...this.references.map(x => x.columnName),
+        ...(this.item.skipUpdateColumns || []),
+      ]
    );

    return res;
@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import type { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types';
+import { evalFilterBehaviour } from 'dbgate-tools';
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import { GridConfig, GridCache } from './GridConfig';
 import { FreeTableModel } from './FreeTableModel';
@@ -11,13 +12,15 @@ export class FreeTableGridDisplay extends GridDisplay {
    config: GridConfig,
    setConfig: ChangeConfigFunc,
    cache: GridCache,
-    setCache: ChangeCacheFunc
+    setCache: ChangeCacheFunc,
+    options: { filterable?: boolean } = {}
  ) {
    super(config, setConfig, cache, setCache);
    this.columns = model?.structure?.__isDynamicStructure
      ? analyseCollectionDisplayColumns(model?.rows, this)
      : this.getDisplayColumns(model);
-    this.filterable = false;
+    this.filterable = options.filterable ?? false;
+    this.filterBehaviourOverride = evalFilterBehaviour;
    this.sortable = false;
  }

@@ -451,7 +451,7 @@ export abstract class GridDisplay {
      ...cfg,
      filters: _.omit(cfg.filters, [uniqueName]),
      formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName),
-      disabledFilterColumns: (cfg.disabledFilterColumns).filter(x => x != uniqueName),
+      disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName),
    }));
    this.reload();
  }
@@ -541,6 +541,7 @@ export abstract class GridDisplay {
      const column = (this.baseTable || this.baseView)?.columns?.find(x => x.columnName == uniqueName);
      if (isTypeLogical(column?.dataType)) return 'COUNT DISTINCT';
      if (column?.autoIncrement) return 'COUNT';
+      if (this.driver?.dialect?.disableGroupingForDataType?.(column?.dataType)) return 'NULL';
      return 'MAX';
    }
    return null;
@@ -25,3 +25,4 @@ export * from './CustomGridDisplay';
 export * from './ScriptDrivedDeployer';
 export * from './chartDefinitions';
 export * from './chartProcessor';
+export * from './ChangeSetRedis';
@@ -1,5 +1,5 @@
 # dbmodel
-Deploy, load or build script from model of SQL database. Can be used as command-line tool. Uses [DbGate](https://dbgate.org) tooling and plugins for connecting many different databases.
+Deploy, load or build script from model of SQL database. Can be used as command-line tool. Uses [DbGate](www.dbgate.io) tooling and plugins for connecting many different databases.

 If you want to use this tool from JavaScript interface, please use [dbgate-api](https://www.npmjs.com/package/dbgate-api) package.

@@ -1,7 +1,7 @@
 {
  "name": "dbmodel",
-  "version": "6.0.0-alpha.1",
-  "homepage": "https://dbgate.org/",
+  "version": "7.0.0-alpha.1",
+  "homepage": "https://www.dbgate.io/",
  "repository": {
    "type": "git",
    "url": "https://github.com/dbgate/dbgate.git"
@@ -30,16 +30,16 @@
  ],
  "dependencies": {
    "commander": "^10.0.0",
-    "dbgate-api": "^6.0.0-alpha.1",
-    "dbgate-plugin-csv": "^6.0.0-alpha.1",
-    "dbgate-plugin-excel": "^6.0.0-alpha.1",
-    "dbgate-plugin-mongo": "^6.0.0-alpha.1",
-    "dbgate-plugin-mssql": "^6.0.0-alpha.1",
-    "dbgate-plugin-mysql": "^6.0.0-alpha.1",
-    "dbgate-plugin-postgres": "^6.0.0-alpha.1",
-    "dbgate-plugin-xml": "^6.0.0-alpha.1",
-    "dbgate-plugin-oracle": "^6.0.0-alpha.1",
-    "dbgate-web": "^6.0.0-alpha.1",
+    "dbgate-api": "^7.0.0-alpha.1",
+    "dbgate-plugin-csv": "^7.0.0-alpha.1",
+    "dbgate-plugin-excel": "^7.0.0-alpha.1",
+    "dbgate-plugin-mongo": "^7.0.0-alpha.1",
+    "dbgate-plugin-mssql": "^7.0.0-alpha.1",
+    "dbgate-plugin-mysql": "^7.0.0-alpha.1",
+    "dbgate-plugin-postgres": "^7.0.0-alpha.1",
+    "dbgate-plugin-xml": "^7.0.0-alpha.1",
+    "dbgate-plugin-oracle": "^7.0.0-alpha.1",
+    "dbgate-web": "^7.0.0-alpha.1",
    "dotenv": "^16.0.0",
    "pinomin": "^1.0.5"
  }
@@ -1,5 +1,5 @@
 {
-  "version": "6.0.0-alpha.1",
+  "version": "7.0.0-alpha.1",
  "name": "dbgate-filterparser",
  "main": "lib/index.js",
  "typings": "lib/index.d.ts",
@@ -17,7 +17,7 @@
    "lib"
  ],
  "devDependencies": {
-    "dbgate-types": "^6.0.0-alpha.1",
+    "dbgate-types": "^7.0.0-alpha.1",
    "@types/jest": "^25.1.4",
    "@types/node": "^13.7.0",
    "jest": "^28.1.3",
@@ -26,7 +26,7 @@
  },
  "dependencies": {
    "@types/parsimmon": "^1.10.1",
-    "dbgate-tools": "^6.0.0-alpha.1",
+    "dbgate-tools": "^7.0.0-alpha.1",
    "lodash": "^4.17.21",
    "date-fns": "^4.1.0",
    "moment": "^2.24.0",
@@ -16,11 +16,51 @@ function getDateStringWithoutTimeZone(dateString) {

 export function getFilterValueExpression(value, dataType?) {
  if (value == null) return 'NULL';
-  if (isTypeDateTime(dataType)) return format(toDate(getDateStringWithoutTimeZone(value)), 'yyyy-MM-dd HH:mm:ss');
+  if (isTypeDateTime(dataType)) {
+    // Check for year as number (GROUP:YEAR)
+    if (typeof value === 'number' && Number.isInteger(value) && value >= 1000 && value <= 9999) {
+      return value.toString();
+    }
+    
+    if (_isString(value)) {
+      // Year only
+      if (/^\d{4}$/.test(value)) {
+        return value;
+      }
+      
+      // Year-month: validate month is in range 01-12
+      const yearMonthMatch = value.match(/^(\d{4})-(\d{1,2})$/);
+      if (yearMonthMatch) {
+        const month = parseInt(yearMonthMatch[2], 10);
+        if (month >= 1 && month <= 12) {
+          return value;
+        }
+      }
+      
+      // Year-month-day: validate month and day
+      const yearMonthDayMatch = value.match(/^(\d{4})-(\d{1,2})-(\d{1,2})$/);
+      if (yearMonthDayMatch) {
+        const month = parseInt(yearMonthDayMatch[2], 10);
+        const day = parseInt(yearMonthDayMatch[3], 10);
+        
+        // Quick validation: month 1-12, day 1-31
+        if (month >= 1 && month <= 12 && day >= 1 && day <= 31) {
+          // Construct a date to verify it's actually valid (e.g., reject 2024-02-30)
+          const dateStr = `${yearMonthDayMatch[1]}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+          const date = toDate(dateStr);
+          if (!isNaN(date.getTime())) {
+            return value;
+          }
+        }
+      }
+    }
+    return format(toDate(getDateStringWithoutTimeZone(value)), 'yyyy-MM-dd HH:mm:ss');
+  }
  if (value === true) return 'TRUE';
  if (value === false) return 'FALSE';
  if (value.$oid) return `ObjectId("${value.$oid}")`;
  if (value.$bigint) return value.$bigint;
+  if (value.$decimal) return value.$decimal;
  if (value.type == 'Buffer' && Array.isArray(value.data)) {
    return '0x' + arrayToHexString(value.data);
  }
@@ -0,0 +1 @@
+lib
@@ -0,0 +1,7 @@
+# dbgate-rest
+
+REST API support for DbGate
+
+## Installation
+
+yarn add dbgate-rest
@@ -0,0 +1,6 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  moduleFileExtensions: ['ts', 'js'],
+  reporters: ['default', 'github-actions'],
+};
@@ -0,0 +1,42 @@
+{
+  "version": "7.0.0-alpha.1",
+  "name": "dbgate-rest",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "homepage": "https://www.dbgate.io/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dbgate/dbgate.git"
+  },
+  "author": "Jan Prochazka",
+  "license": "GPL-3.0",
+  "keywords": [
+    "sql",
+    "dbgate"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "start": "tsc --watch",
+    "prepublishOnly": "yarn build",
+    "test": "jest",
+    "test:ci": "jest --json --outputFile=result.json --testLocationInResults"
+  },
+  "files": [
+    "lib"
+  ],
+  "devDependencies": {
+    "@types/node": "^13.7.0",
+    "dbgate-types": "^7.0.0-alpha.1",
+    "jest": "^28.1.3",
+    "ts-jest": "^28.0.7",
+    "typescript": "^4.4.3"
+  },
+  "dependencies": {
+    "dbgate-tools": "^7.0.0-alpha.1",
+    "lodash": "^4.17.21",
+    "openapi-types": "^12.1.3",
+    "pinomin": "^1.0.5",
+    "uuid": "^3.4.0",
+    "js-yaml": "^4.1.0"
+  }
+}
@@ -0,0 +1,90 @@
+type FlatObject = Record<string, any>;
+
+function isPlainObject(value: any): value is Record<string, any> {
+	return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+function flattenValue(value: any) {
+	if (Array.isArray(value)) {
+		const primitiveArray = value.every(item => item == null || typeof item !== 'object');
+		if (primitiveArray) {
+			return value.join(', ');
+		}
+		return JSON.stringify(value);
+	}
+	return value;
+}
+
+function flattenObject(obj: Record<string, any>, prefix = '', out: FlatObject = {}, visited = new WeakSet()): FlatObject {
+	if (visited.has(obj)) return out;
+	visited.add(obj);
+
+	for (const [key, value] of Object.entries(obj)) {
+		const nextKey = prefix ? `${prefix}.${key}` : key;
+
+		if (isPlainObject(value)) {
+			flattenObject(value, nextKey, out, visited);
+			continue;
+		}
+
+		out[nextKey] = flattenValue(value);
+	}
+
+	return out;
+}
+
+function unwrapArrayItem(item: any) {
+	if (isPlainObject(item) && isPlainObject(item.node)) {
+		return item.node;
+	}
+	return item;
+}
+
+function collectArrayCandidates(
+	value: any,
+	set: Set<any[]>,
+	visited = new WeakSet(),
+	depth = 0
+): void {
+	if (depth > 10) return;
+	if (Array.isArray(value)) {
+		set.add(value);
+		return;
+	}
+
+	if (!isPlainObject(value)) return;
+	if (visited.has(value)) return;
+	visited.add(value);
+
+	if (Array.isArray(value.edges)) set.add(value.edges);
+	if (Array.isArray(value.nodes)) set.add(value.nodes);
+	if (Array.isArray(value.items)) set.add(value.items);
+
+	for (const nested of Object.values(value)) {
+		collectArrayCandidates(nested, set, visited, depth + 1);
+	}
+}
+
+function findUniqueArrayCandidate(value: any): any[] | null {
+	if (Array.isArray(value)) return value;
+
+	const candidates = new Set<any[]>();
+	collectArrayCandidates(value, candidates);
+
+	if (candidates.size !== 1) return null;
+	return candidates.values().next().value ?? null;
+}
+
+export function arrayifyToFlatObjects(input: any): FlatObject[] | undefined {
+	const arrayCandidate = findUniqueArrayCandidate(input);
+
+	if (!arrayCandidate) return undefined;
+
+	return arrayCandidate.map(item => {
+		const unwrapped = unwrapArrayItem(item);
+		if (isPlainObject(unwrapped)) {
+			return flattenObject(unwrapped);
+		}
+		return { value: unwrapped };
+	});
+}
--- a/Show More
+++ b/Show More