v7.0.0-premium-beta.5

Feature/redis gui refactor

.github/workflows/build-app-beta.yaml

@@ -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: |

.github/workflows/build-app-check.yaml

@@ -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: |

.github/workflows/build-app-pro-beta.yaml

@@ -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: 626a30d67f40e910e8c3ed89ec34d5aa58c1f7e2
+          ref: a5f52768cea7e98cae5e5b1f5fef3c47a475b8a6
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/build-app-pro.yaml

@@ -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: 626a30d67f40e910e8c3ed89ec34d5aa58c1f7e2
+          ref: a5f52768cea7e98cae5e5b1f5fef3c47a475b8a6
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/build-app.yaml

@@ -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: |

.github/workflows/build-cloud-pro.yaml

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

.github/workflows/build-docker-pro.yaml

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

.github/workflows/build-npm-pro.yaml

@@ -35,7 +35,7 @@ jobs:
           repository: dbgate/dbgate-pro
           token: ${{ secrets.GH_TOKEN }}
           path: dbgate-pro
-          ref: 626a30d67f40e910e8c3ed89ec34d5aa58c1f7e2
+          ref: a5f52768cea7e98cae5e5b1f5fef3c47a475b8a6
       - name: Merge dbgate/dbgate-pro
         run: |
           mkdir ../dbgate-pro

.github/workflows/e2e-pro.yaml

@@ -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: 626a30d67f40e910e8c3ed89ec34d5aa58c1f7e2
+          ref: a5f52768cea7e98cae5e5b1f5fef3c47a475b8a6
       - 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

.github/workflows/run-tests.yaml

@@ -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
@@ -42,24 +45,6 @@ jobs:
         run: |
           cd packages/tools
           yarn test:ci
-      - uses: tanmen/jest-reporter@v1
-        if: always()
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          result-file: integration-tests/result.json
-          action-name: Integration tests
-      - uses: tanmen/jest-reporter@v1
-        if: always()
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          result-file: packages/filterparser/result.json
-          action-name: Filter parser test results
-      - uses: tanmen/jest-reporter@v1
-        if: always()
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          result-file: packages/datalib/result.json
-          action-name: Datalib (perspectives) test results
     services:
       postgres-integr:
         image: postgres

CHANGELOG.md

@@ -8,7 +8,45 @@ Builds:
  - linux - application for linux
  - win - application for Windows
 
-## 6.7.1 - not released yet
+## 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)
 - ADDED: Option to detect language from browser settings in web version
@@ -17,6 +55,9 @@ Builds:
 - ADDED: Show table size #552
 - ADDED: Sort tables by size and by row count
 - ADDED: Connect to Legacy MongoDB (Premium) #540
+- FIXED: Fixed problems in saving team files in Team Premium edition
+- CHANGED: Files are by default saved to team folders in Team Premium edition
+- ADDED: Other files types supported in Team Premium edition (diagrams, query design, perspectives, import/export jobs, shell scripts, database compare jobs)
 
 ## 6.7.0
 - ADDED: Added localization support, now you can use DbGate in multiple languages (French, Spanish, German, Czech, Slovak, Simplified Chinese) #347 #705 #939 #1079
@@ -62,7 +103,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
 

app/src/mainMenuDefinition.js

@@ -76,6 +76,8 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
       { command: 'app.zoomIn', hideDisabled: true },
       { command: 'app.zoomOut', hideDisabled: true },
       { command: 'app.zoomReset', hideDisabled: true },
+      { divider: true },
+      { command: 'app.showLogs', hideDisabled: true },
     ],
   },
   {
@@ -95,6 +97,8 @@ module.exports = ({ editMenu, isMac }, currentTranslations = null) => [
       { divider: true },
       { command: 'app.exportConnections', hideDisabled: true },
       { command: 'app.importConnections', hideDisabled: true },
+      { divider: true },
+      { command: 'app.managePlugins', hideDisabled: true },
     ],
   },
   ...(isMac

e2e-tests/cypress.config.js

@@ -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

e2e-tests/cypress/e2e/add-connection.cy.js

@@ -113,6 +113,18 @@ describe('Add connection', () => {
     cy.contains('performance_schema');
   });
 
+  it('Plugin tab', () => {
+    cy.testid('WidgetIconPanel_menu').click();
+    cy.contains('Tools').click();
+    cy.contains('Manage plugins').click();
+    cy.contains('dbgate-plugin-theme-total-white').click();
+    // text from plugin markdown
+    cy.contains('Total white theme');
+    // wait for load logos
+    cy.wait(2000);
+    cy.themeshot('view-plugin-tab');
+  });
+
   it('export connections', () => {
     cy.testid('WidgetIconPanel_menu').click();
     cy.contains('Tools').click();

e2e-tests/cypress/e2e/browse-data.cy.js

@@ -60,7 +60,7 @@ describe('Data browser data', () => {
     cy.contains('MyChinook').click();
     cy.testid('SqlObjectList_search').clear().type('album');
     cy.contains('Tables (1/11)');
-    cy.contains('347 rows, InnoDB');
+    cy.contains('347 rows, 65.5 KB, InnoDB');
     cy.testid('SqlObjectList_searchMenuDropDown').click();
     cy.contains('Column name').click();
     cy.contains('Tables (2/11)');
@@ -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');
   });
@@ -310,17 +314,6 @@ describe('Data browser data', () => {
     cy.themeshot('search-in-connections');
   });
 
-  it('Plugin tab', () => {
-    cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Manage plugins').click();
-    cy.contains('dbgate-plugin-theme-total-white').click();
-    // text from plugin markdown
-    cy.contains('Total white theme');
-    // wait for load logos
-    cy.wait(2000);
-    cy.themeshot('view-plugin-tab');
-  });
-
   it('Edit mongo data JSON', () => {
     // TODO FIX: Missing button+ctx menu Revert all changes, missing button+ctx menu add document
     // TODO: Dark theme - not visible changed and deleted document
@@ -348,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();
@@ -358,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');
   });
 
@@ -483,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');
+  });
 });

e2e-tests/cypress/e2e/charts.cy.js

@@ -110,7 +110,7 @@ describe('Charts', () => {
     cy.themeshot('new-object-window');
   });
 
-  it('Database chat - charts', () => {
+  it.skip('Database chat - charts', () => {
     cy.contains('MySql-connection').click();
     cy.contains('MyChinook').click();
     cy.testid('TabsPanel_buttonNewObject').click();
@@ -125,7 +125,7 @@ describe('Charts', () => {
     cy.themeshot('database-chat-chart');
   });
 
-  it('Database chat', () => {
+  it.skip('Database chat', () => {
     cy.contains('MySql-connection').click();
     cy.contains('MyChinook').click();
     cy.testid('TabsPanel_buttonNewObject').click();
@@ -146,7 +146,7 @@ describe('Charts', () => {
     // cy.themeshot('database-chat');
   });
 
-  it('Explain query error', () => {
+  it.skip('Explain query error', () => {
     cy.contains('MySql-connection').click();
     cy.contains('MyChinook').click();
     cy.testid('TabsPanel_buttonNewObject').click();
@@ -163,45 +163,107 @@ describe('Charts', () => {
     cy.contains('MySql-connection').click();
     cy.contains('MyChinook').click();
     cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Settings').click();
 
     cy.testid('SettingsModal_languageSelect').select('Deutsch');
     cy.testid('ConfirmModal_okButton').click();
     cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Einstellungen').click();
-    cy.contains('Lokalisierung');
+    cy.contains('Sprache');
     cy.themeshot('switch-language-de');
 
     cy.testid('SettingsModal_languageSelect').select('Français');
     cy.testid('ConfirmModal_okButton').click();
     cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Paramètres').click();
-    cy.contains('Localisation');
+    cy.contains('Langue');
     cy.themeshot('switch-language-fr');
 
     cy.testid('SettingsModal_languageSelect').select('Español');
     cy.testid('ConfirmModal_okButton').click();
     cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Configuración').click();
-    cy.contains('Localización');
+    cy.contains('Idioma');
     cy.themeshot('switch-language-es');
 
     cy.testid('SettingsModal_languageSelect').select('Čeština');
     cy.testid('ConfirmModal_okButton').click();
     cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('Nastavení').click();
-    cy.contains('Lokalizace');
+    cy.contains('Jazyk');
     cy.themeshot('switch-language-cs');
 
     cy.testid('SettingsModal_languageSelect').select('中文');
     cy.testid('ConfirmModal_okButton').click();
     cy.testid('WidgetIconPanel_settings').click();
-    cy.contains('设置').click();
-    cy.contains('本地化');
+    cy.contains('语言');
     cy.themeshot('switch-language-zh');
 
     cy.testid('SettingsModal_languageSelect').select('English');
     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');
+  });
 });

e2e-tests/cypress/e2e/multi-sql.cy.js

@@ -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) {
@@ -103,13 +105,70 @@ describe('Transactions', () => {
 
 describe('Backup table', () => {
   multiTest({ skipMongo: true }, (connectionName, databaseName, engine, options = {}) => {
+    const implicitTransactions = options.implicitTransactions ?? false;
+
     cy.contains(connectionName).click();
     if (databaseName) cy.contains(databaseName).click();
-    cy.contains('customers').rightclick();
+    cy.contains('addresses').rightclick();
     cy.contains('Create table backup').click();
     cy.testid('ConfirmSqlModal_okButton').click();
-    cy.contains('_customers').click();
-    cy.contains('Rows: 8').should('be.visible');
+    cy.testid('app-object-group-items-table-backups').contains('addresses').click();
+    cy.contains('Rows: 12').should('be.visible');
+    cy.testid('app-object-group-items-tables').contains('addresses').click();
+
+    cy.contains('Ridgewood').click();
+    cy.testid('TableDataTab_deleteSelectedRows').click();
+    cy.contains('Rosewood').click();
+    cy.testid('TableDataTab_deleteSelectedRows').click();
+
+    cy.contains('Vermont').click();
+    cy.get('body').realType('Wermont{enter}');
+
+    cy.testid('TableDataTab_insertNewRow').click();
+    cy.get('body').realType('Modranska{enter}');
+    cy.realPress(['ArrowLeft']);
+    cy.realPress(['ArrowLeft']);
+    cy.get('body').realType('13{enter}');
+    cy.realPress(['ArrowRight']);
+    cy.get('body').realType('1{enter}');
+    cy.realPress(['ArrowRight']);
+    cy.realPress(['ArrowRight']);
+    cy.realPress(['ArrowRight']);
+    cy.get('body').realType('Prague{enter}');
+    cy.realPress(['ArrowRight']);
+    cy.get('body').realType('CZ{enter}');
+    cy.realPress(['ArrowRight']);
+    cy.get('body').realType('10000{enter}');
+    cy.realPress(['ArrowRight']);
+    cy.get('body').realType('111222333{enter}');
+
+    cy.testid('TableDataTab_save').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();
+    cy.contains('restore script').click();
+    cy.contains('UPDATE'); // wait for query
+    cy.testid('QueryTab_executeButton').click();
+    cy.contains('Query execution finished');
+
+    if (implicitTransactions) {
+      cy.testid('QueryTab_commitTransactionButton').click();
+      cy.contains('Commit Transaction finished');
+    }
+
+    cy.realPress('F1');
+    cy.realType('Close all');
+    cy.realPress('Enter');
+    // cy.testid('CloseTabModal_buttonConfirm').click();
+    cy.wait(1000);
+
+    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');
+    cy.contains('Ridgewood');
+    cy.contains('Vermont');
   });
 });
 
@@ -146,13 +205,15 @@ describe('Import CSV', () => {
     cy.contains('Import').click();
 
     cy.get('input[type=file]').selectFile('cypress/fixtures/customers-20.csv', { force: true });
-    cy.contains('customers-20');
+    cy.testid('ImportExportConfigurator_tableMappingSection').contains('customers-20');
     cy.testid('ImportExportTab_preview_content').contains('50ddd99fAdF48B3').should('be.visible');
 
     cy.testid('ImportExportTab_executeButton').click();
-    cy.contains('20 rows written').should('be.visible');
+    cy.testid('ImportExportConfigurator_tableMappingSection').contains('20 rows written').should('be.visible');
 
     cy.testid('SqlObjectList_refreshButton').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');
 
@@ -178,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');
   });
@@ -197,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');
   });
 });

e2e-tests/cypress/support/commands.js

@@ -37,7 +37,7 @@ Cypress.Commands.add(
   },
   (subject, file, options) => {
     cy.window().then(win => {
-      win.__changeCurrentTheme('theme-dark');
+      win.__changeCurrentTheme('dark');
     });
 
     // cy.screenshot(`${file}-dark`, {
@@ -64,7 +64,7 @@ Cypress.Commands.add(
     // });
 
     cy.window().then(win => {
-      win.__changeCurrentTheme('theme-light');
+      win.__changeCurrentTheme('light');
     });
 
     if (subject) {

e2e-tests/package.json

@@ -10,11 +10,11 @@
     "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",
@@ -23,7 +23,6 @@
     "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",
-
     "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",
@@ -32,7 +31,6 @@
     "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",
-
     "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",
@@ -41,7 +39,6 @@
     "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:ci": "yarn test"
   },

e2e-tests/yarn.lock

@@ -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"

integration-tests/__tests__/alter-table.spec.js

@@ -12,6 +12,7 @@ const {
 } = require('dbgate-tools');
 
 function pickImportantTableInfo(engine, table) {
+  if (!table) return table;
   const props = ['columnName', 'defaultValue'];
   if (!engine.skipNullability) props.push('notNull');
   if (!engine.skipAutoIncrement) props.push('autoIncrement');
@@ -25,6 +26,15 @@ function pickImportantTableInfo(engine, table) {
       .map(props =>
         _.omitBy(props, (v, k) => k == 'defaultValue' && v == 'NULL' && engine.setNullDefaultInsteadOfDrop)
       ),
+
+      // 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 })),
+      })),
   };
 }
 
@@ -33,7 +43,7 @@ function checkTableStructure(engine, t1, t2) {
   expect(pickImportantTableInfo(engine, t1)).toEqual(pickImportantTableInfo(engine, t2));
 }
 
-async function testTableDiff(engine, conn, driver, mangle) {
+async function testTableDiff(engine, conn, driver, mangle, changedTable = 't1') {
   const initQuery = formatQueryWithoutParams(driver, `create table ~t0 (~id int not null primary key)`);
   await driver.query(conn, transformSqlForEngine(engine, initQuery));
 
@@ -68,17 +78,39 @@ async function testTableDiff(engine, conn, driver, mangle) {
     await driver.query(conn, transformSqlForEngine(engine, query));
   }
 
-  const tget = x => x.tables.find(y => y.pureName == 't1');
-  const structure1 = generateDbPairingId(extendDatabaseInfo(await driver.analyseFull(conn)));
+  if (!engine.skipReferences) {
+    const query = formatQueryWithoutParams(
+      driver,
+      `create table ~t3 (~id int not null primary key, ~fkval int ${
+        driver.dialect.implicitNullDeclaration ? '' : 'null'
+      })`
+    );
+
+    await driver.query(conn, transformSqlForEngine(engine, query));
+  }
+
+  const tget = x => x?.tables?.find(y => y.pureName == changedTable);
+  const structure1Source = await driver.analyseFull(conn);
+  const structure1 = generateDbPairingId(extendDatabaseInfo(structure1Source));
   let structure2 = _.cloneDeep(structure1);
   mangle(tget(structure2));
   structure2 = extendDatabaseInfo(structure2);
 
   const { sql } = getAlterTableScript(tget(structure1), tget(structure2), {}, structure1, structure2, driver);
+
+  // sleep 1s - some engines have update datetime precision only to seconds
+  await new Promise(resolve => setTimeout(resolve, 1000));
+
   console.log('RUNNING ALTER SQL', driver.engine, ':', sql);
 
   await driver.script(conn, sql);
 
+  // TODO:
+  // if (!engine.skipIncrementalAnalysis) {
+  //   const structure2RealIncremental = await driver.analyseIncremental(conn, structure1Source);
+  //   checkTableStructure(engine, tget(structure2RealIncremental), tget(structure2));
+  // }
+
   const structure2Real = extendDatabaseInfo(await driver.analyseFull(conn));
 
   checkTableStructure(engine, tget(structure2Real), tget(structure2));
@@ -87,6 +119,7 @@ async function testTableDiff(engine, conn, driver, mangle) {
 
 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'];
@@ -150,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(
@@ -173,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)
+          }));
+        }
       );
     })
   );
@@ -214,6 +265,48 @@ describe('Alter table', () => {
     })
   );
 
+  test.each(engines.filter(x => !x.skipReferences).map(engine => [engine.label, engine]))(
+    'Drop FK - %s',
+    testWrapper(async (conn, driver, engine) => {
+      await testTableDiff(
+        engine,
+        conn,
+        driver,
+        tbl => {
+          tbl.foreignKeys = [];
+        },
+        't2'
+      );
+    })
+  );
+
+  test.each(engines.filter(x => !x.skipReferences).map(engine => [engine.label, engine]))(
+    'Create FK - %s',
+    testWrapper(async (conn, driver, engine) => {
+      await testTableDiff(
+        engine,
+        conn,
+        driver,
+        tbl => {
+          tbl.foreignKeys = [
+            {
+              constraintType: 'foreignKey',
+              pureName: 't3',
+              refTableName: 't1',
+              columns: [
+                {
+                  columnName: 'fkval',
+                  refColumnName: 'col_ref',
+                },
+              ],
+            },
+          ];
+        },
+        't3'
+      );
+    })
+  );
+
   // test.each(engines.map(engine => [engine.label, engine]))(
   //   'Change autoincrement - %s',
   //   testWrapper(async (conn, driver, engine) => {

integration-tests/__tests__/data-replicator.spec.js

@@ -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');
+    })
+  );
 });

