Merge 4bb0aae8fc into 954aa4eea5

headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PrestoAdaptor.java

@@ -83,6 +83,7 @@ public class PrestoAdaptor extends BaseDbAdaptor {
 
     @Override
     public String rewriteSql(String sql) {
+        sql = sql.replaceAll("`", "\"");
         return sql;
     }
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java

@@ -157,8 +157,11 @@ public class ModelConverter {
             modelDetail.setQueryType(ModelDefineType.TABLE_QUERY.getName());
             modelDetail.setTableQuery(String.format("%s.%s", modelBuildReq.getDb(), tableName));
         }
+        List<Field> fields = new ArrayList<>();
         for (ColumnSchema columnSchema : modelSchema.getColumnSchemas()) {
             FieldType fieldType = columnSchema.getFiledType();
+            fields.add(new Field(columnSchema.getName(), columnSchema.getDataType()));
+
             if (getIdentifyType(fieldType) != null) {
                 Identify identify = new Identify(columnSchema.getName(),
                         getIdentifyType(fieldType).name(), columnSchema.getColumnName(), 1);
@@ -174,6 +177,7 @@ public class ModelConverter {
                 modelDetail.getDimensions().add(dim);
             }
         }
+        modelDetail.setFields(fields);
         modelReq.setModelDetail(modelDetail);
         return modelReq;
     }