The Unified and Autonomous Development Platform
feat: able to use specified postgresql schema (#1448)
Robin Shen2c347f281140
diff --git a/pom.xml b/pom.xmlindex b2d4e414fe..2eafcaa5e4 100644--- a/pom.xml+++ b/pom.xml@@ -614,8 +614,8 @@</repository></repositories><properties>- <commons.version>2.7.16</commons.version>- <agent.version>1.8.22</agent.version>+ <commons.version>2.7.17</commons.version>+ <agent.version>1.8.23</agent.version><slf4j.version>1.7.36</slf4j.version><logback.version>1.2.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java b/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.javaindex 6f4f05e85a..40795be10e 100644--- a/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java+++ b/server-core/src/main/java/io/onedev/server/persistence/PersistenceUtils.java@@ -74,15 +74,15 @@ public class PersistenceUtils {public static boolean tableExists(Connection conn, String tableName) {try {var metadata = conn.getMetaData();- try (ResultSet resultset = metadata.getTables(null, null, tableName, null)) {+ try (ResultSet resultset = metadata.getTables(conn.getCatalog(), conn.getSchema(), tableName, null)) {if (resultset.next())return true;}- try (ResultSet resultset = metadata.getTables(null, null, tableName.toUpperCase(), null)) {+ try (ResultSet resultset = metadata.getTables(conn.getCatalog(), conn.getSchema(), tableName.toUpperCase(), null)) {if (resultset.next())return true;}- try (ResultSet resultset = metadata.getTables(null, null, tableName.toLowerCase(), null)) {+ try (ResultSet resultset = metadata.getTables(conn.getCatalog(), conn.getSchema(), tableName.toLowerCase(), null)) {if (resultset.next())return true;}@@ -109,7 +109,7 @@ public class PersistenceUtils {stmt.executeQuery(format("select * from %s for update", tableName));break;} catch (Exception e) {- logger.debug("Unable to get database lock, will retry", e);+ logger.warn("Unable to get database lock, will retry", e);Thread.sleep(5000);}}diff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.propertiesindex a10aa1a5a4..e6d75f7a16 100644--- a/server-product/system/conf/hibernate.properties+++ b/server-product/system/conf/hibernate.properties@@ -55,7 +55,7 @@ hibernate.connection.password=#hibernate.dialect=io.onedev.server.persistence.PostgreSQLDialect#hibernate.connection.driver_class=org.postgresql.Driver-#hibernate.connection.url=jdbc:postgresql://localhost:5432/onedev+#hibernate.connection.url=jdbc:postgresql://localhost:5432/onedev?currentSchema=onedev#hibernate.connection.username=postgres#hibernate.connection.password=postgresdiff --git a/server-product/system/site/lib/ojdbc6.jar b/server-product/system/site/lib/ojdbc6.jardeleted file mode 100644index 767eba7f8f..0000000000Binary files a/server-product/system/site/lib/ojdbc6.jar and /dev/null differdiff --git a/server-product/system/site/lib/ojdbc8-23.2.0.0.jar b/server-product/system/site/lib/ojdbc8-23.2.0.0.jarnew file mode 100644index 0000000000..847c10b032Binary files /dev/null and b/server-product/system/site/lib/ojdbc8-23.2.0.0.jar differ