Merge branch 'openmrs:openmrs-emr3' into openmrs-emr3

Author: Muta-Jonathan

pom-step-01.xml

@@ -37,7 +37,7 @@
                     </execution>
                     <execution>
                         <id>stop-empty-database</id>
-                        <phase>process-resources</phase>
+                        <phase>verify</phase>
                         <goals>
                             <goal>stop</goal>
                         </goals>
@@ -171,6 +171,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Exec: Empty Dump DB to SQL -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>dump-empty-database</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.openmrs.standalone.DatabaseDumper</mainClass>
+                            <arguments>
+                                <argument>${project.build.directory}</argument>
+                                <argument>emptydatabase</argument>
+                                <argument>--port=33326</argument>
+                                <argument>--user=openmrs</argument>
+                                <argument>--password=test</argument>
+                                <argument>--skip-lock-tables</argument>
+                                <argument>--skip-extended-insert</argument>
+                                <argument>--ssl=0</argument>
+                                <argument>openmrs</argument>
+                                <argument>--result-file=${project.build.directory}/openmrs-empty-dump.sql</argument>
+                            </arguments>
+                            <classpathScope>compile</classpathScope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>

pom-step-02.xml

@@ -180,6 +180,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Exec: Demo Dump DB to SQL -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>dump-demo-database</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.openmrs.standalone.DatabaseDumper</mainClass>
+                            <arguments>
+                                <argument>${project.build.directory}</argument>
+                                <argument>demodatabase</argument>
+                                <argument>--port=33328</argument>
+                                <argument>--user=openmrs</argument>
+                                <argument>--password=test</argument>
+                                <argument>--skip-lock-tables</argument>
+                                <argument>--skip-extended-insert</argument>
+                                <argument>--ssl=0</argument>
+                                <argument>openmrs</argument>
+                                <argument>--result-file=${project.build.directory}/openmrs-demo-dump.sql</argument>
+                            </arguments>
+                            <classpathScope>compile</classpathScope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -206,7 +236,7 @@
                     </execution>
                     <execution>
                         <id>zip-demo-database</id>
-                        <phase>prepare-package</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -221,7 +251,7 @@
                     </execution>
                     <execution>
                         <id>zip-empty-database</id>
-                        <phase>prepare-package</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>

pom.xml

@@ -95,6 +95,11 @@
 			<version>${mockitoVersion}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
+			<version>3.5.19</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/assembly/zip-demo-database.xml

@@ -10,7 +10,10 @@
 	<fileSets>
 		<fileSet>
 			<outputDirectory>/</outputDirectory>
-			<directory>${project.build.directory}/demodatabase/data</directory>
+			<directory>${project.build.directory}</directory>
+			<includes>
+				<include>openmrs-demo-dump.sql</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 </assembly>

src/main/assembly/zip-empty-database.xml

@@ -10,7 +10,10 @@
 	<fileSets>
 		<fileSet>
 			<outputDirectory>/</outputDirectory>
-			<directory>${project.build.directory}/emptydatabase/data</directory>
+			<directory>${project.build.directory}</directory>
+			<includes>
+				<include>openmrs-empty-dump.sql</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 </assembly>

src/main/java/org/openmrs/standalone/DatabaseDumper.java

@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the OpenMRS Public License
+ * Version 1.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://license.openmrs.org
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
+ */
+package org.openmrs.standalone;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.openmrs.standalone.OpenmrsUtil.findDumpExecutable;
+
+
+public class DatabaseDumper {
+    public static void main(String[] args) throws Exception {
+        if (args.length < 1) {
+            System.err.println("Usage: java DatabaseDumper <baseDir> [mariadb-dump args...]");
+            System.exit(1);
+        }
+
+        String baseDir = args[0];
+        String dbDir = args[1];
+        String executable = findDumpExecutable(baseDir, dbDir);
+
+        List<String> command = new ArrayList<>();
+        command.add(executable);
+
+        // Add all remaining args starting from args[2], which are the dump flags and db name
+        for (int i = 2; i < args.length; i++) {
+            command.add(args[i]);
+        }
+
+        ProcessBuilder pb = new ProcessBuilder(command);
+        pb.directory(new File("."));
+        pb.inheritIO();
+
+        Process process = pb.start();
+        int exitCode = process.waitFor();
+        if (exitCode != 0) {
+            throw new RuntimeException("Dump command failed with exit code: " + exitCode);
+        }
+
+        System.out.println("✅ Dump completed successfully.");
+    }
+}

