add: 新增easy-orm对clickhouse支持

pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hswebframework</groupId>
+    <artifactId>hsweb-incubator-easyorm-clickhouse</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <hsweb.framework.version>4.0.17-SNAPSHOT</hsweb.framework.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hswebframework.web</groupId>
+            <artifactId>hsweb-commons-crud</artifactId>
+            <version>${hsweb.framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <version>5.3.25</version>
+        </dependency>
+    </dependencies>
+
+</project>

src/main/java/org/hswebframework/ezorm/rdb/metadata/dialect/Dialect.java

@@ -0,0 +1,69 @@
+package org.hswebframework.ezorm.rdb.metadata.dialect;
+
+import org.hswebframework.ezorm.core.meta.Feature;
+import org.hswebframework.ezorm.core.utils.StringUtils;
+import org.hswebframework.ezorm.rdb.metadata.DataType;
+import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
+import org.hswebframework.ezorm.rdb.metadata.RDBFeatureType;
+import org.hswebframework.ezorm.rdb.metadata.dialect.DataTypeBuilder;
+import org.hswebframework.ezorm.rdb.supports.clickhouse.ClickhouseDialect;
+
+import java.sql.SQLType;
+import java.util.Optional;
+
+/**
+ * @author dengpengyu
+ * @date 2023/9/18 16:14
+ */
+public interface Dialect extends Feature {
+
+    @Override
+    default RDBFeatureType getType() {
+        return RDBFeatureType.dialect;
+    }
+
+    void addDataTypeBuilder(String typeId, DataTypeBuilder mapper);
+
+    String buildColumnDataType(RDBColumnMetadata columnMetaData);
+
+    String getQuoteStart();
+
+    String getQuoteEnd();
+
+    String clearQuote(String string);
+
+    boolean isColumnToUpperCase();
+
+    Optional<SQLType> convertSqlType(Class<?> type);
+
+    DataType convertDataType(String dataType);
+
+    default String quote(String keyword, boolean changeCase) {
+        if (keyword.startsWith(getQuoteStart()) && keyword.endsWith(getQuoteEnd())) {
+            return keyword;
+        }
+        return StringUtils.concat(
+                getQuoteStart(),
+                isColumnToUpperCase() && changeCase ? keyword.toUpperCase() : keyword,
+                getQuoteEnd()
+        );
+    }
+
+    default String quote(String keyword) {
+        return quote(keyword, true);
+    }
+
+    default String buildColumnFullName(String tableName, String columnName) {
+        if (columnName.contains(".")) {
+            return columnName;
+        }
+        if (StringUtils.isNullOrEmpty(tableName)) {
+            return StringUtils.concat(getQuoteStart(), isColumnToUpperCase() ? columnName.toUpperCase() : columnName, getQuoteEnd());
+        }
+        return StringUtils.concat(tableName, ".", getQuoteStart(), isColumnToUpperCase() ? columnName.toUpperCase() : columnName, getQuoteEnd());
+    }
+
+    ClickhouseDialect CLICKHOUSE = new ClickhouseDialect();
+
+}
+

hsweb-easy-orm/clickhouse/ClickhouseDialect.java → src/main/java/org/hswebframework/ezorm/rdb/supports/clickhouse/ClickhouseDialect.java

@@ -7,6 +7,7 @@
 
 import java.sql.Date;
 import java.sql.JDBCType;
+
 /**
  * @className ClickhouseDire
  * @Description TODO

hsweb-easy-orm/clickhouse/ClickhouseRestfulSqlExecutor.java → src/main/java/org/hswebframework/ezorm/rdb/supports/clickhouse/ClickhouseRestfulSqlExecutor.java

@@ -117,6 +117,11 @@ protected <E> Flux<E> convertQueryResult(JSONObject result, ResultWrapper<E, ?>
                 for (int i = 0; i < columns.size(); i++) {
                     String property = columns.get(i);
                     Object value = row.get(property);
+                    if ("total".equals(property)) {
+                        value = Long.valueOf(row.get(property).toString());
+                    } else {
+                        value = row.get(property);
+                    }
                     DefaultColumnWrapperContext<E> context = new DefaultColumnWrapperContext<>(i, property, value, rowInstance);
                     wrapper.wrapColumn(context);
                     rowInstance = context.getRowInstance();

hsweb-easy-orm/clickhouse/ClickhouseSchemaMetadata.java → src/main/java/org/hswebframework/ezorm/rdb/supports/clickhouse/ClickhouseSchemaMetadata.java

@@ -4,7 +4,7 @@
 import org.hswebframework.ezorm.rdb.metadata.RDBSchemaMetadata;
 import org.hswebframework.ezorm.rdb.metadata.RDBTableMetadata;
 import org.hswebframework.ezorm.rdb.operator.CompositeExceptionTranslation;
-import org.hswebframework.ezorm.rdb.operator.builder.fragments.update.DefaultUpdateSqlBuilder;
+
 import org.hswebframework.ezorm.rdb.supports.clickhouse.sqlBuilder.ClickhouseDeleteSqlBuilder;
 import org.hswebframework.ezorm.rdb.supports.clickhouse.sqlBuilder.ClickhouseUpdateSqlBuilder;
 import org.hswebframework.ezorm.rdb.supports.mysql.*;

hsweb-easy-orm/clickhouse/sqlBuilder/ClickhouseDeleteSqlBuilder.java → src/main/java/org/hswebframework/ezorm/rdb/supports/clickhouse/sqlBuilder/ClickhouseDeleteSqlBuilder.java

@@ -1,7 +1,6 @@
 package org.hswebframework.ezorm.rdb.supports.clickhouse.sqlBuilder;
 
 import lombok.AllArgsConstructor;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.hswebframework.ezorm.core.param.Term;
 import org.hswebframework.ezorm.rdb.executor.SqlRequest;
@@ -10,10 +9,8 @@
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.*;
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.delete.DeleteSqlBuilder;
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.term.ForeignKeyTermFragmentBuilder;
-
 import org.hswebframework.ezorm.rdb.operator.dml.delete.DeleteOperatorParameter;
 
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;

hsweb-easy-orm/clickhouse/sqlBuilder/ClickhouseUpdateSqlBuilder.java → src/main/java/org/hswebframework/ezorm/rdb/supports/clickhouse/sqlBuilder/ClickhouseUpdateSqlBuilder.java

@@ -24,6 +24,7 @@
 /**
  * @author dengpengyu
  */
+
 /**
  * @className ClickhouseUpdateSqlBuilder
  * @Description TODO

hsweb-commons-crud/ClickhouseHttpSqlExecutorConfiguration.java → src/main/java/org/hswebframework/web/crud/configuration/ClickhouseHttpSqlExecutorConfiguration.java

@@ -3,6 +3,7 @@
 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;

hsweb-commons-crud/ClickhouseProperties.java → src/main/java/org/hswebframework/web/crud/configuration/ClickhouseProperties.java

@@ -1,18 +1,18 @@
 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
+ * @date 2023/9/13 15:29
  */
 @Data
 @ConfigurationProperties(prefix = "spring.clickhouse")
 @Component
-public class ClickhouseProperties {
+public class
+ClickhouseProperties {
 
     private String url;
 

hsweb-commons-crud/EasyormProperties.java → src/main/java/org/hswebframework/web/crud/configuration/EasyormProperties.java

@@ -7,12 +7,8 @@
 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.ClickhouseDialect;
 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;
-import org.hswebframework.ezorm.rdb.supports.oracle.OracleSchemaMetadata;
-import org.hswebframework.ezorm.rdb.supports.postgres.PostgresqlSchemaMetadata;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.util.Arrays;
@@ -23,7 +19,7 @@
 @Data
 public class EasyormProperties {
 
-    private String defaultSchema="PUBLIC";
+    private String defaultSchema = "PUBLIC";
 
     private String[] schemas = {};
 
@@ -33,7 +29,7 @@ public class EasyormProperties {
 
     private boolean allowTypeAlter = true;
 
-    private DialectEnum dialect = DialectEnum.h2;
+    private DialectEnum dialect = DialectEnum.clickhouse;
 
     private Class<? extends Dialect> dialectType;
 
@@ -76,43 +72,12 @@ public Dialect createDialect() {
     @Getter
     @AllArgsConstructor
     public enum DialectEnum {
-        mysql(Dialect.MYSQL, "?") {
-            @Override
-            public RDBSchemaMetadata createSchema(String name) {
-                return new MysqlSchemaMetadata(name);
-            }
-        },
-        mssql(Dialect.MSSQL, "@arg") {
-            @Override
-            public RDBSchemaMetadata createSchema(String name) {
-                return new SqlServerSchemaMetadata(name);
-            }
-        },
-        oracle(Dialect.ORACLE, "?") {
-            @Override
-            public RDBSchemaMetadata createSchema(String name) {
-                return new OracleSchemaMetadata(name);
-            }
-        },
-        postgres(Dialect.POSTGRES, "$") {
-            @Override
-            public RDBSchemaMetadata createSchema(String name) {
-                return new PostgresqlSchemaMetadata(name);
-            }
-        },
-        h2(Dialect.H2, "$") {
-            @Override
-            public RDBSchemaMetadata createSchema(String name) {
-                return new H2SchemaMetadata(name);
-            }
-        },
-        clickhouse(Dialect.CLICKHOUSE,"?"){
+        clickhouse(Dialect.CLICKHOUSE, "?") {
             @Override
             public RDBSchemaMetadata createSchema(String name) {
                 return new ClickhouseSchemaMetadata(name);
             }
-        }
-        ;
+        };
 
         private Dialect dialect;
         private String bindSymbol;

src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.hswebframework.web.crud.configuration.ClickhouseHttpSqlExecutorConfiguration