diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
index e83ee296..705739f0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
@@ -40,6 +40,8 @@ public class MusicFolderDao extends AbstractDao {
private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;
private final MusicFolderRowMapper rowMapper = new MusicFolderRowMapper();
+ private UserDao userDao;
+
/**
* Returns all music folders.
*
@@ -60,7 +62,7 @@ public class MusicFolderDao extends AbstractDao {
update(sql, musicFolder.getPath(), musicFolder.getName(), musicFolder.isEnabled(), musicFolder.getChanged());
Integer id = queryForInt("select max(id) from music_folder", 0);
- update("insert into music_folder_user (music_folder_id, username) select ?, username from user", id);
+ update("insert into music_folder_user (music_folder_id, username) select ?, username from " + userDao.getUserTable(), id);
LOG.info("Created music folder " + musicFolder.getPath());
}
@@ -105,4 +107,7 @@ public class MusicFolderDao extends AbstractDao {
}
}
+ public void setUserDao(UserDao userDao) {
+ this.userDao = userDao;
+ }
}
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
index f9b05984..37c774e7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
@@ -358,7 +358,7 @@ public class UserDao extends AbstractDao {
}
}
- private String getUserTable() {
+ String getUserTable() {
return userTableQuote + "user" + userTableQuote;
}
diff --git a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml b/libresonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml
index 44f53be4..a966a9cf 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml
+++ b/libresonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml
@@ -45,6 +45,7 @@
+
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java
index f612c2b2..99c75a3e 100644
--- a/libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java
+++ b/libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java
@@ -59,6 +59,7 @@ public abstract class DaoTestCaseBase extends TestCase {
internetRadioDao.setDaoHelper(daoHelper);
ratingDao.setDaoHelper(daoHelper);
musicFolderDao.setDaoHelper(daoHelper);
+ musicFolderDao.setUserDao(userDao);
userDao.setDaoHelper(daoHelper);
transcodingDao.setDaoHelper(daoHelper);
podcastDao.setDaoHelper(daoHelper);