Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package org.hswebframework.web.crud.configuration;

import org.hswebframework.ezorm.rdb.executor.SyncSqlExecutor;
import org.hswebframework.ezorm.rdb.executor.reactive.ReactiveSqlExecutor;
import org.hswebframework.ezorm.rdb.executor.reactive.ReactiveSyncSqlExecutor;
import org.hswebframework.ezorm.rdb.supports.clickhouse.ClickhouseRestfulSqlExecutor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.reactive.function.client.WebClient;


/**
* @author dengpengyu
*/
@Configuration
@EnableConfigurationProperties(ClickhouseProperties.class)
//@ConditionalOnMissingBean(ConnectionFactory.class)
public class ClickhouseHttpSqlExecutorConfiguration {
@Bean
@ConditionalOnMissingBean
public ReactiveSqlExecutor reactiveSqlExecutor(ClickhouseProperties properties) {

WebClient clickhouseWebClient = WebClient
.builder()
.baseUrl(properties.getUrl())
.defaultHeader("X-ClickHouse-User", properties.getUsername())
.defaultHeader("X-ClickHouse-Key", properties.getPassword())
.build();

return new ClickhouseRestfulSqlExecutor(clickhouseWebClient);
}

@Bean
@ConditionalOnMissingBean
public SyncSqlExecutor syncSqlExecutor(ReactiveSqlExecutor reactiveSqlExecutor) {
return ReactiveSyncSqlExecutor.of(reactiveSqlExecutor);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.hswebframework.web.crud.configuration;


import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

/**
* @author dengpengyu
* @date 2023/9/6 14:08
*/
@Data
@ConfigurationProperties(prefix = "spring.clickhouse")
@Component
public class ClickhouseProperties {

private String url;

private String username;

private String password;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.hswebframework.ezorm.rdb.metadata.RDBDatabaseMetadata;
import org.hswebframework.ezorm.rdb.metadata.RDBSchemaMetadata;
import org.hswebframework.ezorm.rdb.metadata.dialect.Dialect;
import org.hswebframework.ezorm.rdb.supports.clickhouse.ClickhouseSchemaMetadata;
import org.hswebframework.ezorm.rdb.supports.h2.H2SchemaMetadata;
import org.hswebframework.ezorm.rdb.supports.mssql.SqlServerSchemaMetadata;
import org.hswebframework.ezorm.rdb.supports.mysql.MysqlSchemaMetadata;
Expand Down Expand Up @@ -105,6 +106,12 @@ public RDBSchemaMetadata createSchema(String name) {
return new H2SchemaMetadata(name);
}
},
clickhouse(Dialect.clickhouse,"?"){
@Override
public RDBSchemaMetadata createSchema(String name) {
return new ClickhouseSchemaMetadata(name);
}
}
;

private Dialect dialect;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.hswebframework.web.crud.configuration.EasyormConfiguration,\
org.hswebframework.web.crud.configuration.JdbcSqlExecutorConfiguration,\
org.hswebframework.web.crud.configuration.R2dbcSqlExecutorConfiguration,\
org.hswebframework.web.crud.configuration.ClickhouseHttpSqlExecutorConfiguration,\
org.hswebframework.web.crud.web.CommonWebFluxConfiguration,\
org.hswebframework.web.crud.web.CommonWebMvcConfiguration