STAND-131: Fix java.sql.SQLSyntaxErrorException: Unknown column 'RESERVED' in 'WHERE' in 3.x Standalone (#89)

* STAND-131: Fix java.sql.SQLSyntaxErrorException: Unknown column 'RESERVED' in 'WHERE' in 3.x Standalone

* Use 2.8.1-SNAPSHOT+ with mariadb support

* Updated title from Openmrs 3.x to O3 RefApp v3.x

* remove repititions

Author: Muta-Jonathan

README.md

@@ -116,7 +116,7 @@ NOTE: Without this folder structure, you will get errors while trying to run the
 
 ## DATABASE CONNECTION STRING
 
-	jdbc:mysql://127.0.0.1:3316/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+	jdbc:mariadb://127.0.0.1:3316/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 
 The above default database connection string has all in the openmrs mysql default database connection and is used for the MariaDB connection.
 

pom.xml

@@ -21,7 +21,7 @@
 		<liquibase.plugin.version>4.23.2</liquibase.plugin.version>
 
 		<tomcat.version>9.0.106</tomcat.version>
-		<openmrs.version>2.8.0</openmrs.version>
+		<openmrs.version>2.8.1-SNAPSHOT</openmrs.version>
 		<refapp.version>3.6.0-SNAPSHOT</refapp.version>
 		<mariadb4jVersion>3.2.0</mariadb4jVersion>
 		<junitVersion>5.12.2</junitVersion>
@@ -101,6 +101,12 @@
 			<artifactId>mybatis</artifactId>
 			<version>3.5.19</version>
 		</dependency>
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>3.5.4</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

readme.txt

@@ -139,7 +139,7 @@ splashscreen-loading.png			 This is the splash screen displayed on startup. It c
 
 ............... DATABASE CONNECTION STRING.......................
 
-jdbc:mysql://127.0.0.1:3316/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+jdbc:mariadb://127.0.0.1:3316/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 
 The above default database connection string has all in the openmrs mysql default database connection and is used for the MariaDB connection.
 

src/main/config/openmrs-runtime.properties

@@ -3,7 +3,7 @@
 module.allow_web_admin=true
 # this connection url is copied several times in pom.xml, with the directory changed from database to emptydatabase and 3316 changed to 3326.
 # If you change the property here, make sure to change it there too. 
-connection.url=jdbc:mysql://127.0.0.1:3316/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+connection.url=jdbc:mariadb://127.0.0.1:3316/openmrs?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 connection.username=openmrs
 auto_update_database=false
 connection.password=test
@@ -12,4 +12,6 @@ application_data_directory=appdata
 reset_connection_password=true
 vm_arguments=-Xmx512m -Xms512m -XX:NewSize=128m --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED
 # Tell MariaDB where to find database files (this is the important part!)
-connection.database.data_dir=./database/data
+connection.database.data_dir=./database/data
+hibernate.connection.driver_class=org.mariadb.jdbc.Driver
+hibernate.dialect=org.hibernate.dialect.MariaDBDialect

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

@@ -418,7 +418,7 @@ public void run() {
 	 * @see org.openmrs.standalone.UserInterface#showInitialConfig()
 	 */
 	public void showInitialConfig() {
-		final JDialog configDialog = new JDialog(this, "Configure your OpenMRS " + OpenmrsUtil.REFAPP_VERSION + " Installation", true);
+		final JDialog configDialog = new JDialog(this, "Configure your O3 RefApp v" + OpenmrsUtil.REFAPP_VERSION + " Installation", true);
 		JPanel content = new JPanel();
 		content.setBorder(BorderFactory.createEmptyBorder(15, 15, 15, 15));
 		content.setLayout(new BorderLayout(10, 10)); //10,10 = hgap, vgap
@@ -427,15 +427,20 @@ public void showInitialConfig() {
 		Font font = new Font(Font.SERIF, Font.PLAIN, 16);
 
 		final JButton useCurrent = new JButton("Do Not Modify the Database");
-		
+
 		final JButton demoDatabase = new JButton(
-		        "<html><h3>Demonstration mode</h3>Configures OpenMRS with a demonstration database. This is the quickest way to start up OpenMRS with some sample data to evaluate the system or experiment with features</html>",
-		        new ImageIcon(getClass().getResource("demonstration_mode.png")));
+				"<html><h3>Demonstration mode</h3>Configures the application with a demonstration database. "
+						+ "This is the quickest way to start with sample data to evaluate the system or experiment with features.</html>",
+				new ImageIcon(getClass().getResource("demonstration_mode.png"))
+		);
+
 		colorHelper(demoDatabase, new Color(136, 235, 148));
-		
+
 		final JButton emptyDatabase = new JButton(
-		        "<html><h3>Starter Implementation</h3>Configures OpenMRS without any patient data. If you are familiar with OpenMRS and want to start a new system, this is a good place to start.</html>",
-		        new ImageIcon(getClass().getResource("starter_impl.png")));
+				"<html><h3>Starter Implementation</h3>Configures the application without any patient data. "
+						+ "If you are familiar with the system and want to start a new setup, this is a good place to begin.</html>",
+				new ImageIcon(getClass().getResource("starter_impl.png"))
+		);
 		colorHelper(emptyDatabase, new Color(255, 243, 136));
 
 		ActionListener listener = new ActionListener() {
@@ -466,7 +471,7 @@ public void actionPerformed(ActionEvent e) {
 		}
 
 		JLabel instructions = new JLabel(
-		        "<html><b>Welcome to OpenMRS " + OpenmrsUtil.REFAPP_VERSION + "! OpenMRS can be configured in one of " + buttonList.size() + " ways, depending on your needs. Please click on the configuration that best meets your needs.</b><br/>(You will not see this next time you run OpenMRS)</html>");
+		        "<html><b>Welcome! O3 RefApp can be configured in one of " + buttonList.size() + " ways, depending on your needs. Please click on the configuration that best meets your needs.</b><br/>(You will not see this next time you run OpenMRS)</html>");
 		instructions.setFont(font);
 
 		JButton exitButton = new JButton("Exit");

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

@@ -78,7 +78,7 @@ public static void startMariaDB(int port, String userPassword) throws Exception
             mariaDB = ReusableDB.openEmbeddedDB(mariaDBConfig.build());
             mariaDB.start();
 
-            Connection conn = DriverManager.getConnection("jdbc:mysql://localhost:" + port + "/", ROOT_USER, ROOT_PASSWORD);
+            Connection conn = DriverManager.getConnection("jdbc:mariadb://localhost:" + port + "/", ROOT_USER, ROOT_PASSWORD);
             try (Statement stmt = conn.createStatement()) {
                 stmt.execute("ALTER USER 'root'@'localhost' IDENTIFIED BY '" + ROOT_PASSWORD + "';");
                 stmt.execute("GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION;");

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

@@ -224,7 +224,7 @@ public static void setDefaultOS(){
 	}
 
 	public static String getTitle() {
-		return "OpenMRS " + REFAPP_VERSION + " Standalone";
+		return "O3 RefApp v" +REFAPP_VERSION + " Standalone";
 	}
 
 	/**

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

@@ -154,7 +154,7 @@ public static String setPortsAndMySqlPassword(String mariaDBPort, String tomcatP
 
 				String portToken = ":" + mariaDBPort + "/";
 
-				//in a string like this: jdbc:mysql://localhost:3316/openmrs?autoReconnect=true
+				//in a string like this: jdbc:mariadb://localhost:3316/openmrs?autoReconnect=true
 				//look for something like this :3316/
 				String regex = ":[0-9]+/";
 				Pattern pattern = Pattern.compile(regex);
@@ -330,7 +330,7 @@ public static String getContextName() {
 	 */
 	private static boolean setMysqlPassword(String url, String mysqlPort, String username, String newPassword) throws Exception {
 		try {
-			Class.forName("com.mysql.cj.jdbc.Driver").newInstance();
+			Class.forName("org.mariadb.jdbc.Driver").newInstance();
 
 			MariaDbController.startMariaDB(mysqlPort, properties.getProperty("connection.password", ""));
 
@@ -431,7 +431,7 @@ private static void updateRuntimeProperties(Map<String, String> newProps) {
 	 */
 	public static void startupDatabaseToCreateDefaultUser(String mariaDBPort) throws Exception {
 		try {
-			Class.forName("com.mysql.cj.jdbc.Driver");
+			Class.forName("org.mariadb.jdbc.Driver");
 		} catch (ClassNotFoundException ex) {
 			throw new RuntimeException("Cannot find MySQL driver class", ex);
 		}
@@ -493,7 +493,7 @@ public static String setRuntimePropertiesFileMysqlAndTomcatPorts(String mariaDBP
 			String connectionString = properties.getProperty(KEY_CONNECTION_URL);
 			String portToken = ":" + mariaDBPort + "/";
 
-			//in a string like this: jdbc:mysql://localhost:3316/openmrs?autoReconnect=true
+			//in a string like this: jdbc:mariadb://localhost:3316/openmrs?autoReconnect=true
 			//look for something like this :3316/
 			String regex = ":[0-9]+/";
 			Pattern pattern = Pattern.compile(regex);

src/test/java/org/openmrs/standalone/StandaloneUtilTest.java

@@ -37,7 +37,7 @@ class StandaloneUtilTest {
 
     private static final String USERNAME = "openmrs";
     private static final String MARIADB_PORT = "33126";
-    private static final String DEFAULT_URL = "jdbc:mysql://127.0.0.1:" + MARIADB_PORT + "/" + MariaDbController.DATABASE_NAME;
+    private static final String DEFAULT_URL = "jdbc:mariadb://127.0.0.1:" + MARIADB_PORT + "/" + MariaDbController.DATABASE_NAME;
 
     private static final String MARIADB_BASEDIR_NAME = "mariadb-base-dir";
     private static final String DATA_DIR_NAME = "data";