integration-tests/__tests__/schema-tests.spec.js

@@ -33,7 +33,9 @@ describe('Schema tests', () => {
       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();
+      if (!engine.skipIncrementalAnalysis) {
+        expect(structure2).toBeNull();
+      }
     })
   );
 
@@ -51,7 +53,9 @@ describe('Schema tests', () => {
       const structure2 = await driver.analyseIncremental(conn, structure1);
       const schemas2 = await driver.listSchemas(conn);
       expect(schemas2.find(x => x.schemaName == 'myschema')).toBeFalsy();
-      expect(structure2).toBeNull();
+      if (!engine.skipIncrementalAnalysis) {
+        expect(structure2).toBeNull();
+      }
     })
   );
 

integration-tests/__tests__/table-analyse.spec.js

@@ -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)));

integration-tests/docker-compose.yaml

@@ -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

integration-tests/engines.js

@@ -187,6 +187,7 @@ const mariaDbEngine = {
 /** @type {import('dbgate-types').TestEngineInfo} */
 const postgreSqlEngine = {
   label: 'PostgreSQL',
+  skipIncrementalAnalysis: true,
   connection: {
     engine: 'postgres@dbgate-plugin-postgres',
     password: 'Pwd2020Db',
@@ -757,11 +758,11 @@ const enginesOnCi = [
 const enginesOnLocal = [
   // all engines, which would be run on local test
   // cassandraEngine,
-  //mysqlEngine,
+  // mysqlEngine,
   // mariaDbEngine,
-  //postgreSqlEngine,
+  postgreSqlEngine,
   //sqlServerEngine,
-  sqliteEngine,
+  // sqliteEngine,
   // cockroachDbEngine,
   // clickhouseEngine,
   // libsqlFileEngine,

integration-tests/jest.config.js

@@ -1,3 +1,4 @@
 module.exports = {
   setupFilesAfterEnv: ['<rootDir>/setupTests.js'],
+  reporters: ['default', 'github-actions'],
 };

integration-tests/package.json

@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "jest": "^27.0.1",
+    "jest": "^28.1.3",
     "pino-pretty": "^11.2.2",
     "tmp": "^0.2.3"
   }

integration-tests/setupTests.js

@@ -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');

integration-tests/tools.js

@@ -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 {

integration-tests/wait.js

@@ -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) {

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "6.7.1-premium-beta.3",
+  "version": "7.0.0-premium-beta.5",
   "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",
@@ -75,6 +76,7 @@
     "translations:remove-unused": "node common/translations-cli/index.js remove-unused",
     "translations:check": "node common/translations-cli/index.js check",
     "translations:sort": "node common/translations-cli/index.js sort",
+    "translations:translate": "node common/translations-cli/translate.js",
     "errors": "node common/assign-dbgm-codes.mjs  ."
   },
   "dependencies": {

packages/api/env/sfill/.env

@@ -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 

packages/api/package.json

@@ -75,6 +75,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",

packages/api/src/controllers/config.js

@@ -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,

packages/api/src/controllers/connections.js

@@ -23,6 +23,7 @@ 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 logger = getLogger('connections');
 
@@ -61,55 +62,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 +182,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,

packages/api/src/controllers/databaseConnections.js

@@ -494,6 +494,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) {

packages/api/src/controllers/files.js

@@ -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;
+  },
 };

packages/api/src/index.js

@@ -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) {

packages/api/src/proc/databaseConnectionProcess.js

@@ -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,
 };
 

packages/api/src/shell/copyStream.js

@@ -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;
   }
 }

packages/api/src/shell/dataReplicator.js

@@ -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

packages/api/src/storageModel.js

@@ -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": {
@@ -1562,6 +1837,66 @@ module.exports = {
           "id": -2,
           "name": "diagrams",
           "format": "json"
+        },
+        {
+          "id": -3,
+          "name": "query",
+          "format": "json"
+        },
+        {
+          "id": -4,
+          "name": "perspectives",
+          "format": "json"
+        },
+        {
+          "id": -5,
+          "name": "impexp",
+          "format": "json"
+        },
+        {
+          "id": -6,
+          "name": "shell",
+          "format": "text"
+        },
+        {
+          "id": -7,
+          "name": "dbcompare",
+          "format": "json"
+        }
+      ]
+    },
+    {
+      "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"
         }
       ]
     },
@@ -2163,6 +2498,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": [],

packages/api/src/utility/envtools.js

