• ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java
    skipped 65 lines
    66 66   dropConstraints(metadata);
    67 67   applyConstraints(metadata);
    68 68   
    69  - if (getDialect().toLowerCase().contains("hsql")) {
     69 + if (isHSQLDialect(getDialect())) {
    70 70   try {
    71 71   Thread.sleep(1000);
    72 72   } catch (InterruptedException e) {
    skipped 15 lines
  • ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
    skipped 50 lines
    51 51   System.exit(1);
    52 52   }
    53 53  
    54  - if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {
     54 + if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
    55 55   logger.error("Please stop server before backing up database");
    56 56   System.exit(1);
    57 57   }
    skipped 26 lines
  • ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java
    skipped 33 lines
    34 34   
    35 35   @Override
    36 36   public void start() {
    37  - if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {
     37 + if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {
    38 38   logger.error("Please stop server before checking data version");
    39 39   System.exit(1);
    40 40   }
    skipped 14 lines
  • ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java
    skipped 43 lines
    44 44   Metadata metadata = buildMetadata();
    45 45   cleanDatabase(metadata);
    46 46   
    47  - if (getDialect().toLowerCase().contains("hsql")) {
     47 + if (isHSQLDialect(getDialect())) {
    48 48   try {
    49 49   Thread.sleep(1000);
    50 50   } catch (InterruptedException e) {
    skipped 14 lines
  • ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
    skipped 74 lines
    75 75  
    76 76   sessionFactory.close();
    77 77  
    78  - if (getDialect().toLowerCase().contains("hsql")) {
     78 + if (isHSQLDialect(getDialect())) {
    79 79   try {
    80 80   Thread.sleep(1000);
    81 81   } catch (InterruptedException e) {
    skipped 38 lines
  • ■ ■ ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java
    1 1  package io.onedev.server.maintenance;
    2 2  
     3 +import static org.hibernate.cfg.AvailableSettings.DIALECT;
     4 +
    3 5  import java.io.File;
    4 6  import java.io.IOException;
    5 7  import java.nio.charset.Charset;
    skipped 117 lines
    123 125  
    124 126   private String prefixUpgradeTargetLog(String line) {
    125 127   return ">>> " + line;
     128 + }
     129 +
     130 + private String getDialect(File installDir) {
     131 + String dialect = System.getenv(DIALECT.replace('.', '_'));
     132 + if (dialect == null) {
     133 + File file = new File(installDir, "conf/hibernate.properties");
     134 + dialect = FileUtils.loadProperties(file).getProperty(DIALECT);
     135 + }
     136 + return dialect;
    126 137   }
    127 138  
    128 139   @Override
    skipped 142 lines
    271 282   }).getReturnCode();
    272 283  
    273 284   if (ret == 0) {
    274  - if (getDialect().toLowerCase().contains("hsql")) {
     285 + if (isHSQLDialect(getDialect(upgradeDir))) {
    275 286   FileUtils.deleteDir(new File(upgradeDir, "sampledb"), 3);
    276 287   } else {
    277 288   logger.info("Cleaning database with old program...");
    skipped 315 lines
  • ■ ■ ■ ■ ■ ■
    server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
    skipped 106 lines
    107 107   return properties.getDialect();
    108 108   }
    109 109  
     110 + protected boolean isHSQLDialect(String dialect) {
     111 + return dialect.trim().equals("org.hibernate.dialect.HSQLDialect");
     112 + }
     113 +
    110 114   protected void execute(List<String> sqls, boolean failOnError) {
    111 115   try ( Connection conn = getConnection();
    112 116   Statement stmt = conn.createStatement();) {
    skipped 42 lines
    155 159  
    156 160   @Override
    157 161   public void start() {
    158  - String dialect = getDialect().toLowerCase();
    159  - if (dialect.contains("hsql"))
     162 + if (isHSQLDialect(getDialect()))
    160 163   execute(Lists.newArrayList("SET DATABASE TRANSACTION CONTROL MVCC"), true);
    161 164  
    162 165   String dbDataVersion = checkDataVersion(true);
    skipped 444 lines
    607 610   return true;
    608 611   } else {
    609 612   String dialect = getDialect().toLowerCase();
    610  - return !dialect.contains("mysql") && !dialect.contains("hsql");
     613 + return !dialect.contains("mysql") && !isHSQLDialect(dialect);
    611 614   }
    612 615   }
    613 616  
    skipped 7 lines
  • ■ ■ ■ ■ ■ ■
    server-product/docker/entrypoint.sh
    1 1  #!/bin/bash
    2 2   
     3 +set -e
     4 + 
    3 5  _sigterm() {
    4 6   kill -TERM "$child"
    5 7   wait "$child"
    skipped 19 lines
Please wait...
Page is in error, reload to recover