Release/2.20.0

.circleci/config.yml

@@ -519,7 +519,8 @@ jobs:
             runtime/org.freedesktop.Platform/x86_64/20.08 \
             org.electronjs.Electron2.BaseApp/x86_64/20.08
 
-            yarn --cwd redisinsight/api/ install
+            yarn --cwd redisinsight/api/ install --ignore-optional
+            yarn --cwd redisinsight/ install --ignore-optional
             yarn install
             yarn build:statics
           no_output_timeout: 15m
@@ -724,8 +725,11 @@ jobs:
           name: publish
           command: |
             rm release/._* ||:
+            chmod +x .circleci/redisstack/sum_sha256.sh
+            .circleci/redisstack/sum_sha256.sh
             applicationVersion=$(jq -r '.version' redisinsight/package.json)
-            aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive --exclude "*.json"
+
+            aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive
 
   release-aws-private:
     executor: linux-executor
@@ -743,9 +747,11 @@ jobs:
       - run:
           name: publish
           command: |
+            chmod +x .circleci/redisstack/sum_sha256.sh
+            .circleci/redisstack/sum_sha256.sh
             applicationVersion=$(jq -r '.version' redisinsight/package.json)
 
-            aws s3 cp release/ s3://${AWS_BUCKET_NAME}/private/${applicationVersion} --recursive --exclude "*.json"
+            aws s3 cp release/ s3://${AWS_BUCKET_NAME}/private/${applicationVersion} --recursive
 
   publish-prod-aws:
     executor: linux-executor

.circleci/redisstack/sum_sha256.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+cd ./release/redisstack
+
+for f in *.tar.gz; do
+  sha256sum "$f" > "$f.sha256"
+done

.dockerignore

@@ -2,6 +2,7 @@
 .idea
 .vscode
 .circleci
+.docker
 
 coverage
 dll

configs/webpack.config.main.prod.babel.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
+import { toString } from 'lodash'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import baseConfig from './webpack.config.base';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -69,6 +70,9 @@ export default merge(baseConfig, {
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
       SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
   ],
 

configs/webpack.config.main.stage.babel.js

@@ -1,6 +1,7 @@
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import { toString } from 'lodash'
 import mainProdConfig from './webpack.config.main.prod.babel';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
 import { version } from '../redisinsight/package.json';
@@ -29,6 +30,9 @@ export default merge(mainProdConfig, {
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
       SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
   ],
 });

configs/webpack.config.renderer.dev.babel.js

@@ -2,6 +2,7 @@ import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import { spawn } from 'child_process';
+import { toString } from 'lodash'
 import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
 import baseConfig from './webpack.config.base';