@@ -0,0 +1,454 @@
+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}`]) : null),
+    singleDatabase: !!env[`DATABASE_${id}`] || !!env[`FILE_${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}`],
+  }));
+
+  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,
+};

packages/api/src/utility/getDiagramExport.js

@@ -1,4 +1,4 @@
-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);">
@@ -6,11 +6,19 @@ const getDiagramExport = (html, css, themeType, themeClassName, 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 {
@@ -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>

packages/datalib/jest.config.js

@@ -2,4 +2,5 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   moduleFileExtensions: ['js'],
+  reporters: ['default', 'github-actions'],
 };

packages/datalib/src/ChangeSetRedis.ts

@@ -0,0 +1,188 @@
+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 }[];
+  updates: { key: string; value: string; ttl: number }[];
+  deletes: string[];
+}
+
+export interface ChangeSetRedis_List {
+  key: string;
+  type: 'list';
+  inserts: { index: number; value: string }[];
+  updates: { index: number; value: string }[];
+  deletes: number[];
+}
+
+export interface ChangeSetRedis_Set {
+  key: string;
+  type: 'set';
+  inserts: string[];
+  deletes: string[];
+}
+
+export interface ChangeSetRedis_ZSet {
+  key: string;
+  type: 'zset';
+  inserts: { member: string; score: number }[];
+  updates: { member: string; score: number }[];
+  deletes: string[];
+}
+
+export type ChangeSetRedisType =
+  | ChangeSetRedis_String
+  | ChangeSetRedis_JSON
+  | ChangeSetRedis_Hash
+  | ChangeSetRedis_List
+  | ChangeSetRedis_Set
+  | ChangeSetRedis_ZSet;
+
+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],
+          });
+        }
+      }
+
+      if (change.deletes && Array.isArray(change.deletes)) {
+        for (const delValue of change.deletes) {
+          calls.push({
+            method: 'SREM',
+            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;
+} 

packages/datalib/src/DataReplicator.ts

@@ -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;

packages/datalib/src/index.ts

@@ -25,3 +25,4 @@ export * from './CustomGridDisplay';
 export * from './ScriptDrivedDeployer';
 export * from './chartDefinitions';
 export * from './chartProcessor';
+export * from './ChangeSetRedis';

packages/dbmodel/bin/dbmodel.js

@@ -35,6 +35,12 @@ program
   .option('-u, --user <user>', 'user name')
   .option('-p, --password <password>', 'password')
   .option('-d, --database <database>', 'database name')
+  .option('--url <url>', 'database url')
+  .option('--file <file>', 'database file')
+  .option('--socket-path <socketPath>', 'socket path')
+  .option('--service-name <serviceName>', 'service name (for Oracle)')
+  .option('--auth-type <authType>', 'authentication type')
+  .option('--use-ssl', 'use SSL connection')
   .option('--auto-index-foreign-keys', 'automatically adds indexes to all foreign keys')
   .option(
     '--load-data-condition <condition>',
@@ -48,7 +54,7 @@ program
   .command('deploy <modelFolder>')
   .description('Deploys model to database')
   .action(modelFolder => {
-    const { engine, server, user, password, database, transaction } = program.opts();
+    const { engine, server, user, password, database, url, file, transaction } = program.opts();
     // const hooks = [];
     // if (program.autoIndexForeignKeys) hooks.push(dbmodel.hooks.autoIndexForeignKeys);
 
@@ -60,6 +66,13 @@ program
           user,
           password,
           database,
+          databaseUrl: url,
+          useDatabaseUrl: !!url,
+          databaseFile: file,
+          socketPath: program.socketPath,
+          serviceName: program.serviceName,
+          authType: program.authType,
+          useSsl: program.useSsl,
         },
         modelFolder,
         useTransaction: transaction,

packages/filterparser/jest.config.js

@@ -2,4 +2,5 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   moduleFileExtensions: ['js'],
+  reporters: ['default', 'github-actions'],
 };

packages/filterparser/src/filterTool.ts

@@ -21,6 +21,7 @@ export function getFilterValueExpression(value, dataType?) {
   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);
   }

packages/sqltree/src/dumpSqlCommand.ts

@@ -1,7 +1,7 @@
 import type { SqlDumper } from 'dbgate-types';
 import { Command, Select, Update, Delete, Insert } from './types';
 import { dumpSqlExpression } from './dumpSqlExpression';
-import { dumpSqlFromDefinition, dumpSqlSourceRef } from './dumpSqlSource';
+import { dumpSqlFromDefinition, dumpSqlSourceDef, dumpSqlSourceRef } from './dumpSqlSource';
 import { dumpSqlCondition } from './dumpSqlCondition';
 
 export function dumpSqlSelect(dmp: SqlDumper, cmd: Select) {
@@ -115,7 +115,10 @@ export function dumpSqlInsert(dmp: SqlDumper, cmd: Insert) {
       cmd.fields.map(x => x.targetColumn)
     );
     dmp.putCollection(',', cmd.fields, x => dumpSqlExpression(dmp, x));
-    if (dmp.dialect.requireFromDual) {
+    if (cmd.whereNotExistsSource) {
+      dmp.put(' ^from ');
+      dumpSqlSourceDef(dmp, cmd.whereNotExistsSource);
+    } else if (dmp.dialect.requireFromDual) {
       dmp.put(' ^from ^dual ');
     }
     dmp.put(' ^where ^not ^exists (^select * ^from %f ^where ', cmd.targetTable);

packages/sqltree/src/dumpSqlExpression.ts

@@ -2,6 +2,7 @@ import _ from 'lodash';
 import type { SqlDumper } from 'dbgate-types';
 import { Expression, ColumnRefExpression } from './types';
 import { dumpSqlSourceRef } from './dumpSqlSource';
+import { dumpSqlSelect } from './dumpSqlCommand';
 
 export function dumpSqlExpression(dmp: SqlDumper, expr: Expression) {
   switch (expr.exprType) {
@@ -67,5 +68,11 @@ export function dumpSqlExpression(dmp: SqlDumper, expr: Expression) {
       });
       dmp.put(')');
       break;
+
+    case 'select':
+      dmp.put('(');
+      dumpSqlSelect(dmp, expr.select);
+      dmp.put(')');
+      break;
   }
 }

packages/sqltree/src/evaluateCondition.ts

@@ -19,6 +19,7 @@ function isLike(value, test) {
 function extractRawValue(value) {
   if (value?.$bigint) return value.$bigint;
   if (value?.$oid) return value.$oid;
+  if (value?.$decimal) return value.$decimal;
   return value;
 }
 

packages/sqltree/src/types.ts

@@ -44,6 +44,7 @@ export interface Insert {
   fields: UpdateField[];
   targetTable: NamedObjectInfo;
   insertWhereNotExistsCondition?: Condition;
+  whereNotExistsSource?: Source;
 }
 
 export interface AllowIdentityInsert {
@@ -226,6 +227,11 @@ export interface RowNumberExpression {
   orderBy: OrderByExpression[];
 }
 
+export interface SelectExpression {
+  exprType: 'select';
+  select: Select;
+}
+
 export type Expression =
   | ColumnRefExpression
   | ValueExpression
@@ -235,7 +241,8 @@ export type Expression =
   | CallExpression
   | MethodCallExpression
   | TranformExpression
-  | RowNumberExpression;
+  | RowNumberExpression
+  | SelectExpression;
 export type OrderByExpression = Expression & { direction: 'ASC' | 'DESC' };
 
 export type ResultField = Expression & { alias?: string };

packages/tools/jest.config.js

@@ -2,4 +2,5 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   moduleFileExtensions: ['js'],
+  reporters: ['default', 'github-actions'],
 };

packages/tools/src/DatabaseAnalyser.ts

@@ -164,6 +164,11 @@ export class DatabaseAnalyser<TClient = any> {
 
     const res = {};
     for (const field of STRUCTURE_FIELDS) {
+      const isAll = this.modifications.some(x => x.action == 'all' && x.objectTypeField == field);
+      if (isAll) {
+        res[field] = newlyAnalysed[field] || [];
+        continue;
+      }
       const removedIds = this.modifications
         .filter(x => x.action == 'remove' && x.objectTypeField == field)
         .map(x => x.objectId);

packages/tools/src/SqlDumper.ts

@@ -26,6 +26,7 @@ import _isDate from 'lodash/isDate';
 import _isArray from 'lodash/isArray';
 import _isPlainObject from 'lodash/isPlainObject';
 import _keys from 'lodash/keys';
+import _cloneDeep from 'lodash/cloneDeep';
 import uuidv1 from 'uuid/v1';
 
 export class SqlDumper implements AlterProcessor {
@@ -87,6 +88,7 @@ export class SqlDumper implements AlterProcessor {
       this.putByteArrayValue(bytes);
     }
     else if (value?.$bigint) this.putRaw(value?.$bigint);
+    else if (value?.$decimal) this.putRaw(value?.$decimal);
     else if (_isPlainObject(value) || _isArray(value)) this.putStringValue(JSON.stringify(value));
     else this.put('^null');
   }
@@ -666,6 +668,68 @@ export class SqlDumper implements AlterProcessor {
     }
   }
 
+  sanitizeTableConstraints(table: TableInfo): TableInfo {
+    // Create a deep copy of the table
+    const sanitized = _cloneDeep(table);
+    
+    // Get the set of existing column names
+    const existingColumns = new Set(sanitized.columns.map(col => col.columnName));
+    
+    // Filter primary key columns to only include existing columns
+    if (sanitized.primaryKey) {
+      const validPkColumns = sanitized.primaryKey.columns.filter(col => existingColumns.has(col.columnName));
+      if (validPkColumns.length === 0) {
+        // If no valid columns remain, remove the primary key entirely
+        sanitized.primaryKey = null;
+      } else if (validPkColumns.length < sanitized.primaryKey.columns.length) {
+        // Update primary key with only valid columns
+        sanitized.primaryKey = {
+          ...sanitized.primaryKey,
+          columns: validPkColumns
+        };
+      }
+    }
+    
+    // Filter sorting key columns to only include existing columns
+    if (sanitized.sortingKey) {
+      const validSkColumns = sanitized.sortingKey.columns.filter(col => existingColumns.has(col.columnName));
+      if (validSkColumns.length === 0) {
+        sanitized.sortingKey = null;
+      } else if (validSkColumns.length < sanitized.sortingKey.columns.length) {
+        sanitized.sortingKey = {
+          ...sanitized.sortingKey,
+          columns: validSkColumns
+        };
+      }
+    }
+    
+    // Filter foreign keys to only include those with all columns present
+    if (sanitized.foreignKeys) {
+      sanitized.foreignKeys = sanitized.foreignKeys.filter(fk =>
+        fk.columns.every(col => existingColumns.has(col.columnName))
+      );
+    }
+    
+    // Filter indexes to only include those with all columns present
+    if (sanitized.indexes) {
+      sanitized.indexes = sanitized.indexes.filter(idx =>
+        idx.columns.every(col => existingColumns.has(col.columnName))
+      );
+    }
+    
+    // Filter unique constraints to only include those with all columns present
+    if (sanitized.uniques) {
+      sanitized.uniques = sanitized.uniques.filter(uq =>
+        uq.columns.every(col => existingColumns.has(col.columnName))
+      );
+    }
+    
+    // Filter dependencies (references from other tables) - these should remain as-is
+    // since they don't affect the CREATE TABLE statement for this table
+    
+    return sanitized;
+  }
+
   recreateTable(oldTable: TableInfo, newTable: TableInfo) {
     if (!oldTable.pairingId || !newTable.pairingId || oldTable.pairingId != newTable.pairingId) {
       throw new Error('Recreate is not possible: oldTable.paringId != newTable.paringId');
@@ -680,48 +744,51 @@ export class SqlDumper implements AlterProcessor {
       }))
       .filter(x => x.newcol);
 
+    // Create a sanitized version of newTable with constraints that only reference existing columns
+    const sanitizedNewTable = this.sanitizeTableConstraints(newTable);
+
     if (this.driver.supportsTransactions) {
       this.dropConstraints(oldTable, true);
       this.renameTable(oldTable, tmpTable);
 
-      this.createTable(newTable);
+      this.createTable(sanitizedNewTable);
 
-      const autoinc = newTable.columns.find(x => x.autoIncrement);
+      const autoinc = sanitizedNewTable.columns.find(x => x.autoIncrement);
       if (autoinc) {
-        this.allowIdentityInsert(newTable, true);
+        this.allowIdentityInsert(sanitizedNewTable, true);
       }
 
       this.putCmd(
         '^insert ^into %f (%,i) select %,i ^from %f',
-        newTable,
+        sanitizedNewTable,
         columnPairs.map(x => x.newcol.columnName),
         columnPairs.map(x => x.oldcol.columnName),
         { ...oldTable, pureName: tmpTable }
       );
 
       if (autoinc) {
-        this.allowIdentityInsert(newTable, false);
+        this.allowIdentityInsert(sanitizedNewTable, false);
       }
 
       if (this.dialect.dropForeignKey) {
-        newTable.dependencies.forEach(cnt => this.createConstraint(cnt));
+        sanitizedNewTable.dependencies.forEach(cnt => this.createConstraint(cnt));
       }
 
       this.dropTable({ ...oldTable, pureName: tmpTable });
     } else {
       // we have to preserve old table as long as possible
-      this.createTable({ ...newTable, pureName: tmpTable });
+      this.createTable({ ...sanitizedNewTable, pureName: tmpTable });
 
       this.putCmd(
         '^insert ^into %f (%,i) select %,s ^from %f',
-        { ...newTable, pureName: tmpTable },
+        { ...sanitizedNewTable, pureName: tmpTable },
         columnPairs.map(x => x.newcol.columnName),
         columnPairs.map(x => x.oldcol.columnName),
         oldTable
       );
 
       this.dropTable(oldTable);
-      this.renameTable({ ...newTable, pureName: tmpTable }, newTable.pureName);
+      this.renameTable({ ...sanitizedNewTable, pureName: tmpTable }, newTable.pureName);
     }
   }
 

packages/tools/src/alterPlan.ts

@@ -91,8 +91,8 @@ interface AlterOperation_RenameConstraint {
 }
 interface AlterOperation_RecreateTable {
   operationType: 'recreateTable';
-  table: TableInfo;
-  operations: AlterOperation[];
+  oldTable: TableInfo;
+  newTable: TableInfo;
 }
 interface AlterOperation_FillPreloadedRows {
   operationType: 'fillPreloadedRows';
@@ -249,11 +249,11 @@ export class AlterPlan {
     });
   }
 
-  recreateTable(table: TableInfo, operations: AlterOperation[]) {
+  recreateTable(oldTable: TableInfo, newTable: TableInfo) {
     this.operations.push({
       operationType: 'recreateTable',
-      table,
-      operations,
+      oldTable,
+      newTable,
     });
     this.recreates.tables += 1;
   }
@@ -337,7 +337,13 @@ export class AlterPlan {
             return opRes;
           }),
           op,
-        ];
+        ].filter(op => {
+          // filter duplicated drops
+          const existingDrop = this.operations.find(
+            o => o.operationType == 'dropConstraint' && o.oldObject === op['oldObject']
+          );
+          return existingDrop == null;
+        });
         return res;
       }
 
@@ -498,53 +504,121 @@ export class AlterPlan {
         return [];
       }
 
-      const table = this.wholeNewDb.tables.find(
+      const oldTable = this.wholeOldDb.tables.find(
+        x => x.pureName == op[objectField].pureName && x.schemaName == op[objectField].schemaName
+      );
+      const newTable = this.wholeNewDb.tables.find(
         x => x.pureName == op[objectField].pureName && x.schemaName == op[objectField].schemaName
       );
       this.recreates.tables += 1;
       return [
         {
           operationType: 'recreateTable',
-          table,
-          operations: [op],
+          oldTable,
+          newTable,
+          // operations: [op],
         },
       ];
     }
     return null;
   }
 
-  _groupTableRecreations(): AlterOperation[] {
-    const res = [];
-    const recreates = {};
+  _removeRecreatedTableAlters(): AlterOperation[] {
+    const res: AlterOperation[] = [];
+    const recreates = new Set<string>();
     for (const op of this.operations) {
-      if (op.operationType == 'recreateTable' && op.table) {
-        const existingRecreate = recreates[`${op.table.schemaName}||${op.table.pureName}`];
-        if (existingRecreate) {
-          existingRecreate.operations.push(...op.operations);
-        } else {
-          const recreate = {
-            ...op,
-            operations: [...op.operations],
-          };
-          res.push(recreate);
-          recreates[`${op.table.schemaName}||${op.table.pureName}`] = recreate;
-        }
-      } else {
-        // @ts-ignore
-        const oldObject: TableInfo = op.oldObject || op.object;
-        if (oldObject) {
-          const recreated = recreates[`${oldObject.schemaName}||${oldObject.pureName}`];
-          if (recreated) {
-            recreated.operations.push(op);
-            continue;
-          }
-        }
-        res.push(op);
+      if (op.operationType == 'recreateTable' && op.oldTable && op.newTable) {
+        const key = `${op.oldTable.schemaName}||${op.oldTable.pureName}`;
+        recreates.add(key);
       }
     }
+
+    for (const op of this.operations) {
+      switch (op.operationType) {
+        case 'createColumn':
+        case 'createConstraint':
+          {
+            const key = `${op.newObject.schemaName}||${op.newObject.pureName}`;
+            if (recreates.has(key)) {
+              // skip create inside recreated table
+              continue;
+            }
+          }
+          break;
+        case 'dropColumn':
+        case 'dropConstraint':
+        case 'changeColumn':
+          {
+            const key = `${op.oldObject.schemaName}||${op.oldObject.pureName}`;
+            if (recreates.has(key)) {
+              // skip drop/change inside recreated table
+              continue;
+            }
+          }
+          break;
+        case 'renameColumn':
+          {
+            const key = `${op.object.schemaName}||${op.object.pureName}`;
+            if (recreates.has(key)) {
+              // skip rename inside recreated table
+              continue;
+            }
+          }
+          break;
+      }
+      res.push(op);
+    }
     return res;
   }
 
+  _groupTableRecreations(): AlterOperation[] {
+    const res = [];
+    const recreates = new Set<string>();
+    for (const op of this.operations) {
+      if (op.operationType == 'recreateTable' && op.oldTable && op.newTable) {
+        const key = `${op.oldTable.schemaName}||${op.oldTable.pureName}`;
+        if (recreates.has(key)) {
+          // prevent duplicate recreates
+          continue;
+        }
+        recreates.add(key);
+      }
+
+      res.push(op);
+    }
+    return res;
+
+    // const res = [];
+    // const recreates = {};
+    // for (const op of this.operations) {
+    //   if (op.operationType == 'recreateTable' && op.table) {
+    //     const existingRecreate = recreates[`${op.table.schemaName}||${op.table.pureName}`];
+    //     if (existingRecreate) {
+    //       existingRecreate.operations.push(...op.operations);
+    //     } else {
+    //       const recreate = {
+    //         ...op,
+    //         operations: [...op.operations],
+    //       };
+    //       res.push(recreate);
+    //       recreates[`${op.table.schemaName}||${op.table.pureName}`] = recreate;
+    //     }
+    //   } else {
+    //     // @ts-ignore
+    //     const oldObject: TableInfo = op.oldObject || op.object;
+    //     if (oldObject) {
+    //       const recreated = recreates[`${oldObject.schemaName}||${oldObject.pureName}`];
+    //       if (recreated) {
+    //         recreated.operations.push(op);
+    //         continue;
+    //       }
+    //     }
+    //     res.push(op);
+    //   }
+    // }
+    // return res;
+  }
+
   _moveForeignKeysToLast(): AlterOperation[] {
     if (!this.dialect.createForeignKey) {
       return this.operations;
@@ -611,6 +685,8 @@ export class AlterPlan {
 
     // console.log('*****************OPERATIONS3', this.operations);
 
+    this.operations = this._removeRecreatedTableAlters();
+
     this.operations = this._moveForeignKeysToLast();
 
     // console.log('*****************OPERATIONS4', this.operations);
@@ -673,16 +749,16 @@ export function runAlterOperation(op: AlterOperation, processor: AlterProcessor)
       break;
     case 'recreateTable':
       {
-        const oldTable = generateTablePairingId(op.table);
-        const newTable = _.cloneDeep(oldTable);
-        const newDb = DatabaseAnalyser.createEmptyStructure();
-        newDb.tables.push(newTable);
-        // console.log('////////////////////////////newTable1', newTable);
-        op.operations.forEach(child => runAlterOperation(child, new DatabaseInfoAlterProcessor(newDb)));
-        // console.log('////////////////////////////op.operations', op.operations);
-        // console.log('////////////////////////////op.table', op.table);
-        // console.log('////////////////////////////newTable2', newTable);
-        processor.recreateTable(oldTable, newTable);
+        // const oldTable = generateTablePairingId(op.table);
+        // const newTable = _.cloneDeep(oldTable);
+        // const newDb = DatabaseAnalyser.createEmptyStructure();
+        // newDb.tables.push(newTable);
+        // // console.log('////////////////////////////newTable1', newTable);
+        // op.operations.forEach(child => runAlterOperation(child, new DatabaseInfoAlterProcessor(newDb)));
+        // // console.log('////////////////////////////op.operations', op.operations);
+        // // console.log('////////////////////////////op.table', op.table);
+        // // console.log('////////////////////////////newTable2', newTable);
+        processor.recreateTable(op.oldTable, op.newTable);
       }
       break;
   }

packages/tools/src/nameTools.ts

@@ -146,4 +146,5 @@ export const DATA_FOLDER_NAMES = [
   { name: 'datadeploy', label: 'Data deploy jobs' },
   { name: 'dbcompare', label: 'Database compare jobs' },
   { name: 'apps', label: 'Applications' },
+  { name: 'themes', label: 'Themes' },
 ];

packages/tools/src/stringTools.ts

@@ -45,14 +45,15 @@ export function hexStringToArray(inputString) {
 
 export function base64ToHex(base64String) {
   const binaryString = atob(base64String);
-  const hexString = Array.from(binaryString, c =>
-    c.charCodeAt(0).toString(16).padStart(2, '0')
-  ).join('');
+  const hexString = Array.from(binaryString, c => c.charCodeAt(0).toString(16).padStart(2, '0')).join('');
   return '0x' + hexString.toUpperCase();
-};
+}
 
 export function hexToBase64(hexString) {
-  const binaryString = hexString.match(/.{1,2}/g).map(byte => String.fromCharCode(parseInt(byte, 16))).join('');
+  const binaryString = hexString
+    .match(/.{1,2}/g)
+    .map(byte => String.fromCharCode(parseInt(byte, 16)))
+    .join('');
   return btoa(binaryString);
 }
 
@@ -68,9 +69,9 @@ export function parseCellValue(value, editorTypes?: DataEditorTypesBehaviour) {
     if (mHex) {
       return {
         $binary: {
-          base64: hexToBase64(value.substring(2))
-        }
-      }
+          base64: hexToBase64(value.substring(2)),
+        },
+      };
     }
   }
 
@@ -200,6 +201,26 @@ function stringifyJsonToGrid(value): ReturnType<typeof stringifyCellValue> {
   return { value: '(JSON)', gridStyle: 'nullCellStyle' };
 }
 
+function formatNumberCustomSeparator(value, thousandsSeparator) {
+  const [intPart, decPart] = value.split('.');
+  const intPartWithSeparator = intPart.replace(/\B(?=(\d{3})+(?!\d))/g, thousandsSeparator);
+  return decPart ? `${intPartWithSeparator}.${decPart}` : intPartWithSeparator;
+}
+
+function formatCellNumber(value, gridFormattingOptions?: { thousandsSeparator?: string }) {
+  const separator = gridFormattingOptions?.thousandsSeparator;
+  if (_isNumber(value)) {
+    if (separator === 'none' || (value < 1000 && value > -1000)) return value.toString();
+    if (separator === 'system') return value.toLocaleString();
+  }
+  // fallback for system locale
+  if (separator === 'space' || separator === 'system') return formatNumberCustomSeparator(value.toString(), ' ');
+  if (separator === 'narrowspace') return formatNumberCustomSeparator(value.toString(), '\u202F');
+  if (separator === 'comma') return formatNumberCustomSeparator(value.toString(), ',');
+  if (separator === 'dot') return formatNumberCustomSeparator(value.toString(), '.');
+  return value.toString();
+}
+
 export function stringifyCellValue(
   value,
   intent:
@@ -210,7 +231,7 @@ export function stringifyCellValue(
     | 'exportIntent'
     | 'clipboardIntent',
   editorTypes?: DataEditorTypesBehaviour,
-  gridFormattingOptions?: { useThousandsSeparator?: boolean },
+  gridFormattingOptions?: { thousandsSeparator?: string },
   jsonParsedValue?: any
 ): {
   value: string;
@@ -251,12 +272,19 @@ export function stringifyCellValue(
     };
   }
 
+  if (value?.$decimal) {
+    return {
+      value: formatCellNumber(value.$decimal, gridFormattingOptions),
+      gridStyle: 'valueCellStyle',
+    };
+  }
+
   if (editorTypes?.parseHexAsBuffer) {
     // if (value?.type == 'Buffer' && _isArray(value.data)) {
     //   return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
     // }
   }
-  
+
   if (editorTypes?.parseObjectIdAsDollar) {
     if (value?.$oid) {
       switch (intent) {
@@ -270,13 +298,13 @@ export function stringifyCellValue(
   }
   if (value?.$bigint) {
     return {
-      value: value.$bigint,
+      value: formatCellNumber(value.$bigint, gridFormattingOptions),
       gridStyle: 'valueCellStyle',
     };
   }
   if (typeof value === 'bigint') {
     return {
-      value: value.toString(),
+      value: formatCellNumber(value.toString(), gridFormattingOptions),
       gridStyle: 'valueCellStyle',
     };
   }
@@ -351,13 +379,8 @@ export function stringifyCellValue(
   if (_isNumber(value)) {
     switch (intent) {
       case 'gridCellIntent':
-        return {
-          value:
-            gridFormattingOptions?.useThousandsSeparator && (value >= 10000 || value <= -10000)
-              ? value.toLocaleString()
-              : value.toString(),
-          gridStyle: 'valueCellStyle',
-        };
+        const separator = gridFormattingOptions?.thousandsSeparator;
+        return { value: formatCellNumber(value, gridFormattingOptions), gridStyle: 'valueCellStyle' };
       default:
         return { value: value.toString() };
     }
@@ -449,6 +472,9 @@ export function shouldOpenMultilineDialog(value) {
   if (value?.$bigint) {
     return false;
   }
+  if (value?.$decimal) {
+    return false;
+  }
   if (_isPlainObject(value) || _isArray(value)) {
     return true;
   }
@@ -478,6 +504,7 @@ export function getIconForRedisType(type) {
     case 'binary':
       return 'img type-binary';
     case 'ReJSON-RL':
+    case 'JSON':
       return 'img type-rejson';
     default:
       return null;
@@ -699,6 +726,9 @@ export function deserializeJsTypesFromJsonParse(obj) {
     if (value?.$bigint) {
       return BigInt(value.$bigint);
     }
+    if (value?.$decimal) {
+      return value.$decimal;
+    }
   });
 }
 
@@ -713,6 +743,9 @@ export function deserializeJsTypesReviver(key, value) {
   if (value?.$bigint) {
     return BigInt(value.$bigint);
   }
+  if (value?.$decimal) {
+    return value.$decimal;
+  }
   return value;
 }
 

packages/types/dumper.d.ts

@@ -16,6 +16,7 @@ export interface SqlDumper extends AlterProcessor {
   transform(type: TransformType, dumpExpr: () => void);
   createDatabase(name: string);
   dropDatabase(name: string);
+  comment(value: string);
 
   callableTemplate(func: CallableObjectInfo);
 

packages/types/engines.d.ts

@@ -224,6 +224,15 @@ export interface RestoreDatabaseSettings extends BackupRestoreSettingsBase {
   inputFile: string;
 }
 
+export interface DatabaseMethodCallItem {
+  method: string;
+  args: any[];
+}
+
+export interface DatabaseMethodCallList {
+  calls: DatabaseMethodCallItem[];
+}
+
 export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBehaviourProvider {
   engine: string;
   title: string;
@@ -238,6 +247,7 @@ export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBeha
   supportsDatabaseRestore?: boolean;
   supportsServerSummary?: boolean;
   supportsDatabaseProfiler?: boolean;
+  supportsIncrementalAnalysis?: boolean;
   requiresDefaultSortCriteria?: boolean;
   profilerFormatterFunction?: string;
   profilerTimestampFunction?: string;
@@ -252,6 +262,7 @@ export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBeha
   collectionPluralLabel?: string;
   collectionNameLabel?: string;
   newCollectionFormParams?: any[];
+  icon?: any;
 
   supportedCreateDatabase?: boolean;
   showConnectionField?: (
@@ -336,6 +347,8 @@ export interface EngineDriver<TClient = any, TDataBase = any> extends FilterBeha
   readCollection(dbhan: DatabaseHandle<TClient, TDataBase>, options: ReadCollectionOptions): Promise<any>;
   updateCollection(dbhan: DatabaseHandle<TClient, TDataBase>, changeSet: any): Promise<any>;
   getCollectionUpdateScript(changeSet: any, collectionInfo: CollectionInfo): string;
+  getKeyValueMethodCallList(changeSet: any): DatabaseMethodCallList;
+  invokeMethodCallList(dbhan: DatabaseHandle<TClient, TDataBase>, callList: DatabaseMethodCallList): Promise<void>;
   createDatabase(dbhan: DatabaseHandle<TClient, TDataBase>, name: string): Promise;
   dropDatabase(dbhan: DatabaseHandle<TClient, TDataBase>, name: string): Promise;
   getQuerySplitterOptions(usage: 'stream' | 'script' | 'editor' | 'import'): any;

packages/types/extensions.d.ts

@@ -23,10 +23,11 @@ export interface FileFormatDefinition {
 }
 
 export interface ThemeDefinition {
-  themeClassName: string;
   themeName: string;
   themeType: 'light' | 'dark';
-  themeCss?: string;
+  isBuiltInTheme?: boolean;
+  themeVariables?: { [key: string]: string };
+  themePublicCloudPath?: string;
 }
 
 export interface PluginDefinition {
@@ -47,5 +48,4 @@ export interface ExtensionsDirectory {
   fileFormats: FileFormatDefinition[];
   quickExports: QuickExportDefinition[];
   drivers: EngineDriver[];
-  themes: ThemeDefinition[];
 }

packages/web/index.html.tpl

@@ -20,6 +20,7 @@
     <link rel="stylesheet" href="dimensions.css" />
     <link rel="stylesheet" href="bulma.css" />
     <link rel="stylesheet" href="icon-colors.css" />
+    <link rel="stylesheet" href="build/tailwind.css" />
     <link rel="stylesheet" href="build/bundle.css" />
     <link rel="stylesheet" href="build/fonts/materialdesignicons.css" />
     <link rel="stylesheet" href="build/diff2html.min.css" />

packages/web/package.json

@@ -25,8 +25,10 @@
     "@rollup/plugin-node-resolve": "^13.0.5",
     "@rollup/plugin-replace": "^3.0.0",
     "@rollup/plugin-typescript": "^8.2.5",
+    "@tailwindcss/postcss": "^4.1.18",
     "@tsconfig/svelte": "^1.0.0",
     "ace-builds": "^1.36.5",
+    "autoprefixer": "^10.4.23",
     "chart.js": "^4.4.2",
     "chartjs-adapter-moment": "^1.0.0",
     "chartjs-plugin-datalabels": "^2.2.0",
@@ -44,21 +46,24 @@
     "json-stable-stringify": "^1.0.1",
     "localforage": "^1.9.0",
     "lodash": "^4.17.21",
+    "postcss": "^8.5.6",
     "randomcolor": "^0.6.2",
     "resize-observer-polyfill": "^1.5.1",
     "rollup": "^2.57.0",
     "rollup-plugin-copy": "^3.3.0",
     "rollup-plugin-css-only": "^3.1.0",
     "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-svelte": "^7.0.0",
-    "rollup-plugin-terser": "^7.0.0",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-svelte": "^7.2.2",
+    "rollup-plugin-terser": "^7.0.2",
     "sirv-cli": "^1.0.0",
     "sql-formatter": "^3.1.0",
-    "svelte": "^3.46.4",
+    "svelte": "^4.2.20",
     "svelte-check": "^1.0.0",
     "svelte-markdown": "^0.1.4",
     "svelte-preprocess": "^4.9.5",
     "svelte-select": "^4.4.7",
+    "tailwindcss": "^4.1.18",
     "tslib": "^2.3.1",
     "typescript": "^4.4.3",
     "uuid": "^3.4.0"

packages/web/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    '@tailwindcss/postcss': {},
+    autoprefixer: {},
+  },
+};

packages/web/public/dimensions.css

@@ -2,14 +2,21 @@
   --dim-widget-icon-size: 50px;
   --dim-statusbar-height: 22px;
   --dim-left-panel-width: 300px;
+  --dim-right-panel-width: 300px;
   --dim-tabs-height: 33px;
   --dim-tabs-panel-height: calc( var(--dim-visible-tabs-databases) * 20px + var(--dim-tabs-height) );
-  --dim-splitter-thickness: 3px;
+  --dim-splitter-thickness: 4px;
 
   --dim-visible-left-panel: 1; /* set from JS */
   --dim-content-left: calc(
     var(--dim-widget-icon-size) + var(--dim-visible-left-panel) *
-      (var(--dim-left-panel-width) + var(--dim-splitter-thickness))
+      (var(--dim-left-panel-width))
+  );
+
+  --dim-visible-right-panel: 0; /* set from JS */
+  --dim-content-right: calc(
+    var(--dim-visible-right-panel) *
+      (var(--dim-right-panel-width))
   );
 
   --dim-visible-toolbar: 0; /* set from JS */

packages/web/public/global.css

@@ -12,21 +12,47 @@ body {
 }
 
 .horizontal-split-handle {
-  background-color: var(--theme-border);
-  width: var(--dim-splitter-thickness);
+  width: 0px;
+  position: relative;
   cursor: col-resize;
 }
-.horizontal-split-handle:hover {
-  background-color: var(--theme-bg-2);
+.horizontal-split-handle::before {
+  content: '';
+  position: absolute;
+  cursor: col-resize;
+  left: -1px;
+  right: -1px;
+  top: 0;
+  bottom: 0;
+  width: var(--dim-splitter-thickness);
+  background-color: transparent;
+  transition: background-color 0.2s ease;
+  z-index: 200;
+}
+.horizontal-split-handle:hover::before {
+  background-color: var(--theme-splitter-active);
 }
 
 .vertical-split-handle {
-  background-color: var(--theme-border);
-  height: var(--dim-splitter-thickness);
+  height: 0px;
+  position: relative;
   cursor: row-resize;
 }
-.vertical-split-handle:hover {
-  background-color: var(--theme-bg-2);
+.vertical-split-handle::before {
+  content: '';
+  position: absolute;
+  cursor: row-resize;
+  top: -1px;
+  bottom: -1px;
+  left: 0;
+  right: 0;
+  height: var(--dim-splitter-thickness);
+  background-color: transparent;
+  transition: background-color 0.2s ease;
+  z-index: 200;
+}
+.vertical-split-handle:hover::before {
+  background-color: var(--theme-splitter-active);
 }
 
 .icon-invisible {
@@ -117,21 +143,32 @@ body {
   max-width: 16.6666%;
 }
 
-.largeFormMarker input[type='text'], .largeFormMarker input[type='number'], .largeFormMarker input[type='password'], .largeFormMarker textarea  {
+.largeFormMarker input[type='text'],
+.largeFormMarker input[type='number'],
+.largeFormMarker input[type='password'],
+.largeFormMarker textarea {
   width: 100%;
   padding: 10px 10px;
   font-size: 14px;
   box-sizing: border-box;
   border-radius: 4px;
-  border: 1px solid var(--theme-border);
+  border: var(--theme-input-border);
+  background: var(--theme-input-background);
 }
 
 .input1 {
-  padding: 5px 5px;
+  padding: 5px 2px;
   font-size: 14px;
   box-sizing: border-box;
   border-radius: 4px;
-  border: 1px solid var(--theme-border);
+  border: var(--theme-input-border);
+  background: var(--theme-input-background);
+}
+
+.input1:focus {
+  outline: none;
+  border: var(--theme-input-border-focus);
+  box-shadow: var(--theme-input-focus-ring);
 }
 
 .largeFormMarker select {
@@ -148,54 +185,88 @@ body *::-webkit-scrollbar {
 }
 body *::-webkit-scrollbar-track {
   border-radius: 1px;
-  background-color: var(--theme-bg-1);
+  background: var(--theme-scrollbar-background);
 }
 body *::-webkit-scrollbar-corner {
   border-radius: 1px;
-  background-color: var(--theme-bg-2);
+  background: var(--theme-scrollbar-corner-background);
 }
 
 body *::-webkit-scrollbar-thumb {
   border-radius: 1px;
-  background-color: var(--theme-bg-3);
+  background: var(--theme-scrollbar-thumb-background);
 }
 
 body *::-webkit-scrollbar-thumb:hover {
-  background-color: var(--theme-bg-4);
+  background: var(--theme-scrollbar-thumb-background-hover);
 }
 
 input {
-  background-color: var(--theme-bg-0);
-  color: var(--theme-font-1);
-  border: 1px solid var(--theme-border);
+  background: var(--theme-input-background);
+  color: var(--theme-generic-font);
+  border: var(--theme-input-border);
 }
 
 input[disabled] {
-  background-color: var(--theme-bg-1);
+  background: var(--theme-input-background-disabled);
+  color: var(--theme-input-foreground-disabled);  
+}
+
+.largeFormMarker input[disabled] {
+  background: var(--theme-input-background-disabled);
+  color: var(--theme-input-foreground-disabled);  
 }
 
 select {
-  background-color: var(--theme-bg-0);
-  color: var(--theme-font-1);
-  border: 1px solid var(--theme-border);
+  padding: 10px 12px;
+    border: var(--theme-input-border);
+    border-radius: 4px;
+    background-color: var(--theme-input-background);
+    color: var(--theme-input-foreground);
+    font-size: 13px;
+    transition: all 0.15s ease;
+    font-family: inherit;
+}
+
+select:hover {
+  border: var(--theme-input-border-hover);
+}
+
+select:focus {
+  outline: none;
+  border: var(--theme-input-border-focus);
+  box-shadow: var(--theme-input-focus-ring);
 }
 
 select[disabled] {
-  background-color: var(--theme-bg-1);
+  background-color: var(--theme-input-background-disabled);
+  color: var(--theme-input-foreground-disabled);
+  cursor: not-allowed;
+  border: var(--theme-input-border-disabled);
+}
+
+.largeFormMarker select[disabled] {
+  background: var(--theme-input-background-disabled);
+  color: var(--theme-input-foreground-disabled);  
 }
 
 .classicform select {
   padding: 5px 5px 4px;
 }
 
+.selectContainer.focused {
+  box-shadow: var(--theme-input-focus-ring);
+}
+
 textarea {
-  background-color: var(--theme-bg-0);
-  color: var(--theme-font-1);
-  border: 1px solid var(--theme-border);
+  background: var(--theme-input-background);
+  color: var(--theme-generic-font);
+  border: var(--theme-input-border);
 }
 
 textarea[disabled] {
-  background-color: var(--theme-bg-1);
+  background: var(--theme-input-background-disabled);
+  color: var(--theme-input-foreground-disabled);
 }
 
 .ace_gutter-cell.ace-gutter-sql-run {
@@ -219,11 +290,70 @@ textarea[disabled] {
 }
 
 .ace_gutter-cell.ace-gutter-sql-run:hover {
-   background-color: var(--theme-bg-2);
+  background-color: var(--theme-bg-2);
 }
 
 .ace_gutter-cell.ace-gutter-current-part {
-   /* background-color: var(--theme-bg-2); */
-   font-weight: bold;
-   color: var(--theme-font-hover);
-}
+  /* background-color: var(--theme-bg-2); */
+  font-weight: bold;
+  color: var(--theme-font-hover);
+}
+
+input[type='checkbox'] {
+  appearance: none;
+  width: 16px;
+  height: 16px;
+
+  border-radius: 4px;
+  border: var(--theme-checkbox-border);
+  background-color: var(--theme-input-background);
+
+  display: inline-grid;
+  place-content: center;
+
+  cursor: pointer;
+}
+
+input[type='checkbox']:hover:not(:disabled) {
+  border: 1px solid var(--theme-checkbox-hover-not-disabled);
+}
+
+input[type='checkbox']:checked:hover {
+  border: 1px solid var(--theme-checkbox-background);
+}
+
+input[type='checkbox']:checked {
+  background-color: var(--theme-checkbox-background);
+  border: var(--theme-checkbox-border);
+}
+
+input[type='checkbox']::before {
+  content: '';
+  width: 10px;
+  height: 10px;
+  transform: scale(0);
+  transition: transform 120ms ease;
+  background-color: var(--theme-checkbox-mark);
+  clip-path: polygon(
+    14% 44%,
+    0 65%,
+    50% 100%,
+    100% 16%,
+    80% 0,
+    43% 62%
+  );
+}
+
+input[type='checkbox']:checked::before {
+  transform: scale(1);
+}
+
+input[type='checkbox']:disabled {
+  cursor: not-allowed;
+  background-color: var(--theme-checkbox-background-disabled);
+  border: var(--theme-checkbox-border);
+}
+
+input[type='checkbox']:disabled::before {
+  background-color: var(--theme-checkbox-background-disabled-before);
+}

packages/web/public/icon-colors.css

@@ -23,12 +23,12 @@
 }
 
 
-.color-icon-inv-green {
-  color: var(--theme-icon-inv-green);
+.color-icon-statusbar-red {
+  color: var(--theme-statusbar-icon-error);
 }
 
-.color-icon-inv-red {
-  color: var(--theme-icon-inv-red);
+.color-icon-statusbar-green {
+  color: var(--theme-statusbar-icon-ok);
 }
 
 .premium-background-gradient {

packages/web/public/tailwind-colors.css

@@ -0,0 +1,288 @@
+/* Force all Tailwind color variables to be included in build */
+body {
+    /* Slate */
+    --tw-copy-slate-50: var(--tw-color-slate-50);
+    --tw-copy-slate-100: var(--tw-color-slate-100);
+    --tw-copy-slate-200: var(--tw-color-slate-200);
+    --tw-copy-slate-300: var(--tw-color-slate-300);
+    --tw-copy-slate-400: var(--tw-color-slate-400);
+    --tw-copy-slate-500: var(--tw-color-slate-500);
+    --tw-copy-slate-600: var(--tw-color-slate-600);
+    --tw-copy-slate-700: var(--tw-color-slate-700);
+    --tw-copy-slate-800: var(--tw-color-slate-800);
+    --tw-copy-slate-900: var(--tw-color-slate-900);
+    --tw-copy-slate-950: var(--tw-color-slate-950);
+    
+    /* Gray */
+    --tw-copy-gray-50: var(--tw-color-gray-50);
+    --tw-copy-gray-100: var(--tw-color-gray-100);
+    --tw-copy-gray-200: var(--tw-color-gray-200);
+    --tw-copy-gray-300: var(--tw-color-gray-300);
+    --tw-copy-gray-400: var(--tw-color-gray-400);
+    --tw-copy-gray-500: var(--tw-color-gray-500);
+    --tw-copy-gray-600: var(--tw-color-gray-600);
+    --tw-copy-gray-700: var(--tw-color-gray-700);
+    --tw-copy-gray-800: var(--tw-color-gray-800);
+    --tw-copy-gray-900: var(--tw-color-gray-900);
+    --tw-copy-gray-950: var(--tw-color-gray-950);
+    
+    /* Zinc */
+    --tw-copy-zinc-50: var(--tw-color-zinc-50);
+    --tw-copy-zinc-100: var(--tw-color-zinc-100);
+    --tw-copy-zinc-200: var(--tw-color-zinc-200);
+    --tw-copy-zinc-300: var(--tw-color-zinc-300);
+    --tw-copy-zinc-400: var(--tw-color-zinc-400);
+    --tw-copy-zinc-500: var(--tw-color-zinc-500);
+    --tw-copy-zinc-600: var(--tw-color-zinc-600);
+    --tw-copy-zinc-700: var(--tw-color-zinc-700);
+    --tw-copy-zinc-800: var(--tw-color-zinc-800);
+    --tw-copy-zinc-900: var(--tw-color-zinc-900);
+    --tw-copy-zinc-950: var(--tw-color-zinc-950);
+    
+    /* Neutral */
+    --tw-copy-neutral-50: var(--tw-color-neutral-50);
+    --tw-copy-neutral-100: var(--tw-color-neutral-100);
+    --tw-copy-neutral-200: var(--tw-color-neutral-200);
+    --tw-copy-neutral-300: var(--tw-color-neutral-300);
+    --tw-copy-neutral-400: var(--tw-color-neutral-400);
+    --tw-copy-neutral-500: var(--tw-color-neutral-500);
+    --tw-copy-neutral-600: var(--tw-color-neutral-600);
+    --tw-copy-neutral-700: var(--tw-color-neutral-700);
+    --tw-copy-neutral-800: var(--tw-color-neutral-800);
+    --tw-copy-neutral-900: var(--tw-color-neutral-900);
+    --tw-copy-neutral-950: var(--tw-color-neutral-950);
+    
+    /* Stone */
+    --tw-copy-stone-50: var(--tw-color-stone-50);
+    --tw-copy-stone-100: var(--tw-color-stone-100);
+    --tw-copy-stone-200: var(--tw-color-stone-200);
+    --tw-copy-stone-300: var(--tw-color-stone-300);
+    --tw-copy-stone-400: var(--tw-color-stone-400);
+    --tw-copy-stone-500: var(--tw-color-stone-500);
+    --tw-copy-stone-600: var(--tw-color-stone-600);
+    --tw-copy-stone-700: var(--tw-color-stone-700);
+    --tw-copy-stone-800: var(--tw-color-stone-800);
+    --tw-copy-stone-900: var(--tw-color-stone-900);
+    --tw-copy-stone-950: var(--tw-color-stone-950);
+    
+    /* Red */
+    --tw-copy-red-50: var(--tw-color-red-50);
+    --tw-copy-red-100: var(--tw-color-red-100);
+    --tw-copy-red-200: var(--tw-color-red-200);
+    --tw-copy-red-300: var(--tw-color-red-300);
+    --tw-copy-red-400: var(--tw-color-red-400);
+    --tw-copy-red-500: var(--tw-color-red-500);
+    --tw-copy-red-600: var(--tw-color-red-600);
+    --tw-copy-red-700: var(--tw-color-red-700);
+    --tw-copy-red-800: var(--tw-color-red-800);
+    --tw-copy-red-900: var(--tw-color-red-900);
+    --tw-copy-red-950: var(--tw-color-red-950);
+    
+    /* Orange */
+    --tw-copy-orange-50: var(--tw-color-orange-50);
+    --tw-copy-orange-100: var(--tw-color-orange-100);
+    --tw-copy-orange-200: var(--tw-color-orange-200);
+    --tw-copy-orange-300: var(--tw-color-orange-300);
+    --tw-copy-orange-400: var(--tw-color-orange-400);
+    --tw-copy-orange-500: var(--tw-color-orange-500);
+    --tw-copy-orange-600: var(--tw-color-orange-600);
+    --tw-copy-orange-700: var(--tw-color-orange-700);
+    --tw-copy-orange-800: var(--tw-color-orange-800);
+    --tw-copy-orange-900: var(--tw-color-orange-900);
+    --tw-copy-orange-950: var(--tw-color-orange-950);
+    
+    /* Amber */
+    --tw-copy-amber-50: var(--tw-color-amber-50);
+    --tw-copy-amber-100: var(--tw-color-amber-100);
+    --tw-copy-amber-200: var(--tw-color-amber-200);
+    --tw-copy-amber-300: var(--tw-color-amber-300);
+    --tw-copy-amber-400: var(--tw-color-amber-400);
+    --tw-copy-amber-500: var(--tw-color-amber-500);
+    --tw-copy-amber-600: var(--tw-color-amber-600);
+    --tw-copy-amber-700: var(--tw-color-amber-700);
+    --tw-copy-amber-800: var(--tw-color-amber-800);
+    --tw-copy-amber-900: var(--tw-color-amber-900);
+    --tw-copy-amber-950: var(--tw-color-amber-950);
+    
+    /* Yellow */
+    --tw-copy-yellow-50: var(--tw-color-yellow-50);
+    --tw-copy-yellow-100: var(--tw-color-yellow-100);
+    --tw-copy-yellow-200: var(--tw-color-yellow-200);
+    --tw-copy-yellow-300: var(--tw-color-yellow-300);
+    --tw-copy-yellow-400: var(--tw-color-yellow-400);
+    --tw-copy-yellow-500: var(--tw-color-yellow-500);
+    --tw-copy-yellow-600: var(--tw-color-yellow-600);
+    --tw-copy-yellow-700: var(--tw-color-yellow-700);
+    --tw-copy-yellow-800: var(--tw-color-yellow-800);
+    --tw-copy-yellow-900: var(--tw-color-yellow-900);
+    --tw-copy-yellow-950: var(--tw-color-yellow-950);
+    
+    /* Lime */
+    --tw-copy-lime-50: var(--tw-color-lime-50);
+    --tw-copy-lime-100: var(--tw-color-lime-100);
+    --tw-copy-lime-200: var(--tw-color-lime-200);
+    --tw-copy-lime-300: var(--tw-color-lime-300);
+    --tw-copy-lime-400: var(--tw-color-lime-400);
+    --tw-copy-lime-500: var(--tw-color-lime-500);
+    --tw-copy-lime-600: var(--tw-color-lime-600);
+    --tw-copy-lime-700: var(--tw-color-lime-700);
+    --tw-copy-lime-800: var(--tw-color-lime-800);
+    --tw-copy-lime-900: var(--tw-color-lime-900);
+    --tw-copy-lime-950: var(--tw-color-lime-950);
+    
+    /* Green */
+    --tw-copy-green-50: var(--tw-color-green-50);
+    --tw-copy-green-100: var(--tw-color-green-100);
+    --tw-copy-green-200: var(--tw-color-green-200);
+    --tw-copy-green-300: var(--tw-color-green-300);
+    --tw-copy-green-400: var(--tw-color-green-400);
+    --tw-copy-green-500: var(--tw-color-green-500);
+    --tw-copy-green-600: var(--tw-color-green-600);
+    --tw-copy-green-700: var(--tw-color-green-700);
+    --tw-copy-green-800: var(--tw-color-green-800);
+    --tw-copy-green-900: var(--tw-color-green-900);
+    --tw-copy-green-950: var(--tw-color-green-950);
+    
+    /* Emerald */
+    --tw-copy-emerald-50: var(--tw-color-emerald-50);
+    --tw-copy-emerald-100: var(--tw-color-emerald-100);
+    --tw-copy-emerald-200: var(--tw-color-emerald-200);
+    --tw-copy-emerald-300: var(--tw-color-emerald-300);
+    --tw-copy-emerald-400: var(--tw-color-emerald-400);
+    --tw-copy-emerald-500: var(--tw-color-emerald-500);
+    --tw-copy-emerald-600: var(--tw-color-emerald-600);
+    --tw-copy-emerald-700: var(--tw-color-emerald-700);
+    --tw-copy-emerald-800: var(--tw-color-emerald-800);
+    --tw-copy-emerald-900: var(--tw-color-emerald-900);
+    --tw-copy-emerald-950: var(--tw-color-emerald-950);
+    
+    /* Teal */
+    --tw-copy-teal-50: var(--tw-color-teal-50);
+    --tw-copy-teal-100: var(--tw-color-teal-100);
+    --tw-copy-teal-200: var(--tw-color-teal-200);
+    --tw-copy-teal-300: var(--tw-color-teal-300);
+    --tw-copy-teal-400: var(--tw-color-teal-400);
+    --tw-copy-teal-500: var(--tw-color-teal-500);
+    --tw-copy-teal-600: var(--tw-color-teal-600);
+    --tw-copy-teal-700: var(--tw-color-teal-700);
+    --tw-copy-teal-800: var(--tw-color-teal-800);
+    --tw-copy-teal-900: var(--tw-color-teal-900);
+    --tw-copy-teal-950: var(--tw-color-teal-950);
+    
+    /* Cyan */
+    --tw-copy-cyan-50: var(--tw-color-cyan-50);
+    --tw-copy-cyan-100: var(--tw-color-cyan-100);
+    --tw-copy-cyan-200: var(--tw-color-cyan-200);
+    --tw-copy-cyan-300: var(--tw-color-cyan-300);
+    --tw-copy-cyan-400: var(--tw-color-cyan-400);
+    --tw-copy-cyan-500: var(--tw-color-cyan-500);
+    --tw-copy-cyan-600: var(--tw-color-cyan-600);
+    --tw-copy-cyan-700: var(--tw-color-cyan-700);
+    --tw-copy-cyan-800: var(--tw-color-cyan-800);
+    --tw-copy-cyan-900: var(--tw-color-cyan-900);
+    --tw-copy-cyan-950: var(--tw-color-cyan-950);
+    
+    /* Sky */
+    --tw-copy-sky-50: var(--tw-color-sky-50);
+    --tw-copy-sky-100: var(--tw-color-sky-100);
+    --tw-copy-sky-200: var(--tw-color-sky-200);
+    --tw-copy-sky-300: var(--tw-color-sky-300);
+    --tw-copy-sky-400: var(--tw-color-sky-400);
+    --tw-copy-sky-500: var(--tw-color-sky-500);
+    --tw-copy-sky-600: var(--tw-color-sky-600);
+    --tw-copy-sky-700: var(--tw-color-sky-700);
+    --tw-copy-sky-800: var(--tw-color-sky-800);
+    --tw-copy-sky-900: var(--tw-color-sky-900);
+    --tw-copy-sky-950: var(--tw-color-sky-950);
+    
+    /* Blue */
+    --tw-copy-blue-50: var(--tw-color-blue-50);
+    --tw-copy-blue-100: var(--tw-color-blue-100);
+    --tw-copy-blue-200: var(--tw-color-blue-200);
+    --tw-copy-blue-300: var(--tw-color-blue-300);
+    --tw-copy-blue-400: var(--tw-color-blue-400);
+    --tw-copy-blue-500: var(--tw-color-blue-500);
+    --tw-copy-blue-600: var(--tw-color-blue-600);
+    --tw-copy-blue-700: var(--tw-color-blue-700);
+    --tw-copy-blue-800: var(--tw-color-blue-800);
+    --tw-copy-blue-900: var(--tw-color-blue-900);
+    --tw-copy-blue-950: var(--tw-color-blue-950);
+    
+    /* Indigo */
+    --tw-copy-indigo-50: var(--tw-color-indigo-50);
+    --tw-copy-indigo-100: var(--tw-color-indigo-100);
+    --tw-copy-indigo-200: var(--tw-color-indigo-200);
+    --tw-copy-indigo-300: var(--tw-color-indigo-300);
+    --tw-copy-indigo-400: var(--tw-color-indigo-400);
+    --tw-copy-indigo-500: var(--tw-color-indigo-500);
+    --tw-copy-indigo-600: var(--tw-color-indigo-600);
+    --tw-copy-indigo-700: var(--tw-color-indigo-700);
+    --tw-copy-indigo-800: var(--tw-color-indigo-800);
+    --tw-copy-indigo-900: var(--tw-color-indigo-900);
+    --tw-copy-indigo-950: var(--tw-color-indigo-950);
+    
+    /* Violet */
+    --tw-copy-violet-50: var(--tw-color-violet-50);
+    --tw-copy-violet-100: var(--tw-color-violet-100);
+    --tw-copy-violet-200: var(--tw-color-violet-200);
+    --tw-copy-violet-300: var(--tw-color-violet-300);
+    --tw-copy-violet-400: var(--tw-color-violet-400);
+    --tw-copy-violet-500: var(--tw-color-violet-500);
+    --tw-copy-violet-600: var(--tw-color-violet-600);
+    --tw-copy-violet-700: var(--tw-color-violet-700);
+    --tw-copy-violet-800: var(--tw-color-violet-800);
+    --tw-copy-violet-900: var(--tw-color-violet-900);
+    --tw-copy-violet-950: var(--tw-color-violet-950);
+    
+    /* Purple */
+    --tw-copy-purple-50: var(--tw-color-purple-50);
+    --tw-copy-purple-100: var(--tw-color-purple-100);
+    --tw-copy-purple-200: var(--tw-color-purple-200);
+    --tw-copy-purple-300: var(--tw-color-purple-300);
+    --tw-copy-purple-400: var(--tw-color-purple-400);
+    --tw-copy-purple-500: var(--tw-color-purple-500);
+    --tw-copy-purple-600: var(--tw-color-purple-600);
+    --tw-copy-purple-700: var(--tw-color-purple-700);
+    --tw-copy-purple-800: var(--tw-color-purple-800);
+    --tw-copy-purple-900: var(--tw-color-purple-900);
+    --tw-copy-purple-950: var(--tw-color-purple-950);
+    
+    /* Fuchsia */
+    --tw-copy-fuchsia-50: var(--tw-color-fuchsia-50);
+    --tw-copy-fuchsia-100: var(--tw-color-fuchsia-100);
+    --tw-copy-fuchsia-200: var(--tw-color-fuchsia-200);
+    --tw-copy-fuchsia-300: var(--tw-color-fuchsia-300);
+    --tw-copy-fuchsia-400: var(--tw-color-fuchsia-400);
+    --tw-copy-fuchsia-500: var(--tw-color-fuchsia-500);
+    --tw-copy-fuchsia-600: var(--tw-color-fuchsia-600);
+    --tw-copy-fuchsia-700: var(--tw-color-fuchsia-700);
+    --tw-copy-fuchsia-800: var(--tw-color-fuchsia-800);
+    --tw-copy-fuchsia-900: var(--tw-color-fuchsia-900);
+    --tw-copy-fuchsia-950: var(--tw-color-fuchsia-950);
+    
+    /* Pink */
+    --tw-copy-pink-50: var(--tw-color-pink-50);
+    --tw-copy-pink-100: var(--tw-color-pink-100);
+    --tw-copy-pink-200: var(--tw-color-pink-200);
+    --tw-copy-pink-300: var(--tw-color-pink-300);
+    --tw-copy-pink-400: var(--tw-color-pink-400);
+    --tw-copy-pink-500: var(--tw-color-pink-500);
+    --tw-copy-pink-600: var(--tw-color-pink-600);
+    --tw-copy-pink-700: var(--tw-color-pink-700);
+    --tw-copy-pink-800: var(--tw-color-pink-800);
+    --tw-copy-pink-900: var(--tw-color-pink-900);
+    --tw-copy-pink-950: var(--tw-color-pink-950);
+    
+    /* Rose */
+    --tw-copy-rose-50: var(--tw-color-rose-50);
+    --tw-copy-rose-100: var(--tw-color-rose-100);
+    --tw-copy-rose-200: var(--tw-color-rose-200);
+    --tw-copy-rose-300: var(--tw-color-rose-300);
+    --tw-copy-rose-400: var(--tw-color-rose-400);
+    --tw-copy-rose-500: var(--tw-color-rose-500);
+    --tw-copy-rose-600: var(--tw-color-rose-600);
+    --tw-copy-rose-700: var(--tw-color-rose-700);
+    --tw-copy-rose-800: var(--tw-color-rose-800);
+    --tw-copy-rose-900: var(--tw-color-rose-900);
+    --tw-copy-rose-950: var(--tw-color-rose-950);
+}

packages/web/rollup.config.js

@@ -9,6 +9,7 @@ import typescript from '@rollup/plugin-typescript';
 import replace from '@rollup/plugin-replace';
 import css from 'rollup-plugin-css-only';
 import json from '@rollup/plugin-json';
+import postcss from 'rollup-plugin-postcss';
 
 const production = !process.env.ROLLUP_WATCH;
 
@@ -34,6 +35,21 @@ function serve() {
 }
 
 export default [
+  // Separate entry for Tailwind CSS processing
+  {
+    input: 'src/tailwind.css',
+    output: {
+      file: 'public/build/tailwind.css',
+    },
+    plugins: [
+      postcss({
+        extract: true,
+        minimize: production,
+        sourceMap: !production,
+      }),
+    ],
+  },
+
   {
     input: 'src/query/QueryParserWorker.js',
     output: {

packages/web/src/LoginPage.svelte

@@ -335,13 +335,13 @@
     border-radius: 5px;
     cursor: pointer;
 
-    border: 1px solid var(--theme-bg-button-inv-3);
-    background-color: var(--theme-bg-button-inv-2);
-    color: var(--theme-font-inv-1);
+    border: var(--theme-formbutton-border);
+    background: var(--theme-formbutton-background);
+    color: var(--theme-formbutton-foreground);
   }
 
   .loginButton:hover {
-    background-color: var(--theme-bg-button-inv-3);
+    background: var(--theme-formbutton-background-hover);
   }
 
   .login-link {

packages/web/src/Screen.svelte

@@ -2,8 +2,6 @@
   import WidgetContainer from './widgets/WidgetContainer.svelte';
   import WidgetIconPanel from './widgets/WidgetIconPanel.svelte';
   import {
-    currentTheme,
-    currentThemeDefinition,
     isFileDragActive,
     leftPanelWidth,
     openedSnackbars,
@@ -11,13 +9,10 @@
     visibleWidgetSideBar,
     visibleCommandPalette,
     visibleTitleBar,
-    visibleToolbar,
-    systemThemeStore,
+    rightPanelWidget,
+    rightPanelWidth,
   } from './stores';
-  import TabsPanel from './tabpanel/TabsPanel.svelte';
-  import TabRegister from './tabpanel/TabRegister.svelte';
   import CommandPalette from './commands/CommandPalette.svelte';
-  import Toolbar from './widgets/Toolbar.svelte';
   import splitterDrag from './utility/splitterDrag';
   import CurrentDropDownMenu from './modals/CurrentDropDownMenu.svelte';
   import StatusBar from './widgets/StatusBar.svelte';
@@ -28,22 +23,15 @@
   import TitleBar from './widgets/TitleBar.svelte';
   import FontIcon from './icons/FontIcon.svelte';
   import getElectron from './utility/getElectron';
-  import TabsContainer from './tabpanel/TabsContainer.svelte';
   import MultiTabsContainer from './tabpanel/MultiTabsContainer.svelte';
+  import { currentThemeType } from './plugins/themes';
+  import RightWidgetContainer from './widgets/RightWidgetContainer.svelte';
 
-  $: currentThemeType = $currentThemeDefinition?.themeType == 'dark' ? 'theme-type-dark' : 'theme-type-light';
-
-  $: themeStyle = `<st` + `yle id="themePlugin">${$currentThemeDefinition?.themeCss}</st` + `yle>`;
+  $: currentThemeTypeClass = $currentThemeType == 'dark' ? 'theme-type-dark' : 'theme-type-light';
 
   const isElectron = !!getElectron();
 </script>
 
-<svelte:head>
-  {#if $currentThemeDefinition?.themeCss}
-    {@html themeStyle}
-  {/if}
-</svelte:head>
-
 <div class="not-supported" class:isElectron>
   <div class="m-5 big-icon"><FontIcon icon="img warn" /></div>
   <div class="m-3">Sorry, DbGate is not supported on mobile devices.</div>
@@ -51,7 +39,7 @@
 </div>
 
 <div
-  class={`${$currentTheme ?? $systemThemeStore} ${currentThemeType} root dbgate-screen`}
+  class={`${currentThemeTypeClass} root dbgate-screen`}
   class:isElectron
   use:dragDropFileTarget
   on:contextmenu={e => e.preventDefault()}
@@ -77,21 +65,28 @@
   </div>
   {#if $selectedWidget && $visibleWidgetSideBar}
     <div
-      class="horizontal-split-handle splitter"
+      class="horizontal-split-handle left-splitter"
       use:splitterDrag={'clientX'}
       on:resizeSplitter={e => leftPanelWidth.update(x => x + e.detail)}
     />
   {/if}
+  {#if $rightPanelWidget}
+    <div
+      class="horizontal-split-handle right-splitter"
+      use:splitterDrag={'clientX'}
+      on:resizeSplitter={e => rightPanelWidth.update(x => x - e.detail)}
+    />
+  {/if}
+  {#if $rightPanelWidget}
+    <div class="rightpanel">
+      <RightWidgetContainer />
+    </div>
+  {/if}
   {#if $visibleCommandPalette}
     <div class="commads">
       <CommandPalette />
     </div>
   {/if}
-  {#if $visibleToolbar}
-    <div class="toolbar">
-      <Toolbar />
-    </div>
-  {/if}
   <CurrentDropDownMenu />
   <ModalLayer />
   {#if $isFileDragActive}
@@ -106,7 +101,7 @@
 
 <style>
   .root {
-    color: var(--theme-font-1);
+    color: var(--theme-generic-font);
   }
   .iconbar {
     position: fixed;
@@ -115,11 +110,11 @@
     top: var(--dim-header-top);
     bottom: var(--dim-statusbar-height);
     width: var(--dim-widget-icon-size);
-    background: var(--theme-bg-inv-1);
+    background: var(--theme-widget-panel-background);
   }
   .statusbar {
     position: fixed;
-    background: var(--theme-bg-statusbar-inv);
+    background: var(--theme-statusbar-background);
     height: var(--dim-statusbar-height);
     left: 0;
     right: 0;
@@ -132,8 +127,22 @@
     left: var(--dim-widget-icon-size);
     bottom: var(--dim-statusbar-height);
     width: var(--dim-left-panel-width);
-    background-color: var(--theme-bg-1);
+    background-color: var(--theme-sidebar-background);
+    color: var(--theme-sidebar-foreground);
     display: flex;
+    border-right: var(--theme-sidebar-border);
+  }
+
+  .rightpanel {
+    position: fixed;
+    top: var(--dim-header-top);
+    right: 0;
+    bottom: var(--dim-statusbar-height);
+    width: var(--dim-right-panel-width);
+    background-color: var(--theme-altsidebar-background);
+    color: var(--theme-altsidebar-foreground);
+    display: flex;
+    border-left: var(--theme-altsidebar-border);
   }
   .commads {
     position: fixed;
@@ -149,13 +158,20 @@
     background: var(--theme-bg-1);
   }
 
-  .splitter {
+  .left-splitter {
     position: absolute;
     top: var(--dim-header-top);
     bottom: var(--dim-statusbar-height);
     left: calc(var(--dim-widget-icon-size) + var(--dim-left-panel-width));
   }
 
+  .right-splitter {
+    position: absolute;
+    top: var(--dim-header-top);
+    bottom: var(--dim-statusbar-height);
+    right: var(--dim-content-right);
+  }
+
   .snackbar-container {
     z-index: 1000;
     position: fixed;
@@ -197,7 +213,7 @@
     top: var(--dim-header-top);
     left: var(--dim-content-left);
     bottom: var(--dim-statusbar-height);
-    right: 0;
-    background-color: var(--theme-bg-1);
+    right: var(--dim-content-right);
+    background-color: var(--theme-content-background);
   }
 </style>

packages/web/src/admin/FolderPermissionChooser.svelte

@@ -7,6 +7,7 @@
   export let onSetPermission;
   export let label;
   export let folder;
+  export let disabled = false;
 </script>
 
 <PermissionCheckBox
@@ -15,6 +16,7 @@
   permissions={$values.permissions}
   basePermissions={$values.basePermissions}
   {onSetPermission}
+  {disabled}
 />
 
 <div class="ml-4">
@@ -24,6 +26,7 @@
     permissions={$values.permissions}
     basePermissions={$values.basePermissions}
     {onSetPermission}
+    {disabled}
   />
   <PermissionCheckBox
     label="Write"
@@ -31,5 +34,6 @@
     permissions={$values.permissions}
     basePermissions={$values.basePermissions}
     {onSetPermission}
+    {disabled}
   />
 </div>

packages/web/src/ai/ThemeAiAssistantWidget.svelte

@@ -0,0 +1 @@
+This component is only for Premium edition

packages/web/src/appobj/AppFileAppObject.svelte

@@ -53,14 +53,15 @@
   import InputTextModal from '../modals/InputTextModal.svelte';
   import ConfirmModal from '../modals/ConfirmModal.svelte';
   import { apiCall } from '../utility/api';
+  import { _t } from '../translations';
 
   export let data;
 
   const handleRename = () => {
     showModal(InputTextModal, {
       value: data.fileName,
-      label: 'New file name',
-      header: 'Rename file',
+      label: _t('appFile.newFileName', { defaultMessage: 'New file name' }),
+      header: _t('appFile.renameFile', { defaultMessage: 'Rename file' }),
       onConfirm: newFile => {
         apiCall('apps/rename-file', {
           file: data.fileName,
@@ -74,7 +75,7 @@
 
   const handleDelete = () => {
     showModal(ConfirmModal, {
-      message: `Really delete file ${data.fileName}?`,
+      message: _t('appFile.deleteFileConfirm', { defaultMessage: 'Really delete file {fileName}?', values: { fileName: data.fileName } }),
       onConfirm: () => {
         apiCall('apps/delete-file', {
           file: data.fileName,
@@ -101,10 +102,10 @@
 
   function createMenu() {
     return [
-      { text: 'Delete', onClick: handleDelete },
-      { text: 'Rename', onClick: handleRename },
-      data.fileType.endsWith('.sql') && { text: 'Open SQL', onClick: handleOpenSqlFile },
-      data.fileType.endsWith('.json') && { text: 'Open JSON', onClick: handleOpenJsonFile },
+      { text: _t('common.delete', { defaultMessage: 'Delete' }), onClick: handleDelete },
+      { text: _t('common.rename', { defaultMessage: 'Rename' }), onClick: handleRename },
+      data.fileType.endsWith('.sql') && { text: _t('common.openSql', { defaultMessage: 'Open SQL' }), onClick: handleOpenSqlFile },
+      data.fileType.endsWith('.json') && { text: _t('common.openJson', { defaultMessage: 'Open JSON' }), onClick: handleOpenJsonFile },
 
       // data.fileType.endsWith('.yaml') && { text: 'Open YAML', onClick: handleOpenYamlFile },
     ];

packages/web/src/appobj/AppFolderAppObject.svelte

@@ -15,6 +15,7 @@
   import InputTextModal from '../modals/InputTextModal.svelte';
   import { apiCall } from '../utility/api';
   import { useConnectionList } from '../utility/metadataLoaders';
+  import { _t } from '../translations';
 
   export let data;
 
@@ -34,8 +35,8 @@
 
     showModal(InputTextModal, {
       value: name,
-      label: 'New application name',
-      header: 'Rename application',
+      label: _t('appFolder.newApplicationName', { defaultMessage: 'New application name' }),
+      header: _t('appFolder.renameApplication', { defaultMessage: 'Rename application' }),
       onConfirm: async newFolder => {
         await apiCall('apps/rename-folder', {
           folder: data.name,
@@ -60,16 +61,16 @@
 
   function createMenu() {
     return [
-      { text: 'Delete', onClick: handleDelete },
-      { text: 'Rename', onClick: handleRename },
+      { text: _t('common.delete', { defaultMessage: 'Delete' }), onClick: handleDelete },
+      { text: _t('common.rename', { defaultMessage: 'Rename' }), onClick: handleRename },
 
       $currentDatabase && [
         !isOnCurrentDb($currentDatabase, $connections) && {
-          text: 'Enable on current database',
+          text: _t('appFolder.enableOnCurrentDatabase', { defaultMessage: 'Enable on current database' }),
           onClick: () => setOnCurrentDb(true),
         },
         isOnCurrentDb($currentDatabase, $connections) && {
-          text: 'Disable on current database',
+          text: _t('appFolder.disableOnCurrentDatabase', { defaultMessage: 'Disable on current database' }),
           onClick: () => setOnCurrentDb(false),
         },
       ],
@@ -90,7 +91,7 @@
   title={data.name}
   icon={'img app'}
   statusIcon={isOnCurrentDb($currentDatabase, $connections) ? 'icon check' : null}
-  statusTitle={`Application ${data.name} is used for database ${$currentDatabase?.name}`}
+  statusTitle={_t('appFolder.applicationUsedForDatabase', { defaultMessage: 'Application {application} is used for database {database}', values: { application: data.name, database: $currentDatabase?.name } })}
   isBold={data.name == $currentApplication}
   on:click={() => ($currentApplication = data.name)}
   menu={createMenu}

packages/web/src/appobj/AppObjectCore.svelte

@@ -213,20 +213,20 @@
     position: relative;
   }
   .main:hover:not(.disableHover) {
-    background-color: var(--theme-bg-hover);
+    background-color: var(--theme-sidebar-background-hover);
   }
   .isBold {
     font-weight: bold;
   }
   .isGrayed {
-    color: var(--theme-font-3);
+    color: var(--theme-generic-font-grayed);
   }
 
   .isChoosed {
-    background-color: var(--theme-bg-3);
+    background-color: var(--theme-sidebar-background-active);
   }
   :global(.app-object-list-focused) .isChoosed {
-    background-color: var(--theme-bg-selected);
+    background-color: var(--theme-sidebar-background-focused);
   }
   .status {
     margin-left: 5px;
@@ -234,23 +234,24 @@
   .ext-info {
     font-weight: normal;
     margin-left: 5px;
-    color: var(--theme-font-3);
+    color: var(--theme-sidebar-foreground-grayed);
   }
   .expand-icon {
     margin-right: 3px;
   }
 
   .pin,
-  .pin-active {
+  .pin-active,
+  .unpin {
     z-index: 150;
     position: absolute;
     right: 0;
   }
   .pin {
-    color: var(--theme-font-2);
+    color: var(--theme-sidebar-foreground-button);
   }
   .pin:hover {
-    color: var(--theme-font-hover);
+    color: var(--theme-sidebar-foreground-hover);
   }
   .main .pin {
     visibility: hidden;
@@ -260,13 +261,13 @@
   }
 
   .unpin {
-    color: var(--theme-font-2);
+    color: var(--theme-sidebar-foreground-button);
   }
   .unpin:hover {
-    color: var(--theme-font-hover);
+    color: var(--theme-sidebar-foreground-hover);
   }
 
   .pin-active {
-    color: var(--theme-font-2);
+    color: var(--theme-sidebar-foreground-button);
   }
 </style>

packages/web/src/appobj/AppObjectGroup.svelte

@@ -77,7 +77,7 @@
     </div>
   {/if}
 
-  <div on:drop={handleDrop}>
+  <div on:drop={handleDrop} data-testid={`app-object-group-items-${_.kebabCase(group)}`}>
     {#each items as item}
       <AppObjectListItem
         isHidden={!item.isMatched}
@@ -106,7 +106,7 @@
   }
 
   .group:hover {
-    background-color: var(--theme-bg-hover);
+    background-color: var(--theme-sidebar-background-hover);
   }
   .expand-icon {
     margin-right: 3px;

packages/web/src/appobj/ArchiveFileAppObject.svelte

@@ -82,6 +82,7 @@
   import { apiCall } from '../utility/api';
   import { openImportExportTab } from '../utility/importExportTools';
   import { isProApp } from '../utility/proTools';
+  import { _t } from '../translations';
 
   export let data;
   $: isZipped = data.folderName?.endsWith('.zip');
@@ -89,8 +90,8 @@
   const handleRename = () => {
     showModal(InputTextModal, {
       value: data.fileName,
-      label: 'New file name',
-      header: 'Rename file',
+      label: _t('archiveFile.newFileName', { defaultMessage: 'New file name' }),
+      header: _t('archiveFile.renameFile', { defaultMessage: 'Rename file' }),
       onConfirm: newFile => {
         apiCall('archive/rename-file', {
           file: data.fileName,
@@ -104,7 +105,7 @@
 
   const handleDelete = () => {
     showModal(ConfirmModal, {
-      message: `Really delete file ${data.fileName}?`,
+      message: _t('archiveFile.deleteFileConfirm', { defaultMessage: 'Really delete file {fileName}?', values: { fileName: data.fileName } }),
       onConfirm: () => {
         apiCall('archive/delete-file', {
           file: data.fileName,
@@ -147,10 +148,10 @@
     }
 
     return [
-      data.fileType == 'jsonl' && { text: 'Open', onClick: handleOpenArchive },
-      data.fileType == 'jsonl' && { text: 'Open in text editor', onClick: handleOpenJsonLinesText },
-      !isZipped && { text: 'Delete', onClick: handleDelete },
-      !isZipped && { text: 'Rename', onClick: handleRename },
+      data.fileType == 'jsonl' && { text: _t('common.open', { defaultMessage: 'Open' }), onClick: handleOpenArchive },
+      data.fileType == 'jsonl' && { text: _t('common.openInTextEditor', { defaultMessage: 'Open in text editor' }), onClick: handleOpenJsonLinesText },
+      !isZipped && { text: _t('common.delete', { defaultMessage: 'Delete' }), onClick: handleDelete },
+      !isZipped && { text: _t('common.rename', { defaultMessage: 'Rename' }), onClick: handleRename },
       data.fileType == 'jsonl' &&
         createQuickExportMenu(
           fmt => async () => {
@@ -185,19 +186,19 @@
             },
           }
         ),
-      data.fileType.endsWith('.sql') && { text: 'Open SQL', onClick: handleOpenSqlFile },
-      data.fileType.endsWith('.yaml') && { text: 'Open YAML', onClick: handleOpenYamlFile },
+      data.fileType.endsWith('.sql') && { text: _t('common.openSql', { defaultMessage: 'Open SQL' }), onClick: handleOpenSqlFile },
+      data.fileType.endsWith('.yaml') && { text: _t('common.openYaml', { defaultMessage: 'Open YAML' }), onClick: handleOpenYamlFile },
       !isZipped &&
         isProApp() &&
         data.fileType == 'jsonl' && {
-          text: 'Open in profiler',
+          text: _t('common.openInProfiler', { defaultMessage: 'Open in profiler' }),
           submenu: getExtensions()
             .drivers.filter(eng => eng.profilerFormatterFunction)
             .map(eng => ({
               text: eng.title,
               onClick: () => {
                 openNewTab({
-                  title: 'Profiler',
+                  title: _t('common.profiler', { defaultMessage: 'Profiler' }),
                   icon: 'img profiler',
                   tabComponent: 'ProfilerTab',
                   props: {

packages/web/src/appobj/ArchiveFolderAppObject.svelte

@@ -21,14 +21,15 @@
   import { isProApp } from '../utility/proTools';
   import { extractShellConnection } from '../impexp/createImpExpScript';
   import { saveFileToDisk } from '../utility/exportFileTools';
+  import { _t } from '../translations';
 
   export let data;
 
   const handleDelete = () => {
     showModal(ConfirmModal, {
       message: data.name.endsWith('.link')
-        ? `Really delete link to folder ${data.name}? Folder content remains untouched.`
-        : `Really delete folder ${data.name}?`,
+        ? _t('archiveFolder.deleteLinkConfirm', { defaultMessage: 'Really delete link to folder {folderName}? Folder content remains untouched.', values: { folderName: data.name } })
+        : _t('archiveFolder.deleteFolderConfirm', { defaultMessage: 'Really delete folder {folderName}?', values: { folderName: data.name } }),
       onConfirm: () => {
         apiCall('archive/delete-folder', { folder: data.name });
       },
@@ -42,8 +43,8 @@
 
     showModal(InputTextModal, {
       value: name,
-      label: 'New folder name',
-      header: 'Rename folder',
+      label: _t('archiveFolder.newFolderName', { defaultMessage: 'New folder name' }),
+      header: _t('archiveFolder.renameFolder', { defaultMessage: 'Rename folder' }),
       onConfirm: async newFolder => {
         await apiCall('archive/rename-folder', {
           folder: data.name,
@@ -95,7 +96,7 @@ await dbgateApi.deployDb(${JSON.stringify(
   const handleCompareWithCurrentDb = () => {
     openNewTab(
       {
-        title: 'Compare',
+        title: _t('common.compare', { defaultMessage: 'Compare' }),
         icon: 'img compare',
         tabComponent: 'CompareModelTab',
         props: {
@@ -153,7 +154,7 @@ await dbgateApi.deployDb(${JSON.stringify(
         });
       },
       {
-        formatLabel: 'ZIP files',
+        formatLabel: _t('common.zipFiles', { defaultMessage: 'ZIP files' }),
         formatExtension: 'zip',
         defaultFileName: data.name?.endsWith('.zip') ? data.name : data.name + '.zip',
       }
@@ -162,28 +163,28 @@ await dbgateApi.deployDb(${JSON.stringify(
 
   function createMenu() {
     return [
-      data.name != 'default' && { text: 'Delete', onClick: handleDelete },
-      data.name != 'default' && { text: 'Rename', onClick: handleRename },
-      isProApp() && { text: 'Data deployer', onClick: handleOpenDataDeployTab },
+      data.name != 'default' && { text: _t('common.delete', { defaultMessage: 'Delete' }), onClick: handleDelete },
+      data.name != 'default' && { text: _t('common.rename', { defaultMessage: 'Rename' }), onClick: handleRename },
+      isProApp() && { text: _t('common.dataDeployer', { defaultMessage: 'Data deployer' }), onClick: handleOpenDataDeployTab },
       $currentDatabase && [
-        { text: 'Generate deploy DB SQL', onClick: handleGenerateDeploySql },
-        hasPermission(`run-shell-script`) && { text: 'Shell: Deploy DB', onClick: handleGenerateDeployScript },
+        { text: _t('archiveFolder.generateDeployDbSql', { defaultMessage: 'Generate deploy DB SQL' }), onClick: handleGenerateDeploySql },
+        hasPermission(`run-shell-script`) && { text: _t('archiveFolder.shellDeployDb', { defaultMessage: 'Shell: Deploy DB' }), onClick: handleGenerateDeployScript },
       ],
       data.name != 'default' &&
         isProApp() &&
-        data.name.endsWith('.zip') && { text: 'Unpack ZIP', onClick: () => handleZipUnzip('archive/unzip') },
+        data.name.endsWith('.zip') && { text: _t('archiveFolder.unpackZip', { defaultMessage: 'Unpack ZIP' }), onClick: () => handleZipUnzip('archive/unzip') },
       data.name != 'default' &&
         isProApp() &&
-        !data.name.endsWith('.zip') && { text: 'Pack (create ZIP)', onClick: () => handleZipUnzip('archive/zip') },
+        !data.name.endsWith('.zip') && { text: _t('archiveFolder.packZip', { defaultMessage: 'Pack (create ZIP)' }), onClick: () => handleZipUnzip('archive/zip') },
 
-      isProApp() && { text: 'Download ZIP', onClick: handleDownloadZip },
+      isProApp() && { text: _t('archiveFolder.downloadZip', { defaultMessage: 'Download ZIP' }), onClick: handleDownloadZip },
 
       data.name != 'default' &&
         hasPermission('dbops/model/compare') &&
         isProApp() &&
         _.get($currentDatabase, 'connection._id') && {
           onClick: handleCompareWithCurrentDb,
-          text: `Compare with ${_.get($currentDatabase, 'name')}`,
+          text: _t('archiveFolder.compareWithCurrentDb', { defaultMessage: 'Compare with {name}', values: { name: _.get($currentDatabase, 'name') } }),
         },
     ];
   }

packages/web/src/appobj/ClosedTabAppObject.svelte

@@ -1,5 +1,10 @@
 <script lang="ts" context="module">
   export const extractKey = data => data.tabid;
+
+  export const createMatcher =
+    filter =>
+    ({ title }) =>
+      filterName(filter, title);
 </script>
 
 <script lang="ts">
@@ -9,6 +14,7 @@
   import moment from 'moment';
 
   import AppObjectCore from './AppObjectCore.svelte';
+  import { filterName } from 'dbgate-tools';
 
   export let data;
 
@@ -65,6 +71,6 @@
 <style>
   .info {
     margin-left: 30px;
-    color: var(--theme-font-3);
+    color: var(--theme-generic-font-grayed);
   }
 </style>

packages/web/src/appobj/CloudContentAppObject.svelte

@@ -135,7 +135,7 @@
   .info {
     margin-left: 30px;
     margin-right: 5px;
-    color: var(--theme-font-3);
+    color: var(--theme-generic-font-grayed);
     white-space: nowrap;
   }
 </style>

packages/web/src/appobj/ConnectionAppObject.svelte

@@ -431,13 +431,14 @@
   }
 
   $: apps = useAllApps();
+  $: driver = $extensions.drivers.find(x => x.engine == data.engine);
 </script>
 
 <AppObjectCore
   {...$$restProps}
   {data}
   title={getConnectionLabel(data, { showUnsaved: true })}
-  icon={data._id.startsWith('cloud://') ? 'img cloud-connection' : data.singleDatabase ? 'img database' : 'img server'}
+  icon={driver?.icon || (data._id.startsWith('cloud://') ? 'img cloud-connection' : data.singleDatabase ? 'img database' : 'img server')}
   isBold={data.singleDatabase
     ? $currentDatabase?.connection?._id == data._id && $currentDatabase?.name == data.defaultDatabase
     : $currentDatabase?.connection?._id == data._id}

packages/web/src/appobj/DatabaseAppObject.svelte

@@ -407,8 +407,8 @@ await dbgateApi.executeQuery(${JSON.stringify(
 
     const handleCreateNewApp = () => {
       showModal(InputTextModal, {
-        header: 'New application',
-        label: 'Application name',
+        header: _t('database.newApplication', { defaultMessage: 'New application' }),
+        label: _t('database.applicationName', { defaultMessage: 'Application name' }),
         value: _.startCase(name),
         onConfirm: async appName => {
           const newAppId = await apiCall('apps/create-app-from-db', {
@@ -446,7 +446,7 @@ await dbgateApi.executeQuery(${JSON.stringify(
         driver?.databaseEngineTypes?.includes('document') && {
           onClick: handleNewCollection,
           text: _t('database.newCollection', {
-            defaultMessage: 'New collection/container'
+            defaultMessage: 'New collection/container',
           }),
         },
       hasPermission(`dbops/query`) &&
@@ -467,14 +467,12 @@ await dbgateApi.executeQuery(${JSON.stringify(
 
       { divider: true },
       isSqlOrDoc &&
-        isProApp() &&
         !connection.isReadOnly &&
         hasPermission(`dbops/import`) && {
           onClick: handleImport,
           text: _t('database.import', { defaultMessage: 'Import' }),
         },
       isSqlOrDoc &&
-        isProApp() &&
         hasPermission(`dbops/export`) && {
           onClick: handleExport,
           text: _t('database.export', { defaultMessage: 'Export' }),
@@ -671,10 +669,12 @@ await dbgateApi.executeQuery(${JSON.stringify(
   import { getNumberIcon } from '../icons/FontIcon.svelte';
   import { getDatabaseClickActionSetting } from '../settings/settingsTools';
   import { _t } from '../translations';
-  import { tick } from 'svelte';
 
   export let data;
   export let passProps;
+  export let passExtInfo = undefined;
+  export let passIcon = undefined;
+  export let passColorMark = undefined;
 
   function createMenu() {
     return getDatabaseMenuItems(
@@ -702,10 +702,11 @@ await dbgateApi.executeQuery(${JSON.stringify(
   {...$$restProps}
   {data}
   title={data.name}
-  extInfo={data.extInfo}
-  icon="img database"
-  colorMark={passProps?.connectionColorFactory &&
-    passProps?.connectionColorFactory({ conid: data?.connection?._id, database: data.name }, null, null, false)}
+  extInfo={passExtInfo ?? data.extInfo}
+  icon={passIcon || 'img database'}
+  colorMark={passColorMark ||
+    (passProps?.connectionColorFactory &&
+      passProps?.connectionColorFactory({ conid: data?.connection?._id, database: data.name }, null, null, false))}
   isBold={$currentDatabase?.connection?._id == data?.connection?._id &&
     extractDbNameFromComposite($currentDatabase?.name) == data.name}
   on:dblclick={() => {

packages/web/src/appobj/DatabaseObjectAppObject.svelte

@@ -1,6 +1,7 @@
 <script lang="ts" context="module">
   import { copyTextToClipboard } from '../utility/clipboard';
   import { _t, _tval, DefferedTranslationResult } from '../translations';
+  import sqlFormatter from 'sql-formatter';
 
   export const extractKey = ({ schemaName, pureName }) => (schemaName ? `${schemaName}.${pureName}` : pureName);
   export const createMatcher =
@@ -88,7 +89,8 @@
     isRename?: boolean;
     isTruncate?: boolean;
     isCopyTableName?: boolean;
-    isDuplicateTable?: boolean;
+    isTableBackup?: boolean;
+    isTableRestore?: boolean;
     isDiagram?: boolean;
     functionName?: string;
     isExport?: boolean;
@@ -106,6 +108,8 @@
   }
 
   function createMenusCore(objectTypeField, driver, data): DbObjMenuItem[] {
+    const backupMatch = data.objectTypeField === 'tables' ? data.pureName.match(TABLE_BACKUP_REGEX) : null;
+
     switch (objectTypeField) {
       case 'tables':
         return [
@@ -175,11 +179,18 @@
             isCopyTableName: true,
             requiresWriteAccess: false,
           },
-          hasPermission('dbops/table/backup') && {
-            label: _t('dbObject.createTableBackup', { defaultMessage: 'Create table backup' }),
-            isDuplicateTable: true,
-            requiresWriteAccess: true,
-          },
+          hasPermission('dbops/table/backup') &&
+            !backupMatch && {
+              label: _t('dbObject.createTableBackup', { defaultMessage: 'Create table backup' }),
+              isTableBackup: true,
+              requiresWriteAccess: true,
+            },
+          hasPermission('dbops/table/restore') &&
+            backupMatch && {
+              label: _t('dbObject.createRestoreScript', { defaultMessage: 'Create restore script' }),
+              isTableRestore: true,
+              requiresWriteAccess: true,
+            },
           hasPermission('dbops/model/view') && {
             label: _t('dbObject.showDiagram', { defaultMessage: 'Show diagram' }),
             isDiagram: true,
@@ -188,12 +199,12 @@
             divider: true,
           },
           hasPermission('dbops/export') && {
-            label: 'Export',
+            label: _t('common.export', { defaultMessage: 'Export' }),
             functionName: 'tableReader',
             isExport: true,
           },
           hasPermission('dbops/import') && {
-            label: 'Import',
+            label: _t('common.import', { defaultMessage: 'Import' }),
             isImport: true,
             requiresWriteAccess: true,
           },
@@ -249,7 +260,7 @@
             divider: true,
           },
           {
-            label: 'Export',
+            label: _t('common.export', { defaultMessage: 'Export' }),
             isExport: true,
             functionName: 'tableReader',
           },
@@ -299,7 +310,7 @@
             divider: true,
           },
           {
-            label: 'Export',
+            label: _t('common.export', { defaultMessage: 'Export' }),
             isExport: true,
             functionName: 'tableReader',
           },
@@ -391,7 +402,7 @@
             icon: 'img perspective',
           },
           hasPermission('dbops/export') && {
-            label: 'Export',
+            label: _t('common.export', { defaultMessage: 'Export' }),
             isExport: true,
             functionName: 'tableReader',
           },
@@ -637,7 +648,7 @@
           });
         },
       });
-    } else if (menu.isDuplicateTable) {
+    } else if (menu.isTableBackup) {
       const driver = await getDriver();
       const dmp = driver.createDumper();
       const newTable = _.cloneDeep(data);
@@ -671,6 +682,25 @@
         },
         engine: driver.engine,
       });
+    } else if (menu.isTableRestore) {
+      const backupMatch = data.objectTypeField === 'tables' ? data.pureName.match(TABLE_BACKUP_REGEX) : null;
+
+      const driver = await getDriver();
+      const dmp = driver.createDumper();
+      const db = await getDatabaseInfo(data);
+      if (db) {
+        const originalTable = db?.tables?.find(x => x.pureName == backupMatch[1] && x.schemaName == data.schemaName);
+        if (originalTable) {
+          createTableRestoreScript(data, originalTable, dmp);
+          newQuery({
+            title: _t('dbObject.restoreScript', {
+              defaultMessage: 'Restore {name} #',
+              values: { name: backupMatch[1] },
+            }),
+            initialData: sqlFormatter.format(dmp.s),
+          });
+        }
+      }
     } else if (menu.isImport) {
       const { conid, database } = data;
       openImportExportTab({
@@ -724,9 +754,8 @@
     const coreMenus = createMenusCore(objectTypeField, driver, data);
 
     const filteredSumenus = coreMenus.map(item => {
+      if (!item) return item;
       if (!item.submenu) {
-        if (!item) return item;
-
         return { ...item, label: _tval(item.label) };
       }
       return {
@@ -743,7 +772,7 @@
       };
     });
 
-    const filteredNoEmptySubmenus = filteredSumenus.filter(x => !x.submenu || x.submenu.length > 0);
+    const filteredNoEmptySubmenus = _.compact(filteredSumenus).filter(x => !x.submenu || x.submenu.length > 0);
 
     return filteredNoEmptySubmenus;
   }
@@ -1008,6 +1037,8 @@
 
     return handleDatabaseObjectClick(data, { forceNewTab, tabPreviewMode, focusTab });
   }
+
+  export const TABLE_BACKUP_REGEX = /^_(.*)_(\d\d\d\d)-(\d\d)-(\d\d)-(\d\d)-(\d\d)-(\d\d)$/;
 </script>
 
 <script lang="ts">
@@ -1025,7 +1056,7 @@
   } from '../stores';
   import openNewTab from '../utility/openNewTab';
   import { extractDbNameFromComposite, filterNameCompoud, getConnectionLabel } from 'dbgate-tools';
-  import { getConnectionInfo } from '../utility/metadataLoaders';
+  import { getConnectionInfo, getDatabaseInfo } from '../utility/metadataLoaders';
   import fullDisplayName from '../utility/fullDisplayName';
   import { showModal } from '../modals/modalTools';
   import { findEngineDriver } from 'dbgate-tools';
@@ -1047,6 +1078,8 @@
   import { getBoolSettingsValue, getOpenDetailOnArrowsSettings } from '../settings/settingsTools';
   import { isProApp } from '../utility/proTools';
   import formatFileSize from '../utility/formatFileSize';
+  import { createTableRestoreScript } from '../utility/tableRestoreScript';
+  import newQuery from '../query/newQuery';
 
   export let data;
   export let passProps;
@@ -1086,14 +1119,21 @@
   }
 
   $: isPinned = !!$pinnedTables.find(x => testEqual(data, x));
+
+  $: backupParsed = data.objectTypeField === 'tables' ? data.pureName.match(TABLE_BACKUP_REGEX) : null;
+  $: backupTitle =
+    backupParsed != null
+      ? `${backupParsed[1]} (${backupParsed[2]}-${backupParsed[3]}-${backupParsed[4]} ${backupParsed[5]}:${backupParsed[6]}:${backupParsed[7]})`
+      : null;
 </script>
 
 <AppObjectCore
   {...$$restProps}
   module={$$props.module}
   {data}
-  title={data.schemaName && !passProps?.hideSchemaName ? `${data.schemaName}.${data.pureName}` : data.pureName}
-  icon={databaseObjectIcons[data.objectTypeField]}
+  title={backupTitle ??
+    (data.schemaName && !passProps?.hideSchemaName ? `${data.schemaName}.${data.pureName}` : data.pureName)}
+  icon={backupParsed ? 'img table-backup' : databaseObjectIcons[data.objectTypeField]}
   menu={createMenu}
   showPinnedInsteadOfUnpin={passProps?.showPinnedInsteadOfUnpin}
   onPin={passProps?.ingorePin ? null : isPinned ? null : () => pinnedTables.update(list => [...list, data])}

packages/web/src/appobj/OpenedTabAppObject.svelte

@@ -0,0 +1,69 @@
+<script lang="ts" context="module">
+  import { filterName } from 'dbgate-tools';
+
+  export const extractKey = data => data.tabid;
+
+  export const createMatcher =
+    filter =>
+    ({ title }) =>
+      filterName(filter, title);
+</script>
+
+<script lang="ts">
+  import { openedTabs } from '../stores';
+  import { setSelectedTabFunc } from '../utility/common';
+  import tabs from '../tabs';
+  import uuidv1 from 'uuid/v1';
+
+  import AppObjectCore from './AppObjectCore.svelte';
+  import { apiCall } from '../utility/api';
+
+  export let data;
+
+  const handleClose = () => {
+    openedTabs.update(tabs => tabs.map(x => (x.tabid == data.tabid ? { ...x, closedTime: new Date().getTime() } : x)));
+  };
+
+  function createMenu() {
+    return [{ text: 'Close', onClick: handleClose }];
+  }
+
+  const onClick = () => {
+    openedTabs.update(files => setSelectedTabFunc(files, data.tabid));
+  };
+
+  function handlePin() {
+    apiCall('files/save', {
+      folder: 'favorites',
+      file: uuidv1(),
+      format: 'json',
+      data,
+    });
+  }
+
+  $: tabComponent = data.tabComponent;
+</script>
+
+<AppObjectCore
+  {...$$restProps}
+  {data}
+  title={data.title}
+  icon={data.icon}
+  isBold={!!data.selected}
+  on:click={onClick}
+  isBusy={data.busy}
+  menu={createMenu}
+  onPin={tabComponent &&
+    tabs[tabComponent] &&
+    tabs[tabComponent].allowAddToFavorites &&
+    tabs[tabComponent].allowAddToFavorites(data) &&
+    handlePin}
+  on:middleclick={handleClose}
+/>
+
+<style>
+  .info {
+    margin-left: 30px;
+    color: var(--theme-generic-font-grayed);
+  }
+</style>

packages/web/src/appobj/PinnedAppObject.svelte

@@ -1,6 +1,7 @@
 <script lang="ts" context="module">
   import DatabaseAppObject from './DatabaseAppObject.svelte';
   import DatabaseObjectAppObject from './DatabaseObjectAppObject.svelte';
+  import { extensions } from '../stores';
 
   export const extractKey = data => {
     if (data.objectTypeField) {
@@ -27,8 +28,10 @@
 <script lang="ts">
   import _, { values } from 'lodash';
   import { draggedPinnedObject, pinnedDatabases, pinnedTables } from '../stores';
+  import { getConnectionLabel } from 'dbgate-tools';
 
   export let data;
+  export let passProps;
 </script>
 
 {#if data}
@@ -69,6 +72,9 @@
       on:dragend={() => {
         $draggedPinnedObject = null;
       }}
+      passExtInfo={getConnectionLabel(data.connection)}
+      passIcon={$extensions.drivers.find(x => x.engine == data.connection.engine)?.icon}
+      passColorMark={passProps?.connectionColorFactory && passProps?.connectionColorFactory({ conid: data.connection._id })}
     />
   {/if}
 {/if}

packages/web/src/appobj/PublicCloudFileAppObject.svelte

@@ -11,10 +11,12 @@
 <script lang="ts">
   import { apiCall } from '../utility/api';
   import newQuery from '../query/newQuery';
-  import { filterName, getSqlFrontMatter, setSqlFrontMatter } from 'dbgate-tools';
+  import { filterName, getSqlFrontMatter, safeJsonParse, setSqlFrontMatter } from 'dbgate-tools';
   import { currentActiveCloudTags } from '../stores';
   import _ from 'lodash';
   import yaml from 'js-yaml';
+  import { _t } from '../translations';
+  import { currentThemeDefinition } from '../plugins/themes';
 
   export let data;
 
@@ -33,8 +35,28 @@
     });
   }
 
+  async function handleUseTheme() {
+    const fileData = await apiCall('cloud/public-file-data', { path: data.path });
+    $currentThemeDefinition = safeJsonParse(fileData.text);
+  }
+
   function createMenu() {
-    return [{ text: 'Open', onClick: handleOpenSqlFile }];
+    if (data?.type == 'sql') {
+      return [{ text: _t('common.open', { defaultMessage: 'Open' }), onClick: handleOpenSqlFile }];
+    }
+    if (data?.type == 'theme') {
+      return [{ text: _t('theme.useTheme', { defaultMessage: 'Use theme' }), onClick: handleUseTheme }];
+    }
+    return [];
+  }
+
+  function handleOpenFile() {
+    if (data?.type == 'sql') {
+      handleOpenSqlFile();
+    }
+    if (data?.type == 'theme') {
+      handleUseTheme();
+    }
   }
 
   $: relatedToCurrentConnection = _.intersection($currentActiveCloudTags, data.tags || []).length > 0;
@@ -43,10 +65,10 @@
 <AppObjectCore
   {...$$restProps}
   {data}
-  icon={data.icon ?? 'img sql-file'}
+  icon={data.icon ?? (data.type == 'sql' ? 'img sql-file' : 'img theme')}
   title={data.title}
   menu={createMenu}
-  on:click={handleOpenSqlFile}
+  on:click={handleOpenFile}
   isGrayed={!relatedToCurrentConnection}
   data-testid={`public-cloud-file-${data.path}`}
 >
@@ -61,7 +83,7 @@
   .info {
     margin-left: 30px;
     margin-right: 5px;
-    color: var(--theme-font-3);
+    color: var(--theme-generic-font-grayed);
     white-space: nowrap;
   }
 </style>

packages/web/src/appobj/SavedFileAppObject.svelte

@@ -142,6 +142,16 @@
     label: 'Model transform file',
   };
 
+  const themes: FileTypeHandler = {
+    icon: 'img theme',
+    format: 'text',
+    tabComponent: 'JsonEditorTab',
+    folder: 'themes',
+    currentConnection: false,
+    extension: 'json',
+    label: 'Theme file',
+  };
+
   const apps: FileTypeHandler = isProApp()
     ? {
         icon: 'img app',
@@ -164,6 +174,7 @@
     perspectives,
     impexp,
     modtrans,
+    themes,
     datadeploy,
     dbcompare,
     apps,
@@ -193,6 +204,7 @@
   import { saveFileToDisk } from '../utility/exportFileTools';
   import { getConnectionInfo } from '../utility/metadataLoaders';
   import { showSnackbarError } from '../utility/snackbar';
+  import { _t } from '../translations';
 
   export let data;
 
@@ -214,27 +226,26 @@
 
   function createMenu() {
     return [
-      handler?.tabComponent && { text: 'Open', onClick: openTab },
+      handler?.tabComponent && { text: _t('common.open', { defaultMessage: 'Open' }), onClick: openTab },
 
-      !data.teamFileId && hasPermission(`files/${data.folder}/write`) && { text: 'Rename', onClick: handleRename },
-      !data.teamFileId && hasPermission(`files/${data.folder}/write`) && { text: 'Create copy', onClick: handleCopy },
-      !data.teamFileId && hasPermission(`files/${data.folder}/write`) && { text: 'Delete', onClick: handleDelete },
-
-      data.teamFileId && data.allowWrite && { text: 'Rename', onClick: handleRename },
+      !data.teamFileId && hasPermission(`files/${data.folder}/write`) && { text: _t('common.rename', { defaultMessage: 'Rename' }), onClick: handleRename },
+      !data.teamFileId && hasPermission(`files/${data.folder}/write`) && { text: _t('common.createCopy', { defaultMessage: 'Create copy' }), onClick: handleCopy },
+      !data.teamFileId && hasPermission(`files/${data.folder}/write`) && { text: _t('common.delete', { defaultMessage: 'Delete' }), onClick: handleDelete },
+      data.teamFileId && data.allowWrite && { text: _t('common.rename', { defaultMessage: 'Rename' }), onClick: handleRename },
       data.teamFileId &&
         data.allowRead &&
-        hasPermission('all-team-files/create') && { text: 'Create copy', onClick: handleCopy },
-      data.teamFileId && data.allowWrite && { text: 'Delete', onClick: handleDelete },
+        hasPermission('all-team-files/create') && { text: _t('common.createCopy', { defaultMessage: 'Create copy' }), onClick: handleCopy },
+      data.teamFileId && data.allowWrite && { text: _t('common.delete', { defaultMessage: 'Delete' }), onClick: handleDelete },
 
-      folder == 'markdown' && { text: 'Show page', onClick: showMarkdownPage },
-      !data.teamFileId && { text: 'Download', onClick: handleDownload },
-      data.teamFileId && data.allowRead && { text: 'Download', onClick: handleDownload },
+      folder == 'markdown' && { text: _t('common.showPage', { defaultMessage: 'Show page' }), onClick: showMarkdownPage },
+      !data.teamFileId && { text: _t('common.download', { defaultMessage: 'Download' }), onClick: handleDownload },
+      data.teamFileId && data.allowRead && { text: _t('common.download', { defaultMessage: 'Download' }), onClick: handleDownload },
     ];
   }
 
   const handleDelete = () => {
     showModal(ConfirmModal, {
-      message: `Really delete file ${data.file}?`,
+      message: _t('common.reallyDeleteFile', { defaultMessage: 'Really delete file {file}?', values: { file: data.file } }),
       onConfirm: () => {
         if (data.teamFileId) {
           apiCall('team-files/delete', { teamFileId: data.teamFileId });
@@ -253,8 +264,8 @@
   const handleRename = () => {
     showModal(InputTextModal, {
       value: data.file,
-      label: 'New file name',
-      header: 'Rename file',
+      label: _t('common.newFileName', { defaultMessage: 'New file name' }),
+      header: _t('common.renameFile', { defaultMessage: 'Rename file' }),
       onConfirm: newFile => {
         if (data.teamFileId) {
           apiCall('team-files/update', { teamFileId: data.teamFileId, name: newFile });
@@ -274,8 +285,8 @@
   const handleCopy = () => {
     showModal(InputTextModal, {
       value: data.file,
-      label: 'New file name',
-      header: 'Copy file',
+      label: _t('savedFile.newFileName', { defaultMessage: 'New file name' }),
+      header: _t('savedFile.copyFile', { defaultMessage: 'Copy file' }),
       onConfirm: newFile => {
         if (data.teamFileId) {
           apiCall('team-files/copy', { teamFileId: data.teamFileId, newName: newFile });
@@ -323,12 +334,12 @@
     if (data.teamFileId) {
       if (data?.metadata?.autoExecute) {
         if (!data.allowUse) {
-          showSnackbarError('You do not have permission to use this team file');
+          showSnackbarError(_t('savedFile.noPermissionUseTeamFile', { defaultMessage: 'You do not have permission to use this team file' }));
           return;
         }
       } else {
         if (!data.allowRead) {
-          showSnackbarError('You do not have permission to read this team file');
+          showSnackbarError(_t('savedFile.noPermissionReadTeamFile', { defaultMessage: 'You do not have permission to read this team file' }));
           return;
         }
       }

packages/web/src/buttons/CtaButton.svelte

@@ -26,7 +26,7 @@
     border: none;
     padding: 0;
     margin: 0;
-    color: var(--theme-font-link);
+    color: var(--theme-link-foreground);
     text-decoration: underline;
     cursor: pointer;
     font-size: inherit;
@@ -35,11 +35,11 @@
   }
 
   .cta-button:hover:not(:disabled) {
-    color: var(--theme-font-hover);
+    color: var(--theme-generic-font-hover);
   }
 
   .cta-button:disabled {
-    color: var(--theme-font-3);
+    color: var(--theme-generic-font-grayed);
     cursor: not-allowed;
     text-decoration: none;
   }

packages/web/src/buttons/DropDownButton.svelte

@@ -12,6 +12,8 @@
   export let square = true;
   export let disabled = false;
   export let title = undefined;
+  export let circleHover = false;
+  export let useBorder = false;
 
   let domButton;
   let isLoading = false;
@@ -42,6 +44,8 @@
   {disabled}
   data-testid={$$props['data-testid']}
   {title}
+  {circleHover}
+  {useBorder}
 >
   <FontIcon icon={isLoading ? 'icon loading' : icon} />
 </InlineButton>

packages/web/src/buttons/FormStyledButton.svelte

@@ -38,46 +38,45 @@
 
 <style>
   input {
-    border: 1px solid var(--theme-bg-button-inv-2);
+    border: var(--theme-formbutton-border);
     padding: 5px;
     margin: 2px;
-    color: var(--theme-font-inv-1);
-    border-radius: 2px;
+    color: var(--theme-formbutton-foreground);
+    border-radius: 3px;
+    cursor: pointer;
   }
 
   .setBackgroundColor {
-    background-color: var(--theme-bg-button-inv);
+    background: var(--theme-formbutton-background);
   }
 
   input:not(.skipWidth) {
     width: 100px;
   }
 
-  input:not(.setBackgroundColor) {
-    cursor: pointer;
-  }
-
   input.setBackgroundColor:hover:not(.disabled):not(.outline) {
-    background-color: var(--theme-bg-button-inv-2);
+    background: var(--theme-formbutton-background-hover);
+    border: var(--theme-formbutton-border-hover)
   }
   input.setBackgroundColor:active:not(.disabled):not(.outline) {
-    background-color: var(--theme-bg-button-inv-3);
+    background: var(--theme-formbutton-background-active);
+    border: var(--theme-formbutton-border-active);
   }
   input.disabled {
-    background-color: var(--theme-bg-button-inv-3);
-    color: var(--theme-font-inv-3);
+    background: var(--theme-formbutton-background-disabled);
+    color: var(--theme-formbutton-foreground-disabled);
+    border: var(--theme-formbutton-border-disabled);
   }
 
   input.outline {
     background-color: transparent;
-    color: var(--theme-font-2);
-    border: 1px solid var(--theme-bg-button-inv-2);
+    color: var(--theme-outlinebutton-foreground);
+    border: var(--theme-outlinebutton-border);
   }
 
   input.outline:hover:not(.disabled) {
-    color: var(--theme-bg-button-inv-3);
-    border: 2px solid var(--theme-bg-button-inv-3);
+    color: var(--theme-outlinebutton-hover-foreground);
+    border: var(--theme-outlinebutton-hover-border);
     margin: 1px;
   }
-
 </style>

packages/web/src/buttons/FormStyledButtonLikeLabel.svelte

@@ -8,12 +8,12 @@
 
 <style>
   label {
-    border: 1px solid var(--theme-bg-button-inv-2);
+    border: var(--theme-formbutton-border);
     padding: 4px;
     margin: 2px;
     width: 100px;
-    background-color: var(--theme-bg-button-inv);
-    color: var(--theme-font-inv-1);
+    background: var(--theme-formbutton-background);
+    color: var(--theme-formbutton-foreground);
     border-radius: 2px;
     position: relative;
     top: 3px;
@@ -21,13 +21,13 @@
   }
 
   label:hover:not(.disabled) {
-    background-color: var(--theme-bg-button-inv-2);
+    background: var(--theme-formbutton-background-hover);
   }
   label:active:not(.disabled) {
-    background-color: var(--theme-bg-button-inv-3);
+    background: var(--theme-formbutton-background-active);
   }
   label.disabled {
-    background-color: var(--theme-bg-button-inv-3);
-    color: var(--theme-font-inv-3);
+    background: var(--theme-formbutton-background-disabled);
+    color: var(--theme-formbutton-foreground-disabled);
   }
 </style>

packages/web/src/buttons/FormStyledDropDownButton.svelte

@@ -38,12 +38,12 @@
 
 <style>
   div {
-    border: 1px solid var(--theme-bg-button-inv-2);
+    border: var(--theme-formbutton-border);
     padding: 2px;
     padding-bottom: 4px;
     margin: 2px;
-    background-color: var(--theme-bg-button-inv);
-    color: var(--theme-font-inv-1);
+    background: var(--theme-formbutton-background);
+    color: var(--theme-formbutton-foreground);
     border-radius: 2px;
     display: inline-block;
     cursor: pointer;
@@ -54,25 +54,25 @@
   }
 
   div:hover:not(.disabled):not(.outline) {
-    background-color: var(--theme-bg-button-inv-2);
+    background: var(--theme-formbutton-background-hover);
   }
   div:active:not(.disabled):not(.outline) {
-    background-color: var(--theme-bg-button-inv-3);
+    background: var(--theme-formbutton-background-active);
   }
   div.disabled {
-    background-color: var(--theme-bg-button-inv-3);
-    color: var(--theme-font-inv-3);
+    background: var(--theme-formbutton-background-disabled);
+    color: var(--theme-formbutton-foreground-disabled);
   }
 
   div.outline {
     background-color: transparent;
-    color: var(--theme-font-2);
-    border: 1px solid var(--theme-bg-button-inv-2);
+    color: var(--theme-outlinebutton-foreground);
+    border: var(--theme-outlinebutton-border);
   }
 
   input.outline:hover:not(.disabled) {
-    color: var(--theme-bg-button-inv-3);
-    border: 2px solid var(--theme-bg-button-inv-3);
+    color: var(--theme-outlinebutton-hover-foreground);
+    border: var(--theme-outlinebutton-hover-border);
     margin: 1px;
   }
 </style>

packages/web/src/buttons/InlineButton.svelte

@@ -3,7 +3,9 @@
   export let square = false;
   export let narrow = false;
   export let title = null;
-  export let inlineBlock=false;
+  export let inlineBlock = false;
+  export let useBorder = false;
+  export let circleHover = false;
 
   let domButton;
 
@@ -19,7 +21,10 @@
   class:square
   class:narrow
   class:inlineBlock
+  class:useBorder
+  class:circleHover
   on:click
+  on:mousedown
   bind:this={domButton}
   data-testid={$$props['data-testid']}
 >
@@ -30,16 +35,10 @@
 
 <style>
   .outer {
-    --bg-1: var(--theme-bg-1);
-    --bg-2: var(--theme-bg-3);
-
-    background: linear-gradient(to bottom, var(--bg-1) 5%, var(--bg-2) 100%);
-    background-color: var(--bg-1);
-    border: 1px solid var(--bg-2);
     display: inline-block;
     cursor: pointer;
     vertical-align: middle;
-    color: var(--theme-font-1);
+    color: var(--theme-inlinebutton-foreground);
     font-size: 12px;
     padding: 3px;
     margin: 0;
@@ -47,21 +46,36 @@
     display: flex;
   }
 
+  .outer.circleHover:hover:not(.disabled) {
+    border-radius: 50%;
+    background-color: var(--theme-inlinebutton-circle-hover-background);
+    width: 18px;
+  }
+
+  .outer:not(.useBorder) {
+    font-size: 14px;
+  }
+
+  .outer.useBorder {
+    background: var(--theme-inlinebutton-bordered-background);
+    border: var(--theme-inlinebutton-bordered-border);
+  }
+
   .narrow {
     padding: 3px 1px;
   }
 
   .outer.disabled {
-    color: var(--theme-font-3);
+    color: var(--theme-inlinebutton-foreground-disabled);
+  }
+
+  .outer.useBorder:hover:not(.disabled) {
+    border: var(--theme-inlinebutton-bordered-hover-border);
+    background: var(--theme-inlinebutton-bordered-hover-background);
   }
 
   .outer:hover:not(.disabled) {
-    border: 1px solid var(--theme-font-1);
-  }
-
-  .outer:active:not(.disabled) {
-    background: linear-gradient(to bottom, var(--bg-2) 5%, var(--bg-1) 100%);
-    background-color: var(--bg-2);
+    color: var(--theme-inlinebutton-foreground-hover);
   }
 
   .inner {
@@ -70,7 +84,7 @@
     text-align: center;
   }
 
-  .square {
+  .square.useBorder {
     width: 18px;
   }
 

packages/web/src/buttons/InlineButtonLabel.svelte

@@ -3,6 +3,7 @@
   export let square = false;
   export let narrow = false;
   export let title = null;
+  export let useBorder = false;
 
   let domButton;
 
@@ -28,16 +29,10 @@
 
 <style>
   .outer {
-    --bg-1: var(--theme-bg-1);
-    --bg-2: var(--theme-bg-3);
-
-    background: linear-gradient(to bottom, var(--bg-1) 5%, var(--bg-2) 100%);
-    background-color: var(--bg-1);
-    border: 1px solid var(--bg-2);
     display: inline-block;
     cursor: pointer;
     vertical-align: middle;
-    color: var(--theme-font-1);
+    color: var(--theme-inlinebutton-foreground);
     font-size: 12px;
     padding: 3px;
     margin: 0;
@@ -45,21 +40,34 @@
     display: flex;
   }
 
+  .outer:not(.useBorder) {
+    font-size: 14px;
+  }
+
+  .outer.useBorder {
+    background-color: var(--theme-inlinebutton-bordered-background);
+    border: var(--theme-inlinebutton-bordered-border);
+  }
+
   .narrow {
     padding: 3px 1px;
   }
 
   .outer.disabled {
-    color: var(--theme-font-3);
+    color: var(--theme-inlinebutton-foreground-disabled);
+  }
+
+  .outer.useBorder:hover:not(.disabled) {
+    border: var(--theme-inlinebutton-bordered-hover-border);
   }
 
   .outer:hover:not(.disabled) {
-    border: 1px solid var(--theme-font-1);
+    color: var(--theme-inlinebutton-foreground-hover);
   }
 
-  .outer:active:not(.disabled) {
-    background: linear-gradient(to bottom, var(--bg-2) 5%, var(--bg-1) 100%);
-    background-color: var(--bg-2);
+  .outer.useBorder:active:not(.disabled) {
+    border: var(--theme-inlinebutton-bordered-hover-border);
+    background: var(--theme-inlinebutton-bordered-hover-background);
   }
 
   .inner {
@@ -68,7 +76,11 @@
     text-align: center;
   }
 
-  .square {
+  .square.useBorder {
     width: 18px;
   }
+
+  .inlineBlock {
+    display: inline-block;
+  }
 </style>

packages/web/src/buttons/InlineUploadButton.svelte

@@ -5,6 +5,7 @@
   import getElectron from '../utility/getElectron';
   import InlineButtonLabel from '../buttons/InlineButtonLabel.svelte';
   import resolveApi, { resolveApiHeaders } from '../utility/resolveApi';
+  import { _t } from '../translations';
 
   import uuidv1 from 'uuid/v1';
 
@@ -49,11 +50,11 @@
 </script>
 
 {#if electron}
-  <InlineButton on:click={handleOpenElectronFile} title="Open file" data-testid={$$props['data-testid']}>
+  <InlineButton on:click={handleOpenElectronFile} title={_t('files.openFile', { defaultMessage: "Open file" })} data-testid={$$props['data-testid']}>
     <FontIcon {icon} />
   </InlineButton>
 {:else}
-  <InlineButtonLabel on:click={() => {}} title="Upload file" data-testid={$$props['data-testid']} htmlFor={inputId}>
+  <InlineButtonLabel on:click={() => {}} title={_t('files.uploadFile', { defaultMessage: "Upload file" })} data-testid={$$props['data-testid']} htmlFor={inputId}>
     <FontIcon {icon} />
   </InlineButtonLabel>
 {/if}