|
|
@ -69,7 +69,9 @@ public class JpaDaoConfig { |
|
|
public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("dataSource") DataSource dataSource, |
|
|
public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("dataSource") DataSource dataSource, |
|
|
EntityManagerFactoryBuilder builder, |
|
|
EntityManagerFactoryBuilder builder, |
|
|
@Autowired(required = false) SqlTsLatestDaoConfig tsLatestDaoConfig, |
|
|
@Autowired(required = false) SqlTsLatestDaoConfig tsLatestDaoConfig, |
|
|
@Autowired(required = false) SqlTsDaoConfig tsDaoConfig) { |
|
|
@Autowired(required = false) SqlTsDaoConfig tsDaoConfig, |
|
|
|
|
|
@Autowired(required = false) TimescaleDaoConfig timescaleDaoConfig, |
|
|
|
|
|
@Autowired(required = false) TimescaleTsLatestDaoConfig timescaleTsLatestDaoConfig) { |
|
|
List<String> packages = new ArrayList<>(); |
|
|
List<String> packages = new ArrayList<>(); |
|
|
packages.add("org.thingsboard.server.dao.model.sql"); |
|
|
packages.add("org.thingsboard.server.dao.model.sql"); |
|
|
packages.add("org.thingsboard.server.dao.model.sqlts.dictionary"); |
|
|
packages.add("org.thingsboard.server.dao.model.sqlts.dictionary"); |
|
|
@ -79,6 +81,12 @@ public class JpaDaoConfig { |
|
|
if (tsDaoConfig != null) { |
|
|
if (tsDaoConfig != null) { |
|
|
packages.add("org.thingsboard.server.dao.model.sqlts.ts"); |
|
|
packages.add("org.thingsboard.server.dao.model.sqlts.ts"); |
|
|
} |
|
|
} |
|
|
|
|
|
if (timescaleDaoConfig != null) { |
|
|
|
|
|
packages.add("org.thingsboard.server.dao.model.sqlts.timescale"); |
|
|
|
|
|
} |
|
|
|
|
|
if (timescaleTsLatestDaoConfig != null) { |
|
|
|
|
|
packages.add("org.thingsboard.server.dao.model.sqlts.latest"); |
|
|
|
|
|
} |
|
|
return builder |
|
|
return builder |
|
|
.dataSource(dataSource) |
|
|
.dataSource(dataSource) |
|
|
.packages(packages.toArray(String[]::new)) |
|
|
.packages(packages.toArray(String[]::new)) |
|
|
|