From 65cbfdbde1c008b912cbd0e659c5fc5a0ae18036 Mon Sep 17 00:00:00 2001
From: yagudin10 <yagudin10@yandex.ru>
Date: Wed, 9 Mar 2022 13:06:22 +0300
Subject: [PATCH] CB-1704 sqlite default database

---
 .../src/io/cloudbeaver/server/CBDatabase.java | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBDatabase.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBDatabase.java
index 6e81a06bf82..b6cc0f98bf9 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBDatabase.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBDatabase.java
@@ -131,25 +131,27 @@ void initialize() throws DBException {
 
         String dbUser = databaseConfiguration.getUser();
         String dbPassword = databaseConfiguration.getPassword();
-        if (CommonUtils.isEmpty(dbUser) && databaseConfiguration.getUrl().startsWith("jdbc:h2")) {
-            // No database credentials specified
-            dbUser = DEFAULT_DB_USER_NAME;
-
-            // Load or generate random password
+        if (CommonUtils.isEmpty(dbUser) && driver.isEmbedded()) {
             File pwdFile = new File(application.getDataDirectory(true), DEFAULT_DB_PWD_FILE);
-            if (pwdFile.exists()) {
-                try (FileReader fr = new FileReader(pwdFile)) {
-                    dbPassword = IOUtils.readToString(fr);
-                } catch (Exception e) {
-                    log.error(e);
+            if (!driver.isAnonymousAccess()) {
+                // No database credentials specified
+                dbUser = DEFAULT_DB_USER_NAME;
+
+                // Load or generate random password
+                if (pwdFile.exists()) {
+                    try (FileReader fr = new FileReader(pwdFile)) {
+                        dbPassword = IOUtils.readToString(fr);
+                    } catch (Exception e) {
+                        log.error(e);
+                    }
                 }
-            }
-            if (CommonUtils.isEmpty(dbPassword)) {
-                dbPassword = SecurityUtils.generatePassword(8);
-                try {
-                    IOUtils.writeFileFromString(pwdFile, dbPassword);
-                } catch (IOException e) {
-                    log.error(e);
+                if (CommonUtils.isEmpty(dbPassword)) {
+                    dbPassword = SecurityUtils.generatePassword(8);
+                    try {
+                        IOUtils.writeFileFromString(pwdFile, dbPassword);
+                    } catch (IOException e) {
+                        log.error(e);
+                    }
                 }
             }
         }