Revize 8b817e46

Improve db configuration

sources/imiger-core/create_table.sql

@@ -1 @@
-
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
---
--- Databáze: `visualization_tool`
---
-
--- --------------------------------------------------------
-
---
--- Struktura tabulky `user`
---
-
-CREATE TABLE IF NOT EXISTS `user` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `nick` varchar(50) COLLATE utf8_czech_ci NOT NULL,
-  `name` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
-  `psw` varchar(60) COLLATE utf8_czech_ci NOT NULL,
-  `session` varchar(50) COLLATE utf8_czech_ci NOT NULL,
-  `active` tinyint(1) NOT NULL,
-  `created` datetime NOT NULL,
-  `email` varchar(50) COLLATE utf8_czech_ci NOT NULL,
-   CONSTRAINT PK_user PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;
-
---
--- Struktura tabulky `diagram`
---
-
-CREATE TABLE IF NOT EXISTS `diagram` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
-  `created` datetime NOT NULL,
-  `last_update` datetime NOT NULL,
-  `user_id` int(11) NOT NULL,
-  `public` tinyint(1) NOT NULL DEFAULT '0',
-  `graph_json` longtext COLLATE utf8_czech_ci NOT NULL DEFAULT '',
-  CONSTRAINT PK_diagram PRIMARY KEY (`id`),
-  CONSTRAINT  FK_user_diagram FOREIGN KEY (`user_id`) REFERENCES user(`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;
-

sources/imiger-core/src/main/java/cz/zcu/kiv/offscreen/user/MyBatisUtil.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.user;
 
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
 import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 
-import java.io.InputStream;
-
 public class MyBatisUtil {
     private static final String CONFIGURATION = "mybatis-config.xml";
+    private static final String DB_INIT_SCRIPT = "create_table.sql";
+
+    private static final String PROPERTY_INIT_DB = "INIT_DB";
+    private static final String PROPERTY_JDBC_DATABASE_URL = "JDBC_DATABASE_URL";
+    private static final String PROPERTY_JDBC_DATABASE_USERNAME = "JDBC_DATABASE_USERNAME";
+    private static final String PROPERTY_JDBC_DATABASE_PASSWORD = "JDBC_DATABASE_PASSWORD";
+
     private static SqlSessionFactory sqlSessionFactory;
 
     public static SqlSessionFactory getSqlSessionFactory() {
-
         if (sqlSessionFactory == null) {
             try {
-                InputStream inputStream = Resources.getResourceAsStream(CONFIGURATION);
-                sqlSessionFactory = new SqlSessionFactoryBuilder().build(inputStream);
+                sqlSessionFactory = createFactory();
+                if (Boolean.parseBoolean(System.getenv(PROPERTY_INIT_DB))) {
+                    initDatabase(sqlSessionFactory);
+                }
             } catch (Exception e) {
                 throw new DataAccessException(e);
             }
         }
         return sqlSessionFactory;
     }
+
+    private static SqlSessionFactory createFactory() throws IOException {
+        Properties properties = new Properties();
+        properties.setProperty(PROPERTY_JDBC_DATABASE_URL, System.getenv(PROPERTY_JDBC_DATABASE_URL));
+        properties.setProperty(PROPERTY_JDBC_DATABASE_USERNAME, System.getenv(PROPERTY_JDBC_DATABASE_USERNAME));
+        properties.setProperty(PROPERTY_JDBC_DATABASE_PASSWORD, System.getenv(PROPERTY_JDBC_DATABASE_PASSWORD));
+
+        InputStream inputStream = Resources.getResourceAsStream(CONFIGURATION);
+        return new SqlSessionFactoryBuilder().build(inputStream, properties);
+    }
+
+    private static void initDatabase(SqlSessionFactory sqlSessionFactory) {
+        try (SqlSession session = sqlSessionFactory.openSession()) {
+            InputStream inputStream = Resources.getResourceAsStream(DB_INIT_SCRIPT);
+            InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+
+            ScriptRunner sr = new ScriptRunner(session.getConnection());
+            sr.runScript(reader);
+
+            session.commit();
+        } catch (Exception e) {
+            throw new DataAccessException(e);
+        }
+    }
 }

sources/imiger-core/src/main/resources/create_table.sql

@@ +1 @@
+
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+--
+-- Struktura tabulky `user`
+--
+
+CREATE TABLE IF NOT EXISTS `user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `nick` varchar(50) COLLATE utf8_czech_ci NOT NULL,
+  `name` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
+  `psw` varchar(60) COLLATE utf8_czech_ci NOT NULL,
+  `session` varchar(50) COLLATE utf8_czech_ci NOT NULL,
+  `active` tinyint(1) NOT NULL,
+  `created` datetime NOT NULL,
+  `email` varchar(50) COLLATE utf8_czech_ci NOT NULL,
+   CONSTRAINT PK_user PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;
+
+--
+-- Struktura tabulky `diagram`
+--
+
+CREATE TABLE IF NOT EXISTS `diagram` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `created` datetime NOT NULL,
+  `last_update` datetime NOT NULL,
+  `user_id` int(11) NOT NULL,
+  `public` tinyint(1) NOT NULL DEFAULT '0',
+  `graph_json` longtext COLLATE utf8_czech_ci NOT NULL DEFAULT '',
+  CONSTRAINT PK_diagram PRIMARY KEY (`id`),
+  CONSTRAINT  FK_user_diagram FOREIGN KEY (`user_id`) REFERENCES user(`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;
+

sources/imiger-core/src/main/resources/mybatis-config.xml

@@ -9 +9 @@
             <transactionManager type="JDBC"/>
             <dataSource type="POOLED">
                 <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
-                <property name="url" value="jdbc:mysql://localhost/visualization_tool?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=UTC"/>
-                <property name="username" value="admin"/>
-                <property name="password" value="admin"/>
+                <property name="url" value="${JDBC_DATABASE_URL}"/>
+                <property name="username" value="${JDBC_DATABASE_USERNAME}"/>
+                <property name="password" value="${JDBC_DATABASE_PASSWORD}"/>
             </dataSource>
         </environment>
     </environments>