src/main/java/org/openmrs/standalone/OpenmrsUtil.java

@@ -13,13 +13,21 @@
  */
 package org.openmrs.standalone;
 
+import org.apache.ibatis.jdbc.ScriptRunner;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.io.Reader;
+import java.io.FileReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.sql.Connection;
+import java.sql.DriverManager;
 import java.util.Properties;
 
 public class OpenmrsUtil {
@@ -212,4 +220,41 @@ public static void setDefaultOS(){
 	public static String getTitle() {
 		return "OpenMRS " + REFAPP_VERSION + " Standalone";
 	}
+
+	public static void importSqlFile(File sqlFile, String jdbcUrl, String user, String password) {
+		if (!sqlFile.exists()) {
+			System.err.println(":x: SQL file not found: " + sqlFile.getAbsolutePath());
+			return;
+		}
+
+		System.out.println("✅ Preparing to import "+sqlFile+" data");
+		try (Connection conn = DriverManager.getConnection(jdbcUrl, user, password)) {
+
+			System.out.println("📥 Importing SQL from: " + sqlFile.getAbsolutePath());
+			try (Reader reader = new FileReader(sqlFile)) {
+				ScriptRunner scriptRunner = new ScriptRunner(conn);
+				scriptRunner.setLogWriter(null); // Disable logs
+				scriptRunner.setStopOnError(true);
+				scriptRunner.runScript(reader);
+				System.out.println("✅ Successfully imported SQL: " + sqlFile.getAbsolutePath());
+			}
+
+		} catch (Exception e) {
+			System.err.println("❌ Error importing SQL: " + e.getMessage());
+			e.printStackTrace();
+		}
+	}
+
+	public static String findDumpExecutable(String baseDir, String dbDir) {
+		String os = System.getProperty("os.name").toLowerCase();
+		boolean isWindows = os.contains("win");
+
+		Path mariadbDump = Paths.get(baseDir, dbDir, "bin", isWindows ? "mysqldump.exe" : "mariadb-dump");
+
+		if (mariadbDump.toFile().exists()) {
+			return mariadbDump.toString();
+		} else {
+			throw new RuntimeException("❌ Neither mariadb-dump nor mysqldump found in: " + mariadbDump.getParent());
+		}
+	}
 }

src/main/java/org/openmrs/standalone/StandaloneUtil.java

@@ -40,6 +40,8 @@
 
 import ch.vorburger.exec.ManagedProcessException;
 
+import static org.openmrs.standalone.OpenmrsUtil.importSqlFile;
+
 /**
  * Utility routines used by the standalone application.
  */
@@ -435,6 +437,7 @@ public static void startupDatabaseToCreateDefaultUser(String mariaDBPort) throws
 		Properties props = OpenmrsUtil.getRuntimeProperties(getContextName());
 		String url = props.getProperty("connection.url");
 		String password = props.getProperty("connection.password");
+		String username = props.getProperty("connection.username");
 
 		System.out.println("Starting MariaDB on port " + mariaDBPort + "...");
 		MariaDbController.startMariaDB(mariaDBPort, password);
@@ -458,6 +461,20 @@ public static void startupDatabaseToCreateDefaultUser(String mariaDBPort) throws
 				stmt.executeUpdate(grantCreateUserSQL);
 
 				System.out.println("✅ Connection to MariaDB successful.");
+
+				// Find sql if exist to preload DB
+				File dataDir = new File("database/data");
+
+				if (dataDir.exists() && dataDir.isDirectory()) {
+					// Find the first .sql file in the unzipped folder
+					File[] sqlFiles = dataDir.listFiles((dir, name) -> name.toLowerCase().endsWith(".sql"));
+					if (sqlFiles != null && sqlFiles.length != 0) {
+						// Run the first found SQL file
+						File sqlFile = sqlFiles[0];
+						importSqlFile(sqlFile, url, username, password);
+					}
+				}
+
 			} else {
 				System.err.println("❌ Connection established, but it is not valid.");
 			}