Skip to content

Commit f3f4d10

Browse files
authored
Fixes for the cloud (#35)
1 parent ae8d1ff commit f3f4d10

3 files changed

Lines changed: 23 additions & 1 deletion

File tree

src/main/java/dev/dbos/transact/database/SystemDatabase.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,26 @@ public static DataSource createDataSource(DBOSConfig config, String dbName) {
462462
return new HikariDataSource(hikariConfig);
463463
}
464464

465+
public static DataSource createPostgresDataSource(DBOSConfig config) {
466+
HikariConfig hikariConfig = new HikariConfig();
467+
468+
String dburl = config.getUrl();
469+
470+
dburl = String.format("jdbc:postgresql://%s:%d/%s",
471+
config.getDbHost(),
472+
config.getDbPort(),
473+
Constants.POSTGRES_DEFAULT_DB);
474+
475+
String dbUser = config.getDbUser();
476+
String dbPassword = config.getDbPassword();
477+
hikariConfig.setJdbcUrl(dburl);
478+
hikariConfig.setUsername(dbUser);
479+
hikariConfig.setPassword(dbPassword);
480+
481+
hikariConfig.setMaximumPoolSize(2);
482+
return new HikariDataSource(hikariConfig);
483+
}
484+
465485
public static DataSource createDataSource(DBOSConfig config) {
466486
return createDataSource(config, null);
467487
}

src/main/java/dev/dbos/transact/migrations/MigrationManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static void runMigrations(DBOSConfig dbconfig) {
6363
}
6464

6565
public static void createDatabaseIfNotExists(DBOSConfig config, String dbName) {
66-
DataSource adminDS = SystemDatabase.createDataSource(config, Constants.POSTGRES_DEFAULT_DB);
66+
DataSource adminDS = SystemDatabase.createPostgresDataSource(config);
6767
try {
6868
try (Connection conn = adminDS.getConnection();
6969
PreparedStatement ps = conn

src/test/java/dev/dbos/transact/workflow/WorkflowMgmtTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ static void onetimeSetup() throws Exception {
4343

4444
WorkflowMgmtTest.dbosConfig = new DBOSConfig.Builder().name("systemdbtest")
4545
.url("jdbc:postgresql://localhost:5432/dbos_java_sys").dbUser("postgres")
46+
.dbHost("localhost")
47+
.dbPort(5432)
4648
.sysDbName("dbos_java_sys").maximumPoolSize(2).build();
4749
}
4850

0 commit comments

Comments
 (0)