forked from Archives/Athou_commafeed
better detection of empty database
This commit is contained in:
@@ -28,4 +28,8 @@ public class UserDAO extends GenericDAO<User> {
|
|||||||
return newQuery().from(user).where(user.email.equalsIgnoreCase(email)).leftJoin(user.roles, QUserRole.userRole).fetch()
|
return newQuery().from(user).where(user.email.equalsIgnoreCase(email)).leftJoin(user.roles, QUserRole.userRole).fetch()
|
||||||
.uniqueResult(user);
|
.uniqueResult(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long count() {
|
||||||
|
return newQuery().from(user).count();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public class StartupService implements Managed {
|
|||||||
new UnitOfWork<Void>(sessionFactory) {
|
new UnitOfWork<Void>(sessionFactory) {
|
||||||
@Override
|
@Override
|
||||||
protected Void runInSession() throws Exception {
|
protected Void runInSession() throws Exception {
|
||||||
if (userDAO.findByName(CommaFeedApplication.USERNAME_ADMIN) == null) {
|
if (userDAO.count() == 0) {
|
||||||
initialData();
|
initialData();
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user