Merge pull request #17 from dbos-inc/manoj/migration

Manoj/migration

Author: manojdbos

build.gradle.kts

@@ -19,10 +19,7 @@ tasks.withType<JavaCompile> {
     // (Alternative: sourceCompatibility = "11"; targetCompatibility = "11")
 }
 
-// tasks.withType<JavaCompile> {
-//    sourceCompatibility = "11"
-//    targetCompatibility = "11"
-// }
+
 
 repositories {
     mavenCentral()
@@ -31,8 +28,8 @@ repositories {
 dependencies {
     api("org.slf4j:slf4j-api:2.0.13") // logging api
 
-    implementation("org.flywaydb:flyway-core:10.11.0") // migration
-    implementation("org.flywaydb:flyway-database-postgresql:10.11.0")
+ //   implementation("org.flywaydb:flyway-core:10.11.0") // migration
+ //   implementation("org.flywaydb:flyway-database-postgresql:10.11.0")
     implementation("org.postgresql:postgresql:42.7.2")
     implementation("com.zaxxer:HikariCP:5.0.1") // Connection pool
     implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0") // json

src/main/java/dev/dbos/transact/DBOS.java

@@ -8,7 +8,7 @@
 import dev.dbos.transact.interceptor.QueueInvocationHandler;
 import dev.dbos.transact.interceptor.TransactInvocationHandler;
 import dev.dbos.transact.interceptor.UnifiedInvocationHandler;
-import dev.dbos.transact.migrations.DatabaseMigrator;
+import dev.dbos.transact.migrations.MigrationManager;
 import dev.dbos.transact.notifications.NotificationService;
 import dev.dbos.transact.queue.Queue;
 import dev.dbos.transact.queue.QueueService;
@@ -186,12 +186,14 @@ public Queue build() {
             return q;
         }
     }
-
     public void launch() {
-        DatabaseMigrator.runMigrations(config);
+
+        if (config.migration()) {
+            MigrationManager.runMigrations(config);
+        }
+
         if (dbosExecutor == null) {
             SystemDatabase.initialize(config);
-            // systemDatabase = SystemDatabase.getInstance();
             dbosExecutor = new DBOSExecutor(config, SystemDatabase.getInstance());
         }
 

src/main/java/dev/dbos/transact/config/DBOSConfig.java

@@ -23,6 +23,7 @@ public class DBOSConfig {
     private final boolean http ;
     private final int httpPort ;
     private final boolean httpAwaitOnStart ;
+    private final boolean migrate ;
 
 
     private DBOSConfig(Builder builder) {
@@ -39,6 +40,7 @@ private DBOSConfig(Builder builder) {
         this.http = builder.http ;
         this.httpPort = builder.httpPort ;
         this.httpAwaitOnStart = builder.httpAwaitOnStart;
+        this.migrate = builder.migrate;
 
     }
 
@@ -56,6 +58,7 @@ public static class Builder {
         private boolean http = false ;
         private int httpPort ;
         private boolean httpAwaitOnStart = true ;
+        private boolean migrate = true ;
 
         public Builder name(String name) {
             this.name = name;
@@ -122,6 +125,11 @@ public Builder adminAwaitOnStart(boolean wait) {
             return this;
         }
 
+        public Builder migration(boolean migrate) {
+            this.migrate = migrate;
+            return this ;
+        }
+
         public DBOSConfig build() {
             if (name == null) throw new IllegalArgumentException("Name is required");
             if (dbPassword == null) {
@@ -184,6 +192,10 @@ public boolean isHttpAwaitOnStart() {
         return httpAwaitOnStart;
     }
 
+    public boolean migration() {
+        return migrate ;
+    }
+
     @Override
     public String toString() {
         return "DBOSConfig{" +
@@ -202,6 +214,8 @@ public DataSource createDataSource(String dbName) {
 
         String dburl = String.format("jdbc:postgresql://%s:%d/%s",dbHost,dbPort,dbName);
 
+        System.out.println(dburl) ;
+
         hikariConfig.setJdbcUrl(dburl);
         hikariConfig.setUsername(dbUser);
         hikariConfig.setPassword(dbPassword);

src/main/java/dev/dbos/transact/execution/DBOSExecutor.java

@@ -52,7 +52,7 @@ public void setQueueService(QueueService queueService) {
 
     public void shutdown() {
         workflowRegistry = null ;
-        executorService.shutdown();
+        executorService.shutdownNow();
         systemDatabase.destroy() ;
     }
 

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

@@ -0,0 +1,19 @@
+package dev.dbos.transact.migrations;
+
+public class MigrationFile {
+    private final String filename;
+    private final String sql;
+
+    public MigrationFile(String filename, String sql) {
+        this.filename = filename;
+        this.sql = sql;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public String getSql() {
+        return sql;
+    }
+}