add column comment when create clickhouse table

ClickHouse · Aug 4, 2022 · eb33863 · eb33863
1 parent 828c0b0
commit eb33863
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spark-3.2/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala b/spark-3.2/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala
@@ -99,11 +99,11 @@ object SchemaUtils {
     StructType(structFields)
   }
 
-  def toClickHouseSchema(catalystSchema: StructType): Seq[(String, String)] =
+  def toClickHouseSchema(catalystSchema: StructType): Seq[(String, String, String)] =
     catalystSchema.fields
       .map { field =>
         val chType = toClickHouseType(field.dataType)
-        (field.name, maybeNullable(chType, field.nullable))
+        (field.name, maybeNullable(chType, field.nullable), field.getComment().map(s" COMMENT " + _).getOrElse(""))
       }
 
   private[clickhouse] def maybeNullable(chType: String, nullable: Boolean): String =

diff --git a/spark-3.2/clickhouse-spark/src/main/scala/xenon/clickhouse/ClickHouseCatalog.scala b/spark-3.2/clickhouse-spark/src/main/scala/xenon/clickhouse/ClickHouseCatalog.scala
@@ -208,7 +208,7 @@ class ClickHouseCatalog extends TableCatalog
 
     val fieldsClause = SchemaUtils
       .toClickHouseSchema(schema)
-      .map { case (fieldName, ckType) => s"${quoted(fieldName)} $ckType" }
+      .map { case (fieldName, ckType, comment) => s"${quoted(fieldName)} $ckType$comment" }
       .mkString(",\n ")
 
     val clusterOpt = props.get("cluster")