The Unified and Autonomous Development Platform
Add support for Oracle database
Robin Shenab8cd41e6da2
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex ad46271c90..c8e56ab854 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -86,7 +86,7 @@ public class Job implements Serializable, Validatable {private List<CacheSpec> caches = new ArrayList<>();- private String cpuRequirement = "500m";+ private String cpuRequirement = "250m";private String memoryRequirement = "128m";diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 3e8b2f5606..3f6cde0f6a 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -123,6 +123,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(nullable=false, length=65535)private LinkedHashMap<String, Boolean> userIssueQueryWatches = new LinkedHashMap<>();+ @Lob@Column(nullable=false, length=65535)private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();@@ -133,7 +134,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Lob@Column(nullable=false, length=65535)private LinkedHashMap<String, Boolean> userPullRequestQueryWatches = new LinkedHashMap<>();-++ @Lob@Column(nullable=false, length=65535)private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();@@ -144,7 +146,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Lob@Column(nullable=false, length=65535)private LinkedHashSet<String> userBuildQuerySubscriptions = new LinkedHashSet<>();-++ @Lob@Column(nullable=false, length=65535)private LinkedHashSet<String> buildQuerySubscriptions = new LinkedHashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 4bf9cafbd9..d64c9bcad6 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -6,7 +6,7 @@ import java.io.IOException;import java.lang.reflect.Field;import java.nio.charset.Charset;import java.sql.Connection;-import java.sql.DriverManager;+import java.sql.Driver;import java.sql.ResultSet;import java.sql.SQLException;import java.sql.Statement;@@ -14,6 +14,7 @@ import java.util.ArrayList;import java.util.Collections;import java.util.EnumSet;import java.util.List;+import java.util.Properties;import javax.persistence.EntityManagerFactory;import javax.persistence.ManyToOne;@@ -208,10 +209,17 @@ public class DefaultPersistManager implements PersistManager {protected Connection getConnection() {try {- Class.forName(properties.getDriver());- Connection conn = DriverManager.getConnection(properties.getUrl(),- properties.getUser(), properties.getPassword());- return conn;+ Driver driver = (Driver) Class.forName(properties.getDriver(), true,+ Thread.currentThread().getContextClassLoader()).newInstance();+ Properties connectProps = new Properties();+ String user = properties.getUser();+ String password = properties.getPassword();+ if (user != null)+ connectProps.put("user", user);+ if (password != null)+ connectProps.put("password", password);++ return driver.connect(properties.getUrl(), connectProps);} catch (Exception e) {throw ExceptionUtils.unchecked(e);}diff --git a/server-product/system/conf/logback.xml b/server-product/system/conf/logback.xmlindex ffbeb8752f..1c386f58bd 100644--- a/server-product/system/conf/logback.xml+++ b/server-product/system/conf/logback.xml@@ -38,6 +38,7 @@<logger name="jetbrains.exodus" level="WARN"/><logger name="jetbrains.exodus.io.FileDataWriter" level="ERROR"/><logger name="com.zaxxer.hikari.HikariDataSource" level="ERROR"/>+ <logger name="com.zaxxer.hikari.util.DriverDataSource" level="ERROR"/><logger name="org.apache.shiro.mgt" level="ERROR"/><logger name="io.onedev" level="INFO"/>