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

Author: zhou-hao

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

@@ -23,6 +23,12 @@
 
 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 @@ private SqlRequest createCreateRetentionPolicySQL(RDBTableMetadata table, Create
             + 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 @@ private SqlRequest createCreateHypertableSQL(RDBTableMetadata table, CreateHyper
             + 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()
         );

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

@@ -49,7 +49,7 @@ public String getBindSymbol() {
     @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