tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for postgresql.

Browse Source
This commit is contained in:
Anatoly Sablin
2020-01-28 23:18:39 +03:00
parent 7555fff1a5
commit 72977d65ae
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/io/kamax/mxisd/storage/ormlite/OrmLiteSqlStorage.java
View File

@@ -91,6 +91,7 @@ public class OrmLiteSqlStorage implements IStorage {
private Dao<AcceptedDao, Long> acceptedDao; private Dao<AcceptedDao, Long> acceptedDao;
private Dao<HashDao, String> hashDao; private Dao<HashDao, String> hashDao;
private Dao<ChangelogDao, String> changelogDao; private Dao<ChangelogDao, String> changelogDao;
private StorageConfig.BackendEnum backend;
public OrmLiteSqlStorage(StorageConfig.BackendEnum backend, String path) { public OrmLiteSqlStorage(StorageConfig.BackendEnum backend, String path) {
this(backend, path, null, null); this(backend, path, null, null);
@@ -100,6 +101,7 @@ public class OrmLiteSqlStorage implements IStorage {
if (backend == null) { if (backend == null) {
throw new ConfigurationException("storage.backend"); throw new ConfigurationException("storage.backend");
} }
this.backend = backend;
if (StringUtils.isBlank(database)) { if (StringUtils.isBlank(database)) {
throw new ConfigurationException("Storage destination cannot be empty"); throw new ConfigurationException("Storage destination cannot be empty");
@@ -113,7 +115,7 @@ public class OrmLiteSqlStorage implements IStorage {
sessionDao = createDaoAndTable(connPool, ThreePidSessionDao.class); sessionDao = createDaoAndTable(connPool, ThreePidSessionDao.class);
asTxnDao = createDaoAndTable(connPool, ASTransactionDao.class); asTxnDao = createDaoAndTable(connPool, ASTransactionDao.class);
accountDao = createDaoAndTable(connPool, AccountDao.class); accountDao = createDaoAndTable(connPool, AccountDao.class);
acceptedDao = createDaoAndTable(connPool, AcceptedDao.class); acceptedDao = createDaoAndTable(connPool, AcceptedDao.class, true);
hashDao = createDaoAndTable(connPool, HashDao.class); hashDao = createDaoAndTable(connPool, HashDao.class);
runMigration(connPool); runMigration(connPool);
}); });
@@ -134,9 +136,27 @@ public class OrmLiteSqlStorage implements IStorage {
} }
private <V, K> Dao<V, K> createDaoAndTable(ConnectionSource connPool, Class<V> c) throws SQLException { private <V, K> Dao<V, K> createDaoAndTable(ConnectionSource connPool, Class<V> c) throws SQLException {
return createDaoAndTable(connPool, c, false);
}
/**
* Workaround for https://github.com/j256/ormlite-core/issues/20.
*/
private <V, K> Dao<V, K> createDaoAndTable(ConnectionSource connPool, Class<V> c, boolean workaround) throws SQLException {
LOGGER.info("Create the dao: {}", c.getSimpleName()); LOGGER.info("Create the dao: {}", c.getSimpleName());
Dao<V, K> dao = DaoManager.createDao(connPool, c); Dao<V, K> dao = DaoManager.createDao(connPool, c);
TableUtils.createTableIfNotExists(connPool, c); if (workaround && StorageConfig.BackendEnum.postgresql.equals(backend)) {
LOGGER.info("Workaround for postgresql on dao: {}", c.getSimpleName());
try {
dao.countOf();
LOGGER.info("Table exists, do nothing");
} catch (SQLException e) {
LOGGER.info("Table doesn't exist, create");
TableUtils.createTableIfNotExists(connPool, c);
}
} else {
TableUtils.createTableIfNotExists(connPool, c);
}
return dao; return dao;
} }