suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.10' into 2.10

This commit is contained in:
zhouhao 2025-09-11 09:31:13 +08:00
parent dcdba73994 960b940b5c
commit a7f5b03e6c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetlinks-components/timescaledb-component/src/main/java/org/jetlinks/community/timescaledb/metadata/TimescaleDBCreateTableSqlBuilder.java
View File

@ -23,6 +23,12 @@ import org.hswebframework.ezorm.rdb.operator.builder.fragments.ddl.CommonCreateT
public class TimescaleDBCreateTableSqlBuilder extends CommonCreateTableSqlBuilder {
private String schema;
public TimescaleDBCreateTableSqlBuilder(String schema) {
this.schema = schema;
}
@Override
public SqlRequest build(RDBTableMetadata table) {
DefaultBatchSqlRequest sqlRequest = (DefaultBatchSqlRequest) super.build(table);
@ -43,7 +49,7 @@ public class TimescaleDBCreateTableSqlBuilder extends CommonCreateTableSqlBuilde
+ createHypertable.getInterval().getUnit().name().toLowerCase();
return SqlRequests.of(
"SELECT add_retention_policy( ? , INTERVAL '" + interval + "')",
"SELECT "+ schema +".add_retention_policy( ? , INTERVAL '" + interval + "')",
table.getFullName()
);
}
@ -54,7 +60,7 @@ public class TimescaleDBCreateTableSqlBuilder extends CommonCreateTableSqlBuilde
+ createHypertable.getChunkTimeInterval().getUnit().name().toLowerCase();
return SqlRequests.of(
"SELECT create_hypertable( ? , ? , chunk_time_interval => INTERVAL '" + interval + "')",
"SELECT "+ schema +".create_hypertable( ? , ? , chunk_time_interval => INTERVAL '" + interval + "')",
table.getFullName(),
table.getColumnNow(createHypertable.getColumn()).getName()
);

2
jetlinks-components/timescaledb-component/src/main/java/org/jetlinks/community/timescaledb/metadata/TimescaleDBDialectProvider.java
View File

@ -49,7 +49,7 @@ public class TimescaleDBDialectProvider implements DialectProvider {
@Override
public RDBSchemaMetadata createSchema(String name) {
PostgresqlSchemaMetadata schema = new PostgresqlSchemaMetadata(name);
schema.addFeature(new TimescaleDBCreateTableSqlBuilder());
schema.addFeature(new TimescaleDBCreateTableSqlBuilder(name));
schema.addFeature(new TimescaleDBAlterTableSqlBuilder());
DefaultValueCodecFactory codecFactory = new DefaultValueCodecFactory();
codecFactory