Merge pull request #3276 from ebean-orm/feature/skipCheckForReadOnly

skipDataSourceCheck() when using readOnlyDatabase
ebean-orm · Nov 23, 2023 · eaec515 · eaec515
2 parents 87ad874 + 97709d3
commit eaec515
Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -1336,7 +1336,7 @@ public DatabaseConfig setAutoTuneConfig(AutoTuneConfig autoTuneConfig) {
 
   @Override
   public boolean skipDataSourceCheck() {
-    return skipDataSourceCheck;
+    return skipDataSourceCheck || readOnlyDatabase;
   }
 
   @Override

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.Database;
 import io.ebean.DatabaseBuilder;
 import io.ebean.config.*;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -64,10 +65,8 @@ public void shutdown() {
    */
   @Override
   public SpiEbeanServer createServer(String name) {
-    DatabaseBuilder config = new DatabaseConfig();
-    config.setName(name);
-    config.loadFromProperties();
-    return createServer(config);
+    var builder = Database.builder().name(name).loadFromProperties();
+    return createServer(builder);
   }
 
   private SpiBackgroundExecutor createBackgroundExecutor(DatabaseBuilder builder) {
@@ -94,7 +93,7 @@ public SpiEbeanServer createServer(DatabaseBuilder builder) {
 
       boolean online = true;
       if (config.isDocStoreOnly()) {
-        config.setDatabasePlatform(new DatabasePlatform());
+        config.databasePlatform(new DatabasePlatform());
       } else {
         TenantMode tenantMode = config.getTenantMode();
         if (TenantMode.DB != tenantMode) {
@@ -203,7 +202,7 @@ private BootupClasses bootupClasses1(DatabaseBuilder.Settings config) {
    */
   private void setNamingConvention(DatabaseBuilder.Settings config) {
     if (config.getNamingConvention() == null) {
-      config.setNamingConvention(new UnderscoreNamingConvention());
+      config.namingConvention(new UnderscoreNamingConvention());
     }
   }
 
@@ -218,7 +217,7 @@ private void setDatabasePlatform(DatabaseBuilder.Settings config) {
       }
       // automatically determine the platform
       platform = new DatabasePlatformFactory().create(config);
-      config.setDatabasePlatform(platform);
+      config.databasePlatform(platform);
     }
     platform.configure(config.getPlatformConfig());
   }
@@ -242,11 +241,9 @@ private boolean isOfflineMode(DatabaseBuilder.Settings config) {
    * Check the autoCommit and Transaction Isolation levels of the DataSource.
    * <p>
    * If autoCommit is true this could be a real problem.
-   * </p>
    * <p>
    * If the Isolation level is not READ_COMMITTED then optimistic concurrency
    * checking may not work as expected.
-   * </p>
    */
   private boolean checkDataSource(DatabaseBuilder.Settings config) {
     if (isOfflineMode(config)) {