@@ -215,6 +216,9 @@ export default merge(baseConfig, {
       APP_VERSION: version,
       SEGMENT_WRITE_KEY:
         'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
 
     new webpack.LoaderOptionsPlugin({

configs/webpack.config.renderer.dev.dll.babel.js

@@ -1,6 +1,7 @@
 import webpack from 'webpack';
 import path from 'path';
 import { merge } from 'webpack-merge';
+import { toString } from 'lodash'
 import baseConfig from './webpack.config.base';
 import { dependencies } from '../package.json';
 import { dependencies as dependenciesApi } from '../redisinsight/package.json';
@@ -54,7 +55,10 @@ export default merge(baseConfig, {
       SCAN_TREE_COUNT_DEFAULT: '10000',
       PIPELINE_COUNT_DEFAULT: '5',
       SEGMENT_WRITE_KEY:
-        'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
 
     new webpack.LoaderOptionsPlugin({

configs/webpack.config.renderer.prod.babel.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import webpack from 'webpack';
+import { toString } from 'lodash'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -200,7 +201,10 @@ export default merge(baseConfig, {
       SCAN_TREE_COUNT_DEFAULT: '10000',
       PIPELINE_COUNT_DEFAULT: '5',
       SEGMENT_WRITE_KEY:
-        'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
 
     new MiniCssExtractPlugin({

configs/webpack.config.renderer.stage.babel.js

@@ -1,5 +1,6 @@
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
+import { toString } from 'lodash'
 import baseConfig from './webpack.config.base';
 import rendererProdConfig from './webpack.config.renderer.prod.babel';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -23,6 +24,9 @@ export default merge(baseConfig, {
       SCAN_COUNT_MEMORY_ANALYSES: '10000',
       SEGMENT_WRITE_KEY:
         'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
   ],
 });

configs/webpack.config.web.dev.babel.js

@@ -9,6 +9,7 @@ import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import ip from 'ip';
+import { toString } from 'lodash'
 import commonConfig from './webpack.config.web.common.babel';
 
 function employCache(loaders) {
@@ -209,6 +210,9 @@ export default merge(commonConfig, {
       SCAN_TREE_COUNT_DEFAULT: '10000',
       SEGMENT_WRITE_KEY:
         'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000),
     }),
 
     new webpack.LoaderOptionsPlugin({

configs/webpack.config.web.prod.babel.js

@@ -1,6 +1,7 @@
 import { merge } from 'webpack-merge';
 import { resolve } from 'path';
 import webpack from 'webpack';
+import { toString } from 'lodash'
 import TerserPlugin from 'terser-webpack-plugin';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -24,9 +25,10 @@ export default merge(commonConfig, {
   target: 'web',
   entry: ['regenerator-runtime/runtime', './index.tsx'],
   output: {
-    filename: 'js/bundle.[fullhash].min.js',
+    filename: 'js/bundle.[name].min.js',
     path: resolve(__dirname, '../redisinsight/ui/dist'),
     publicPath: '/',
+    chunkFilename: '[id].[chunkhash].js'
   },
   optimization: {
     minimize: true,
@@ -36,6 +38,34 @@ export default merge(commonConfig, {
       }),
       new CssMinimizerPlugin(),
     ],
+    runtimeChunk: 'single',
+    splitChunks: {
+      chunks: 'all',
+      maxInitialRequests: Infinity,
+      minSize: 0,
+      cacheGroups: {
+        reactVendor: {
+          test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
+          name: "reactVendor"
+        },
+        elasticVendor: {
+          test: /[\\/]node_modules[\\/](@elastic)[\\/]/,
+          name: "elasticVendor"
+        },
+        monacoVendor: {
+          test: /[\\/]node_modules[\\/](monaco-editor)[\\/]/,
+          name: "monacoVendor"
+        },
+        utilityVendor: {
+          test: /[\\/]node_modules[\\/](lodash)[\\/]/,
+          name: "utilityVendor"
+        },
+        vendor: {
+          test: /[\\/]node_modules[\\/](!@elastic)(!monaco-editor)(!lodash)[\\/]/,
+          name: "vendor"
+        },
+      },
+    },
   },
   plugins: [
     new MiniCssExtractPlugin({
@@ -56,6 +86,9 @@ export default merge(commonConfig, {
       PIPELINE_COUNT_DEFAULT: '5',
       SEGMENT_WRITE_KEY:
         'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+        : toString(30 * 1000), // 30 sec
     }),
 
     new BundleAnalyzerPlugin({

electron-builder.json

@@ -1,7 +1,7 @@
 {
   "productName": "RedisInsight-v2",
   "appId": "org.RedisLabs.RedisInsight-V2",
-  "copyright": "Copyright © 2021 Redis Ltd.",
+  "copyright": "Copyright © 2023 Redis Ltd.",
   "files": [
     "dist/",
     "node_modules/",

package.json

@@ -117,6 +117,7 @@
     "@types/detect-port": "^1.3.0",
     "@types/electron-store": "^3.2.0",
     "@types/express": "^4.17.3",
+    "@types/file-saver": "^2.0.5",
     "@types/html-entities": "^1.3.4",
     "@types/ioredis": "^4.26.0",
     "@types/is-glob": "^4.0.2",
@@ -227,6 +228,7 @@
     "electron-log": "^4.2.4",
     "electron-store": "^8.0.0",
     "electron-updater": "^5.0.5",
+    "file-saver": "^2.0.5",
     "formik": "^2.2.9",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",

redisinsight/about-panel.ts

@@ -7,7 +7,7 @@ const ICON_PATH = app.isPackaged
 
 export default {
   applicationName: 'RedisInsight-v2',
-  applicationVersion: app.getVersion() || '2.2.0',
+  applicationVersion: app.getVersion() || '2.20.0',
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
   iconPath: ICON_PATH,
 };

redisinsight/api/config/default.ts

@@ -54,7 +54,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.0.0',
+    appVersion: process.env.APP_VERSION || '2.20.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -144,6 +144,9 @@ export default {
   database_analysis: {
     maxItemsPerDb: parseInt(process.env.DATABASE_ANALYSIS_MAX_ITEMS_PER_DB, 10) || 5,
   },
+  browser_history: {
+    maxItemsPerModeInDb: parseInt(process.env.BROWSER_HISTORY_MAX_ITEMS_PER_MODE_IN_DB, 10) || 10,
+  },
   commands: [
     {
       name: 'main',
@@ -186,6 +189,9 @@ export default {
         || 'https://raw.githubusercontent.com/RedisBloom/RedisBloom/master/commands.json',
     },
   ],
+  connections: {
+    timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000 // 30 sec
+  },
   redisStack: {
     id: process.env.BUILD_TYPE === 'REDIS_STACK' ? process.env.REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
     name: process.env.REDIS_STACK_DATABASE_NAME,

redisinsight/api/config/ormconfig.ts

@@ -11,6 +11,7 @@ import { CaCertificateEntity } from 'src/modules/certificate/entities/ca-certifi
 import { ClientCertificateEntity } from 'src/modules/certificate/entities/client-certificate.entity';
 import { DatabaseEntity } from 'src/modules/database/entities/database.entity';
 import { SshOptionsEntity } from 'src/modules/ssh/entities/ssh-options.entity';
+import { BrowserHistoryEntity } from 'src/modules/browser/entities/browser-history.entity';
 import migrations from '../migration';
 import * as config from '../src/utils/config';
 
@@ -32,6 +33,7 @@ const ormConfig = {
     PluginStateEntity,
     NotificationEntity,
     DatabaseAnalysisEntity,
+    BrowserHistoryEntity,
     SshOptionsEntity,
   ],
   migrations,

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.0.0',
+    version: '2.20.0',
   },
   tags: [],
 };

redisinsight/api/migration/1674539211397-browser-history.ts

@@ -0,0 +1,34 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class browserHistory1674539211397 implements MigrationInterface {
+    name = 'browserHistory1674539211397'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "browser_history" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "filter" blob, "mode" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')))`);
+        await queryRunner.query(`CREATE INDEX "IDX_d0fb08df31bf1a930aeb4d8862" ON "browser_history" ("databaseId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_f3780aa1d0b977219e40db27e0" ON "browser_history" ("createdAt") `);
+        await queryRunner.query(`DROP INDEX "IDX_d0fb08df31bf1a930aeb4d8862"`);
+        await queryRunner.query(`DROP INDEX "IDX_f3780aa1d0b977219e40db27e0"`);
+        await queryRunner.query(`CREATE TABLE "temporary_browser_history" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "filter" blob, "mode" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "FK_d0fb08df31bf1a930aeb4d8862e" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_browser_history"("id", "databaseId", "filter", "mode", "encryption", "createdAt") SELECT "id", "databaseId", "filter", "mode", "encryption", "createdAt" FROM "browser_history"`);
+        await queryRunner.query(`DROP TABLE "browser_history"`);
+        await queryRunner.query(`ALTER TABLE "temporary_browser_history" RENAME TO "browser_history"`);
+        await queryRunner.query(`CREATE INDEX "IDX_d0fb08df31bf1a930aeb4d8862" ON "browser_history" ("databaseId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_f3780aa1d0b977219e40db27e0" ON "browser_history" ("createdAt") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_f3780aa1d0b977219e40db27e0"`);
+        await queryRunner.query(`DROP INDEX "IDX_d0fb08df31bf1a930aeb4d8862"`);
+        await queryRunner.query(`ALTER TABLE "browser_history" RENAME TO "temporary_browser_history"`);
+        await queryRunner.query(`CREATE TABLE "browser_history" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "filter" blob, "mode" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')))`);
+        await queryRunner.query(`INSERT INTO "browser_history"("id", "databaseId", "filter", "mode", "encryption", "createdAt") SELECT "id", "databaseId", "filter", "mode", "encryption", "createdAt" FROM "temporary_browser_history"`);
+        await queryRunner.query(`DROP TABLE "temporary_browser_history"`);
+        await queryRunner.query(`CREATE INDEX "IDX_f3780aa1d0b977219e40db27e0" ON "browser_history" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_d0fb08df31bf1a930aeb4d8862" ON "browser_history" ("databaseId") `);
+        await queryRunner.query(`DROP INDEX "IDX_f3780aa1d0b977219e40db27e0"`);
+        await queryRunner.query(`DROP INDEX "IDX_d0fb08df31bf1a930aeb4d8862"`);
+        await queryRunner.query(`DROP TABLE "browser_history"`);
+    }
+
+}

redisinsight/api/migration/1675398140189-database-timeout.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class databaseTimeout1675398140189 implements MigrationInterface {
+    name = 'databaseTimeout1675398140189'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean, "verifyServerCert" boolean, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar DEFAULT ('[]'), "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, "tlsServername" varchar, "new" boolean, "ssh" boolean, "timeout" integer, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername", "new", "ssh") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername", "new", "ssh" FROM "database_instance"`);
+        await queryRunner.query(`DROP TABLE "database_instance"`);
+        await queryRunner.query(`ALTER TABLE "temporary_database_instance" RENAME TO "database_instance"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "database_instance" RENAME TO "temporary_database_instance"`);
+        await queryRunner.query(`CREATE TABLE "database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean, "verifyServerCert" boolean, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar DEFAULT ('[]'), "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, "tlsServername" varchar, "new" boolean, "ssh" boolean, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername", "new", "ssh") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption", "tlsServername", "new", "ssh" FROM "temporary_database_instance"`);
+        await queryRunner.query(`DROP TABLE "temporary_database_instance"`);
+    }
+
+}