default database is h2

5 files changed, 174 insertions, 206 deletions

diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 7c1b2b1f..2ffb1642 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -33,13 +33,13 @@ dependencies {
 
     compile 'org.imgscalr:imgscalr-lib:4.2'
 
+    providedCompile 'com.h2database:h2:1.4.196'
     providedCompile "javax.servlet:javax.servlet-api:3.1.0"
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 
     providedRuntime "commons-fileupload:commons-fileupload:1.3.3"
 
     testCompile project(path: ':juick-core', configuration: 'testArtifacts')
-    testCompile 'com.h2database:h2:1.4.196'
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
     testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}"
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
index c728b527..03009565 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -37,16 +37,16 @@ import java.util.List;
  */
 @Configuration
 @EnableTransactionManagement
-@PropertySource(value = {"classpath:juick.conf"})
+@PropertySource(value = {"classpath:juick.conf"}, ignoreResourceNotFound = true)
 @ComponentScan(basePackages = {"com.juick.service"})
 public class DataConfiguration implements TransactionManagementConfigurer {
-    @Value("${datasource_driver:com.mysql.jdbc.Driver}")
+    @Value("${datasource_driver:org.h2.Driver}")
     private String datasourceDriver;
-    @Value("${datasource_url:}")
+    @Value("${datasource_url:jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;mode=MYSQL}")
     private String datasourceUrl;
-    @Value("${datasource_user:}")
+    @Value("${datasource_user:juick}")
     private String datasourceUser;
-    @Value("${datasource_password:}")
+    @Value("${datasource_password:secret}")
     private String datasourcePassword;
 
     // NOTE: The close() method will be called automatically with default @Bean settings
@@ -76,9 +76,173 @@ public class DataConfiguration implements TransactionManagementConfigurer {
     }
 
     @Bean
-    @DependsOn("dataSource")
     public JdbcTemplate jdbcTemplate() {
-        return new JdbcTemplate(dataSource());
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource());
+        if (datasourceDriver.equals("org.h2.Driver")) {
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS bl_users (user_id int(10) unsigned NOT NULL, " +
+                    "bl_user_id int(10) unsigned NOT NULL, ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP )");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS bl_tags (user_id int(10) unsigned NOT NULL, " +
+                    "tag_id int(10) unsigned NOT NULL)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS wl_users (user_id int(10) unsigned NOT NULL, " +
+                    "wl_user_id int(10) unsigned NOT NULL, ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP )");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS messages (" +
+                    "message_id int(10) unsigned NOT NULL AUTO_INCREMENT," +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "place_id int(10) unsigned DEFAULT NULL," +
+                    "lat decimal(10,7) DEFAULT NULL," +
+                    "lon decimal(10,7) DEFAULT NULL," +
+                    "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP," +
+                    "replies smallint(5) unsigned NOT NULL DEFAULT 0," +
+                    "maxreplyid smallint(5) unsigned NOT NULL DEFAULT 0," +
+                    "privacy tinyint(4) NOT NULL DEFAULT '1'," +
+                    "attach nchar(3) check (attach in ('jpg', 'mp4', 'png'))," +
+                    "readonly tinyint(1) NOT NULL DEFAULT 0," +
+                    "likes smallint(6) NOT NULL DEFAULT 0," +
+                    "`popular` tinyint(4) NOT NULL DEFAULT '0'," +
+                    "hidden tinyint(3) unsigned NOT NULL DEFAULT 0," +
+                    "updated timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS messages_tags (" +
+                    "message_id int(10) unsigned NOT NULL," +
+                    "tag_id int(10) unsigned NOT NULL" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS users (" +
+                    "id int(10) unsigned NOT NULL AUTO_INCREMENT," +
+                    "nick char(64) NOT NULL," +
+                    "`lang` enum('en','ru','fr','fa','__') NOT NULL DEFAULT '__'," +
+                    "passw char(32) NOT NULL," +
+                    "banned tinyint(3) unsigned NOT NULL DEFAULT 0, " +
+                    "PRIMARY KEY(id),  UNIQUE KEY(nick))");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS useroptions (" +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "jnotify tinyint(1) NOT NULL DEFAULT 1," +
+                    "`repliesview` tinyint(1) NOT NULL DEFAULT '0'," +
+                    "subscr_active tinyint(1) NOT NULL DEFAULT 1)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS subscr_users (" +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "suser_id int(10) unsigned NOT NULL," +
+                    "jid char(64) DEFAULT NULL," +
+                    "active tinyint(1) NOT NULL DEFAULT 1," +
+                    "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, " +
+                    "PRIMARY KEY (suser_id, user_id))");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS subscr_messages (" +
+                    "message_id int(10) unsigned NOT NULL," +
+                    "suser_id int(10) unsigned NOT NULL, PRIMARY KEY (suser_id, message_id))");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS subscr_tags (" +
+                    "tag_id int(10) unsigned NOT NULL," +
+                    "suser_id int(10) unsigned NOT NULL, PRIMARY KEY (suser_id, tag_id))");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS messages_txt (" +
+                    "message_id int(10) unsigned NOT NULL," +
+                    "tags varchar(255)," +
+                    "repliesby varchar(96)," +
+                    "txt TEXT)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS tags(" +
+                    "tag_id int(10) unsigned NOT NULL AUTO_INCREMENT," +
+                    "synonym_id int(10) unsigned DEFAULT NULL," +
+                    "name char(48) NOT NULL," +
+                    "top tinyint(1) unsigned NOT NULL DEFAULT 0," +
+                    "stat_messages int(10) unsigned NOT NULL DEFAULT 0," +
+                    "stat_users  smallint(5) unsigned NOT NULL DEFAULT 0)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS jids(" +
+                    "user_id int(10) unsigned NOT NULL AUTO_INCREMENT," +
+                    "jid char(64) NOT NULL," +
+                    "active tinyint(1) unsigned NOT NULL DEFAULT '1'," +
+                    "loginhash char(36) unsigned DEFAULT NULL," +
+                    "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS replies (" +
+                    "message_id int(10) unsigned NOT NULL," +
+                    "reply_id smallint(5) unsigned NOT NULL," +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "replyto smallint(5) unsigned NOT NULL DEFAULT 0," +
+                    "ts timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," +
+                    "attach nchar(3) check (attach in ('jpg', 'mp4', 'png'))," +
+                    "txt text)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS twitter(" +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "access_token char(64) NOT NULL," +
+                    "access_token_secret char(64) NOT NULL," +
+                    "crosspost tinyint(1) unsigned NOT NULL DEFAULT '1'," +
+                    "uname char(64) NOT NULL," +
+                    "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS facebook(" +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "fb_id int(20) unsigned NOT NULL," +
+                    "access_token char(255) NOT NULL," +
+                    "loginhash char(36) NOT NULL," +
+                    "crosspost tinyint(1) unsigned NOT NULL DEFAULT '1'," +
+                    "fb_name char(64) NOT NULL," +
+                    "fb_link char(64) NOT NULL," +
+                    "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS vk(" +
+                    "user_id int(10) unsigned NOT NULL," +
+                    "vk_id int(20) unsigned NOT NULL," +
+                    "access_token char(128) NOT NULL," +
+                    "loginhash char(36) NOT NULL," +
+                    "crosspost tinyint(1) unsigned NOT NULL DEFAULT '1'," +
+                    "vk_name char(64) NOT NULL," +
+                    "vk_link char(64) NOT NULL," +
+                    "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS emails (" +
+                    "  user_id int(10) unsigned NOT NULL," +
+                    "  email char(64) NOT NULL," +
+                    "  subscr_hour tinyint(4) DEFAULT NULL," +
+                    "  PRIMARY KEY (email)" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS favorites (" +
+                    "  user_id int(10) unsigned NOT NULL," +
+                    "  message_id int(10) unsigned NOT NULL," +
+                    "  ts datetime NOT NULL" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS logins (" +
+                    "  user_id int(10) unsigned NOT NULL," +
+                    "  hash char(16) NOT NULL," +
+                    "  PRIMARY KEY (user_id)" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `telegram` (" +
+                    "  `user_id` int(10) unsigned DEFAULT NULL," +
+                    "  `tg_id` bigint(20) NOT NULL," +
+                    "  `tg_name` char(64) NOT NULL," +
+                    "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," +
+                    "  `loginhash` char(36) DEFAULT NULL" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `pm` (" +
+                    "  `user_id` int(10) unsigned NOT NULL," +
+                    "  `user_id_to` int(10) unsigned NOT NULL," +
+                    "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," +
+                    "  `txt` text NOT NULL" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `pm_streams` (" +
+                    "  `user_id` int(10) unsigned NOT NULL," +
+                    "  `user_id_to` int(10) unsigned NOT NULL," +
+                    "  `lastmessage` datetime NOT NULL," +
+                    "  `lastview` datetime DEFAULT NULL," +
+                    "  `unread` smallint(5) unsigned NOT NULL DEFAULT '0'" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `android` (" +
+                    "  `user_id` int(10) unsigned NOT NULL," +
+                    "  `regid` char(255) NOT NULL," +
+                    "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `ios` (" +
+                    "  `user_id` int(10) unsigned NOT NULL," +
+                    "  `token` char(64) NOT NULL," +
+                    "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `winphone` (" +
+                    "  `user_id` int(10) unsigned NOT NULL," +
+                    "  `url` char(255) NOT NULL," +
+                    "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `tags_ignore` (" +
+                    "  `tag_id` int(10) unsigned NOT NULL" +
+                    ")");
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS `users_subscr` (" +
+                    "  `user_id` int(10) unsigned NOT NULL," +
+                    "  `cnt` smallint(5) unsigned NOT NULL DEFAULT '0'," +
+                    "  PRIMARY KEY (`user_id`)" +
+                    ")");
+        }
+        return jdbcTemplate;
     }
 
     @Bean
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
index e3c244d8..70461c91 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
@@ -33,7 +33,6 @@ import javax.annotation.Resource;
  * Created by aalexeev on 11/18/16.
  */
 @Configuration
-@PropertySource(value = {"classpath:juick.conf"})
 public class SearchConfiguration {
     @Resource
     private Environment env;
diff --git a/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java b/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
index 08b5b787..eac98354 100644
--- a/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
+++ b/juick-server-jdbc/src/test/java/com/juick/configuration/RepositoryConfiguration.java
@@ -37,202 +37,6 @@ import java.util.List;
 @Configuration
 @ComponentScan(basePackages = "com.juick.service")
 public class RepositoryConfiguration {
-
-    @Bean
-    public DataSource dataSource() {
-        DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName("org.h2.Driver");
-        dataSource.setUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;mode=MYSQL");
-
-        return dataSource;
-    }
-
-    @Bean
-    public JdbcTemplate jdbcTemplate() {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource());
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS bl_users (user_id int(10) unsigned NOT NULL, " +
-                "bl_user_id int(10) unsigned NOT NULL, ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP )");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS bl_tags (user_id int(10) unsigned NOT NULL, " +
-                "tag_id int(10) unsigned NOT NULL)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS wl_users (user_id int(10) unsigned NOT NULL, " +
-                "wl_user_id int(10) unsigned NOT NULL, ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP )");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS messages (" +
-                "message_id int(10) unsigned NOT NULL AUTO_INCREMENT," +
-                "user_id int(10) unsigned NOT NULL," +
-                "place_id int(10) unsigned DEFAULT NULL," +
-                "lat decimal(10,7) DEFAULT NULL," +
-                "lon decimal(10,7) DEFAULT NULL," +
-                "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP," +
-                "replies smallint(5) unsigned NOT NULL DEFAULT 0," +
-                "maxreplyid smallint(5) unsigned NOT NULL DEFAULT 0," +
-                "privacy tinyint(4) NOT NULL DEFAULT '1'," +
-                "attach nchar(3) check (attach in ('jpg', 'mp4', 'png'))," +
-                "readonly tinyint(1) NOT NULL DEFAULT 0," +
-                "likes smallint(6) NOT NULL DEFAULT 0," +
-                "`popular` tinyint(4) NOT NULL DEFAULT '0'," +
-                "hidden tinyint(3) unsigned NOT NULL DEFAULT 0," +
-                "updated timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS messages_tags (" +
-                "message_id int(10) unsigned NOT NULL," +
-                "tag_id int(10) unsigned NOT NULL" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS users (" +
-                "id int(10) unsigned NOT NULL AUTO_INCREMENT," +
-                "nick char(64) NOT NULL," +
-                "`lang` enum('en','ru','fr','fa','__') NOT NULL DEFAULT '__'," +
-                "passw char(32) NOT NULL," +
-                "banned tinyint(3) unsigned NOT NULL DEFAULT 0, " +
-                "PRIMARY KEY(id),  UNIQUE KEY(nick))");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS useroptions (" +
-                "user_id int(10) unsigned NOT NULL," +
-                "jnotify tinyint(1) NOT NULL DEFAULT 1," +
-                "`repliesview` tinyint(1) NOT NULL DEFAULT '0'," +
-                "subscr_active tinyint(1) NOT NULL DEFAULT 1)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS subscr_users (" +
-                "user_id int(10) unsigned NOT NULL," +
-                "suser_id int(10) unsigned NOT NULL," +
-                "jid char(64) DEFAULT NULL," +
-                "active tinyint(1) NOT NULL DEFAULT 1," +
-                "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, " +
-                "PRIMARY KEY (suser_id, user_id))");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS subscr_messages (" +
-                "message_id int(10) unsigned NOT NULL," +
-                "suser_id int(10) unsigned NOT NULL, PRIMARY KEY (suser_id, message_id))");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS subscr_tags (" +
-                "tag_id int(10) unsigned NOT NULL," +
-                "suser_id int(10) unsigned NOT NULL, PRIMARY KEY (suser_id, tag_id))");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS messages_txt (" +
-                "message_id int(10) unsigned NOT NULL," +
-                "tags varchar(255)," +
-                "repliesby varchar(96)," +
-                "txt TEXT)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS tags(" +
-                "tag_id int(10) unsigned NOT NULL AUTO_INCREMENT," +
-                "synonym_id int(10) unsigned DEFAULT NULL," +
-                "name char(48) NOT NULL," +
-                "top tinyint(1) unsigned NOT NULL DEFAULT 0," +
-                "stat_messages int(10) unsigned NOT NULL DEFAULT 0," +
-                "stat_users  smallint(5) unsigned NOT NULL DEFAULT 0)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS jids(" +
-                "user_id int(10) unsigned NOT NULL AUTO_INCREMENT," +
-                "jid char(64) NOT NULL," +
-                "active tinyint(1) unsigned NOT NULL DEFAULT '1'," +
-                "loginhash char(36) unsigned DEFAULT NULL," +
-                "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS replies (" +
-                "message_id int(10) unsigned NOT NULL," +
-                "reply_id smallint(5) unsigned NOT NULL," +
-                "user_id int(10) unsigned NOT NULL," +
-                "replyto smallint(5) unsigned NOT NULL DEFAULT 0," +
-                "ts timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," +
-                "attach nchar(3) check (attach in ('jpg', 'mp4', 'png'))," +
-                "txt text)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS twitter(" +
-                "user_id int(10) unsigned NOT NULL," +
-                "access_token char(64) NOT NULL," +
-                "access_token_secret char(64) NOT NULL," +
-                "crosspost tinyint(1) unsigned NOT NULL DEFAULT '1'," +
-                "uname char(64) NOT NULL," +
-                "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS facebook(" +
-                "user_id int(10) unsigned NOT NULL," +
-                "fb_id int(20) unsigned NOT NULL," +
-                "access_token char(255) NOT NULL," +
-                "loginhash char(36) NOT NULL," +
-                "crosspost tinyint(1) unsigned NOT NULL DEFAULT '1'," +
-                "fb_name char(64) NOT NULL," +
-                "fb_link char(64) NOT NULL," +
-                "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS vk(" +
-                "user_id int(10) unsigned NOT NULL," +
-                "vk_id int(20) unsigned NOT NULL," +
-                "access_token char(128) NOT NULL," +
-                "loginhash char(36) NOT NULL," +
-                "crosspost tinyint(1) unsigned NOT NULL DEFAULT '1'," +
-                "vk_name char(64) NOT NULL," +
-                "vk_link char(64) NOT NULL," +
-                "ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-        jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS emails (" +
-                "  user_id int(10) unsigned NOT NULL," +
-                "  email char(64) NOT NULL," +
-                "  subscr_hour tinyint(4) DEFAULT NULL," +
-                "  PRIMARY KEY (email)" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE favorites (" +
-                "  user_id int(10) unsigned NOT NULL," +
-                "  message_id int(10) unsigned NOT NULL," +
-                "  ts datetime NOT NULL" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE logins (" +
-                "  user_id int(10) unsigned NOT NULL," +
-                "  hash char(16) NOT NULL," +
-                "  PRIMARY KEY (user_id)" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `telegram` (" +
-                "  `user_id` int(10) unsigned DEFAULT NULL," +
-                "  `tg_id` bigint(20) NOT NULL," +
-                "  `tg_name` char(64) NOT NULL," +
-                "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," +
-                "  `loginhash` char(36) DEFAULT NULL" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `pm` (" +
-                "  `user_id` int(10) unsigned NOT NULL," +
-                "  `user_id_to` int(10) unsigned NOT NULL," +
-                "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," +
-                "  `txt` text NOT NULL" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `pm_streams` (" +
-                "  `user_id` int(10) unsigned NOT NULL," +
-                "  `user_id_to` int(10) unsigned NOT NULL," +
-                "  `lastmessage` datetime NOT NULL," +
-                "  `lastview` datetime DEFAULT NULL," +
-                "  `unread` smallint(5) unsigned NOT NULL DEFAULT '0'" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `android` (" +
-                "  `user_id` int(10) unsigned NOT NULL," +
-                "  `regid` char(255) NOT NULL," +
-                "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `ios` (" +
-                "  `user_id` int(10) unsigned NOT NULL," +
-                "  `token` char(64) NOT NULL," +
-                "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `winphone` (" +
-                "  `user_id` int(10) unsigned NOT NULL," +
-                "  `url` char(255) NOT NULL," +
-                "  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `tags_ignore` (" +
-                "  `tag_id` int(10) unsigned NOT NULL" +
-                ")");
-        jdbcTemplate.execute("CREATE TABLE `users_subscr` (" +
-                "  `user_id` int(10) unsigned NOT NULL," +
-                "  `cnt` smallint(5) unsigned NOT NULL DEFAULT '0'," +
-                "  PRIMARY KEY (`user_id`)" +
-                ")");
-        return jdbcTemplate;
-    }
-
-    @Bean
-    public SearchService emptySearchService() {
-        return new SearchService() {
-            @Override
-            public void setMaxResult(int maxResult) {
-            }
-
-            @Override
-            public List<Integer> searchInAllMessages(String searchString, int messageIdBefore) {
-                return Collections.emptyList();
-            }
-
-            @Override
-            public List<Integer> searchByStringAndUser(String searchString, int userId, int messageIdBefore) {
-                return Collections.emptyList();
-            }
-        };
-    }
     @Bean
     public ImagesService imagesService() {
         return new MockImagesService();
diff --git a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java b/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
index b6bfab61..8c54cae1 100644
--- a/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
+++ b/juick-server-jdbc/src/test/java/com/juick/service/MessageServiceTest.java
@@ -20,6 +20,7 @@ package com.juick.service;
 import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
+import com.juick.configuration.DataConfiguration;
 import com.juick.configuration.RepositoryConfiguration;
 import com.juick.server.helpers.AnonymousUser;
 import com.juick.server.helpers.TagStats;
@@ -47,7 +48,7 @@ import static org.junit.Assert.assertEquals;
  * Created by aalexeev on 11/25/16.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = RepositoryConfiguration.class)
+@ContextConfiguration(classes = { DataConfiguration.class, RepositoryConfiguration.class })
 public class MessageServiceTest extends AbstractJUnit4SpringContextTests {
     @Inject
     private MessagesService messagesService;