From 4cdfc2247c0a081b222da1408835c2e6c773607b Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Tue, 24 Dec 2019 19:48:47 +0800
Subject: [PATCH] fix: migrate database error.

---
 .../halo/app/listener/StartedListener.java    | 32 ++++++++++++++++---
 src/main/resources/application-dev.yaml       |  4 +--
 src/main/resources/application-test.yaml      |  4 +--
 src/main/resources/application.yaml           |  4 +--
 ...__migrate_1.2.0-beta.1_to_1.2.0-beta.2.sql |  1 -
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index c8cda9b82..613b09b5f 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -1,7 +1,9 @@
 package run.halo.app.listener;
 
 import lombok.extern.slf4j.Slf4j;
+import org.flywaydb.core.Flyway;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;
@@ -14,7 +16,6 @@ import run.halo.app.config.properties.HaloProperties;
 import run.halo.app.model.properties.PrimaryProperties;
 import run.halo.app.service.OptionService;
 import run.halo.app.service.ThemeService;
-import run.halo.app.service.UserService;
 import run.halo.app.utils.FileUtils;
 
 import java.io.IOException;
@@ -43,13 +44,20 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
     @Autowired
     private ThemeService themeService;
 
-    @Autowired
-    private UserService userService;
+    @Value("${spring.datasource.url}")
+    private String url;
+
+    @Value("${spring.datasource.username}")
+    private String username;
+
+    @Value("${spring.datasource.password}")
+    private String password;
 
     @Override
     public void onApplicationEvent(ApplicationStartedEvent event) {
-        this.printStartInfo();
+        this.migrate();
         this.initThemes();
+        this.printStartInfo();
     }
 
     private void printStartInfo() {
@@ -63,6 +71,22 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
         log.info("Halo has started successfully!");
     }
 
+    /**
+     * Migrate database.
+     */
+    private void migrate() {
+        log.info("Starting migrate database...");
+        Flyway flyway = Flyway
+                .configure()
+                .locations("classpath:/migration")
+                .baselineVersion("1")
+                .baselineOnMigrate(true)
+                .dataSource(url, username, password)
+                .load();
+        flyway.migrate();
+        log.info("Migrate database succeed.");
+    }
+
     /**
      * Init internal themes
      */
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index ddb51cd84..8d08f6037 100755
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -37,9 +37,7 @@ spring:
     show-sql: true
     open-in-view: false
   flyway:
-    locations: classpath:/migration
-    baseline-on-migrate: true
-    baseline-version: 1
+    enabled: false
   servlet:
     multipart:
       max-file-size: 10240MB
diff --git a/src/main/resources/application-test.yaml b/src/main/resources/application-test.yaml
index fec768cb9..c4daa3628 100755
--- a/src/main/resources/application-test.yaml
+++ b/src/main/resources/application-test.yaml
@@ -36,9 +36,7 @@ spring:
       ddl-auto: update
     show-sql: true
   flyway:
-    locations: classpath:/migration
-    baseline-on-migrate: true
-    baseline-version: 1
+    enabled: false
   servlet:
     multipart:
       max-file-size: 10MB
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index ad9bebce4..d96b72d1e 100755
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -39,9 +39,7 @@ spring:
     show-sql: false
     open-in-view: false
   flyway:
-    locations: classpath:/migration
-    baseline-on-migrate: true
-    baseline-version: 1
+    enabled: false
   servlet:
     multipart:
       max-file-size: 10240MB
diff --git a/src/main/resources/migration/V2__migrate_1.2.0-beta.1_to_1.2.0-beta.2.sql b/src/main/resources/migration/V2__migrate_1.2.0-beta.1_to_1.2.0-beta.2.sql
index 529bc50eb..8bab61c4d 100644
--- a/src/main/resources/migration/V2__migrate_1.2.0-beta.1_to_1.2.0-beta.2.sql
+++ b/src/main/resources/migration/V2__migrate_1.2.0-beta.1_to_1.2.0-beta.2.sql
@@ -2,5 +2,4 @@
 
 -- Migrate journals Table
 alter table journals modify content text not null;
-alter table journals add source_content varchar(1023) default '' not null;
 update journals set `source_content`=`content`
\ No newline at end of file