From 254c1259c14ba2e4fd943290783b25a2c37eca02 Mon Sep 17 00:00:00 2001
From: SwallowGG <1558143046@qq.com>
Date: Sun, 24 Sep 2023 14:38:04 +0800
Subject: [PATCH 1/3] update

---
 .../ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java     | 4 ++--
 .../java/ai/chat2db/plugin/mysql/type/MysqlIndexTypeEnum.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java
index e9f15e53c..eb7d16259 100644
--- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java
+++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java
@@ -56,9 +56,9 @@ public enum MysqlColumnTypeEnum implements ColumnBuilder {
     TIMESTAMP("TIMESTAMP", true, false, true, false, false, false, true, true, true),
     TIME("TIME", true, false, true, false, false, false, true, true, false),
     YEAR("YEAR", false, false, true, false, false, false, true, true, false),
-    CHAR("CHAR", true, false, true, false, false, true, true, true, false),
+    CHAR("CHAR", true, false, true, false, true, true, true, true, false),
 
-    VARCHAR("VARCHAR", true, false, true, false, false, true, true, true, false),
+    VARCHAR("VARCHAR", true, false, true, false, true, true, true, true, false),
 
     BINARY("BINARY", true, false, true, false, false, false, true, true, false),
 
diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlIndexTypeEnum.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlIndexTypeEnum.java
index 530786e46..c8674010d 100644
--- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlIndexTypeEnum.java
+++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlIndexTypeEnum.java
@@ -38,7 +38,7 @@ public String getKeyword() {
 
     public static MysqlIndexTypeEnum getByType(String type) {
         for (MysqlIndexTypeEnum value : MysqlIndexTypeEnum.values()) {
-            if (value.name.equals(type)) {
+            if (value.name.equalsIgnoreCase(type)) {
                 return value;
             }
         }

From d45354a47d363f590a6fd055e736739f020c0e6b Mon Sep 17 00:00:00 2001
From: shanhexi <wdbb8848@163.com>
Date: Sun, 24 Sep 2023 15:36:34 +0800
Subject: [PATCH 2/3] fix:The drop-down search box supports custom input

---
 .../DatabaseTableEditor/ColumnList/index.tsx  | 100 ++++++++------
 .../DatabaseTableEditor/IndexList/index.tsx   | 124 +++++++++---------
 .../src/components/CustomSelect/index.tsx     |  17 ++-
 chat2db-client/src/constants/editTable.ts     |  11 +-
 4 files changed, 141 insertions(+), 111 deletions(-)

diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
index e1db2def0..2ac3ec44e 100644
--- a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
+++ b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -1,4 +1,12 @@
-import React, { useContext, useEffect, useState, forwardRef, ForwardedRef, useImperativeHandle } from 'react';
+import React, {
+  useContext,
+  useEffect,
+  useState,
+  useCallback,
+  forwardRef,
+  ForwardedRef,
+  useImperativeHandle,
+} from 'react';
 import styles from './index.less';
 import { MenuOutlined } from '@ant-design/icons';
 import { DndContext, type DragEndEvent } from '@dnd-kit/core';
@@ -104,7 +112,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
   const { dataSourceId, databaseName, schemaName, tableDetails } = useContext(Context);
   const [dataSource, setDataSource] = useState<IColumnItemNew[]>([createInitialData()]);
   const [form] = Form.useForm();
-  const [editingKey, setEditingKey] = useState<string | null>(null);
+  const [editingData, setEditingData] = useState<IColumnItemNew | null>(null);
   const [editingConfig, setEditingConfig] = useState<IEditingConfig | null>(null);
   const [databaseSupportField, setDatabaseSupportField] = useState<{
     columnTypes: IColumnTypesOption[];
@@ -116,20 +124,24 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
     collations: [],
   });
 
-  const isEditing = (record: IColumnItemNew) => record.key === editingKey;
+  const isEditing = (record: IColumnItemNew) => record.key === editingData?.key;
 
   const edit = (record: IColumnItemNew) => {
     if (record.key) {
       form.setFieldsValue({ ...record });
-      setEditingKey(record.key);
-
+      setEditingData(record);
       // 根据当前字段类型，设置编辑配置
+      console.log(databaseSupportField.columnTypes, record.columnType);
       databaseSupportField.columnTypes.forEach((i) => {
         if (i.typeName === record.columnType) {
           setEditingConfig({
             ...i,
             editKey: record.key!,
           });
+          console.log({
+            ...i,
+            editKey: record.key!,
+          });
         }
       });
     }
@@ -197,19 +209,19 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
       width: '40px',
       align: 'center',
     },
-    {
-      title: 'O T',
-      dataIndex: 'editStatus',
-      width: '60px',
-      align: 'center',
-      render: (text: EditColumnOperationType) => {
-        return text === EditColumnOperationType.Add ? (
-          <span style={{ color: '#52c41a' }}>新</span>
-        ) : (
-          <span style={{ color: '#f5222d' }}>原</span>
-        );
-      },
-    },
+    // {
+    //   title: 'O T',
+    //   dataIndex: 'editStatus',
+    //   width: '60px',
+    //   align: 'center',
+    //   render: (text: EditColumnOperationType) => {
+    //     return text === EditColumnOperationType.Add ? (
+    //       <span style={{ color: '#52c41a' }}>新</span>
+    //     ) : (
+    //       <span style={{ color: '#f5222d' }}>原</span>
+    //     );
+    //   },
+    // },
     {
       title: i18n('editTable.label.columnName'),
       dataIndex: 'name',
@@ -221,9 +233,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <Input />
           </Form.Item>
         ) : (
-          <div className={styles.editableCell} onClick={() => edit(record)}>
-            {text}
-          </div>
+          <div className={styles.editableCell}>{text}</div>
         );
       },
     },
@@ -240,7 +250,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
                 <Select showSearch options={databaseSupportField.columnTypes} />
               </Form.Item>
             ) : (
-              <div style={{ maxWidth: '184px' }} className={styles.editableCell} onClick={() => edit(record)}>
+              <div style={{ maxWidth: '184px' }} className={styles.editableCell}>
                 {text}
               </div>
             )}
@@ -259,9 +269,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <InputNumber disabled={!editingConfig?.supportLength} />
           </Form.Item>
         ) : (
-          <div className={styles.editableCell} onClick={() => edit(record)}>
-            {text}
-          </div>
+          <div className={styles.editableCell}>{text}</div>
         );
       },
     },
@@ -276,7 +284,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <Checkbox checked={nullable === 1} disabled={!editingConfig?.supportNullable} />
           </Form.Item>
         ) : (
-          <div onClick={() => edit(record)}>
+          <div>
             <Checkbox checked={nullable === 1} />
           </div>
         );
@@ -292,9 +300,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <Input disabled={!editingConfig?.supportComments} />
           </Form.Item>
         ) : (
-          <div className={styles.editableCell} onClick={() => edit(record)}>
-            {text}
-          </div>
+          <div className={styles.editableCell}>{text}</div>
         );
       },
     },
@@ -319,7 +325,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
     }
 
     const newData = dataSource.map((item) => {
-      if (item.key === editingKey) {
+      if (item.key === editingData?.key) {
         // 判断当前数据是新增的数据还是编辑后的数据
         let editStatus = item.editStatus;
         if (editStatus !== EditColumnOperationType.Add) {
@@ -345,7 +351,6 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
       return item;
     });
     setDataSource(newData);
-    console.log(field);
   };
 
   const addData = () => {
@@ -357,10 +362,13 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
   };
 
   const deleteData = () => {
-    setDataSource(
-      dataSource.map((i) => {
-        if (i.key === editingKey) {
-          setEditingKey(null);
+    let list: any = [];
+    if (editingData?.editStatus === EditColumnOperationType.Add) {
+      list = dataSource.filter((i) => i.key !== editingData?.key);
+    } else {
+      list = dataSource.map((i) => {
+        if (i.key === editingData?.key) {
+          setEditingData(null);
           setEditingConfig(null);
           return {
             ...i,
@@ -368,12 +376,13 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
           };
         }
         return i;
-      }),
-    );
+      });
+    }
+    setDataSource(list);
   };
 
   const moveData = (action: 'up' | 'down') => {
-    const index = dataSource.findIndex((i) => i.key === editingKey);
+    const index = dataSource.findIndex((i) => i.key === editingData?.key);
     if (index === -1) {
       return;
     }
@@ -425,8 +434,8 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
             <CustomSelect
               options={[
                 {
-                  label: 'EMPTY STRING',
-                  value: 'EMPTY STRING',
+                  label: 'EMPTY_STRING',
+                  value: 'EMPTY_STRING',
                 },
                 {
                   label: 'NULL',
@@ -455,6 +464,16 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
     );
   };
 
+  const onRow = (record: any) => {
+    return {
+      onClick: () => {
+        if (editingData?.key !== record.key) {
+          edit(record);
+        }
+      },
+    };
+  };
+
   return (
     <div className={styles.columnList}>
       <div className={styles.columnListHeader}>
@@ -473,6 +492,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
                     row: Row,
                   },
                 }}
+                onRow={onRow}
                 pagination={false}
                 rowKey="key"
                 columns={columns as any}
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
index 24b87c1cf..bba39e8e7 100644
--- a/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
+++ b/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
@@ -7,6 +7,7 @@ import React, {
   useRef,
   useMemo,
   useEffect,
+  useCallback,
 } from 'react';
 import styles from './index.less';
 import classnames from 'classnames';
@@ -49,20 +50,49 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
   'data-row-key': string;
 }
 
+const Row = ({ children, ...props }: RowProps) => {
+  const { attributes, listeners, setNodeRef, setActivatorNodeRef, transform, transition, isDragging } = useSortable({
+    id: props['data-row-key'],
+  });
+
+  const style: React.CSSProperties = {
+    ...props.style,
+    transform: CSS.Transform.toString(transform && { ...transform, scaleY: 1 }),
+    transition,
+    ...(isDragging ? { position: 'relative', zIndex: 9999 } : {}),
+  };
+
+  return (
+    <tr {...props} ref={setNodeRef} style={style} {...attributes}>
+      {React.Children.map(children, (child) => {
+        if ((child as React.ReactElement).key === 'sort') {
+          return React.cloneElement(child as React.ReactElement, {
+            children: (
+              <MenuOutlined ref={setActivatorNodeRef} style={{ touchAction: 'none', cursor: 'move' }} {...listeners} />
+            ),
+          });
+        }
+        return child;
+      })}
+    </tr>
+  );
+};
+
 const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) => {
   const { tableDetails } = useContext(Context);
   const [dataSource, setDataSource] = useState<IIndexItem[]>([createInitialData()]);
   const [form] = Form.useForm();
-  const [editingKey, setEditingKey] = useState<string | null>(null);
+  const [editingData, setEditingData] = useState<IIndexItem | null>(null);
   const [includeColModalOpen, setIncludeColModalOpen] = useState(false);
   const includeColRef = useRef<IIncludeColRef>(null);
 
-  const isEditing = (record: IIndexItem) => record.key === editingKey;
+  const isEditing = (record: IIndexItem) => record.key === editingData?.key;
 
   const edit = (record: IIndexItem) => {
-    console.log(record);
     form.setFieldsValue({ ...record });
-    setEditingKey(record.key || null);
+    if (record.key !== editingData?.key) {
+      setEditingData(record || null);
+    }
   };
 
   useEffect(() => {
@@ -83,11 +113,11 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
   };
 
   const deleteData = () => {
-    setDataSource(dataSource.filter((i) => i.key !== editingKey));
+    setDataSource(dataSource.filter((i) => i.key !== editingData?.key));
     setDataSource(
       dataSource.map((i) => {
-        if (i.key === editingKey) {
-          setEditingKey(null);
+        if (i.key === editingData?.key) {
+          setEditingData(null);
           // setEditingConfig(null);
           return {
             ...i,
@@ -107,7 +137,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
       value = value ? 1 : 0;
     }
     const newData = dataSource.map((item) => {
-      if (item.key === editingKey) {
+      if (item.key === editingData?.key) {
         let editStatus = item.editStatus;
         if (editStatus !== EditColumnOperationType.Add) {
           editStatus = EditColumnOperationType.Modify;
@@ -133,38 +163,6 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
     }
   };
 
-  const Row = ({ children, ...rowProps }: RowProps) => {
-    const { attributes, listeners, setNodeRef, setActivatorNodeRef, transform, transition, isDragging } = useSortable({
-      id: rowProps['data-row-key'],
-    });
-
-    const style: React.CSSProperties = {
-      ...rowProps.style,
-      transform: CSS.Transform.toString(transform && { ...transform, scaleY: 1 }),
-      transition,
-      ...(isDragging ? { position: 'relative', zIndex: 9999 } : {}),
-    };
-
-    return (
-      <tr {...props} ref={setNodeRef} style={style} {...attributes}>
-        {React.Children.map(children, (child) => {
-          if ((child as React.ReactElement).key === 'sort') {
-            return React.cloneElement(child as React.ReactElement, {
-              children: (
-                <MenuOutlined
-                  ref={setActivatorNodeRef}
-                  style={{ touchAction: 'none', cursor: 'move' }}
-                  {...listeners}
-                />
-              ),
-            });
-          }
-          return child;
-        })}
-      </tr>
-    );
-  };
-
   function getIndexListInfo(): IIndexListInfo {
     return dataSource.map((i) => {
       return lodash.omit(i, 'key');
@@ -181,14 +179,14 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
       width: '40px',
       align: 'center',
     },
-    {
-      title: i18n('editTable.label.index'),
-      width: '70px',
-      align: 'center',
-      render: (text: string, record: IIndexItem) => {
-        return dataSource.findIndex((i) => i.key === record.key) + 1;
-      },
-    },
+    // {
+    //   title: i18n('editTable.label.index'),
+    //   width: '70px',
+    //   align: 'center',
+    //   render: (text: string, record: IIndexItem) => {
+    //     return dataSource.findIndex((i) => i.key === record.key) + 1;
+    //   },
+    // },
     {
       title: i18n('editTable.label.indexName'),
       dataIndex: 'name',
@@ -200,9 +198,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
             <Input />
           </Form.Item>
         ) : (
-          <div className={styles.editableCell} onClick={() => edit(record)}>
-            {text}
-          </div>
+          <div className={styles.editableCell}>{text}</div>
         );
       },
     },
@@ -223,9 +219,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
             </Select>
           </Form.Item>
         ) : (
-          <div className={styles.editableCell} onClick={() => edit(record)}>
-            {text}
-          </div>
+          <div className={styles.editableCell}>{text}</div>
         );
       },
     },
@@ -251,9 +245,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
             {text}
           </div>
         ) : (
-          <div className={styles.editableCell} onClick={() => edit(record)}>
-            {text}
-          </div>
+          <div className={styles.editableCell}>{text}</div>
         );
       },
     },
@@ -279,8 +271,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
     setDataSource(
       dataSource.map((i) => {
         const columnList = includeColRef.current?.getIncludeColInfo();
-        console.log(columnList);
-        if (i.key === editingKey && columnList) {
+        if (i.key === editingData?.key && columnList) {
           i.columnList = columnList;
         }
         return i;
@@ -290,15 +281,25 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
     setIncludeColModalOpen(false);
   };
 
+  const onRow = (record: any) => {
+    return {
+      onClick: () => {
+        if (editingData?.key !== record.key) {
+          edit(record);
+        }
+      },
+    };
+  };
+
   const indexIncludedColumnList: IIndexIncludeColumnItem[] = useMemo(() => {
     let list: IIndexIncludeColumnItem[] = [];
     dataSource.forEach((i) => {
-      if (i.key === editingKey) {
+      if (i.key === editingData?.key) {
         list = i.columnList || [];
       }
     });
     return list;
-  }, [editingKey]);
+  }, [editingData?.key]);
 
   return (
     <div className={classnames(styles.indexList)}>
@@ -318,6 +319,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
                     row: Row,
                   },
                 }}
+                onRow={onRow}
                 pagination={false}
                 rowKey="key"
                 columns={columns as any}
diff --git a/chat2db-client/src/components/CustomSelect/index.tsx b/chat2db-client/src/components/CustomSelect/index.tsx
index 5e8e2dba1..4363e1095 100644
--- a/chat2db-client/src/components/CustomSelect/index.tsx
+++ b/chat2db-client/src/components/CustomSelect/index.tsx
@@ -16,7 +16,8 @@ interface IProps {
 const CustomSelect = memo<IProps>((props: IProps) => {
   const { options, onChange, value } = props;
   const [customOptions, setCustomOptions] = useState<IOption[]>([]);
-  const [customValue, setCustomValue] = useState<string>();
+  const [customValue, setCustomValue] = useState<string>('');
+  const [curSearch, setCurSearch] = useState<string | null>(null);
 
   useEffect(() => {
     setCustomOptions([...options, { label: '', value: null }]);
@@ -40,22 +41,30 @@ const CustomSelect = memo<IProps>((props: IProps) => {
   };
 
   const onSearch = (v: string) => {
-    customOptions[customOptions.length - 1].label = v;
-    customOptions[customOptions.length - 1].value = v;
-    setCustomOptions([...customOptions]);
+    setCurSearch(v);
   };
   const customChange = (v: string) => {
+    setCurSearch(null);
     setCustomValue(v);
     onChange?.(v);
   };
+  const onBlur = () => {
+    if (curSearch) {
+      onChange?.(curSearch);
+    }
+    setCurSearch(null);
+  };
+
   return (
     <Select
+      onBlur={onBlur}
       allowClear
       onChange={customChange}
       value={customValue}
       showSearch
       onSearch={onSearch}
       options={filtrationCustomOptions(customOptions)}
+      notFoundContent={false}
     />
   );
 });
diff --git a/chat2db-client/src/constants/editTable.ts b/chat2db-client/src/constants/editTable.ts
index 78fd3b39a..3db8bc639 100644
--- a/chat2db-client/src/constants/editTable.ts
+++ b/chat2db-client/src/constants/editTable.ts
@@ -1,12 +1,11 @@
 // 索引类型
 export enum IndexesType {
-  NormPRIMARY_KEYal = 'PRIMARY_KEY',
-  NORMAL = 'NORMAL',
-  UNIQUE = 'UNIQUE',
-  FULLTEXT = 'FULLTEXT',
-  SPATIAL = 'SPATIAL',
+  Primary = 'Primary',
+  Normal = 'Normal',
+  Unique = 'Unique',
+  Fulltext = 'Fulltext',
+  Spatial = 'Spatial',
 }
-
 export enum EditColumnOperationType { 
   // 新增
   Add = 'ADD',

From 3e9868e3f4e34b684daed0b27361b0266546b994 Mon Sep 17 00:00:00 2001
From: SwallowGG <1558143046@qq.com>
Date: Sun, 24 Sep 2023 15:42:49 +0800
Subject: [PATCH 3/3] update

---
 .../chat2db/plugin/mysql/MysqlMetaData.java   |  23 ++--
 .../mysql/type/MysqlColumnTypeEnum.java       | 126 ++++++++++--------
 .../java/ai/chat2db/spi/model/ColumnType.java |   2 +
 .../ai/chat2db/spi/model/TableColumn.java     |   3 +
 4 files changed, 90 insertions(+), 64 deletions(-)

diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java
index b1fb55d01..35e469950 100644
--- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java
+++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/MysqlMetaData.java
@@ -157,20 +157,23 @@ private void setColumnSize(TableColumn column,String columnType){
         try {
             if (columnType.contains("(")) {
                 String size = columnType.substring(columnType.indexOf("(") + 1, columnType.indexOf(")"));
-                if (size.contains(",")) {
-                    String[] sizes = size.split(",");
-                    if (StringUtils.isNotBlank(sizes[0])) {
-                        column.setColumnSize(Integer.parseInt(sizes[0]));
-                    }
-                    if (StringUtils.isNotBlank(sizes[1])) {
-                        column.setDecimalDigits(Integer.parseInt(sizes[1]));
+                if("SET".equalsIgnoreCase(column.getColumnType())|| "ENUM".equalsIgnoreCase(column.getColumnType())){
+                    column.setValue(size);
+                }else {
+                    if (size.contains(",")) {
+                        String[] sizes = size.split(",");
+                        if (StringUtils.isNotBlank(sizes[0])) {
+                            column.setColumnSize(Integer.parseInt(sizes[0]));
+                        }
+                        if (StringUtils.isNotBlank(sizes[1])) {
+                            column.setDecimalDigits(Integer.parseInt(sizes[1]));
+                        }
+                    } else {
+                        column.setColumnSize(Integer.parseInt(size));
                     }
-                } else {
-                    column.setColumnSize(Integer.parseInt(size));
                 }
             }
         }catch (Exception e){
-
         }
     }
 
diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java
index eb7d16259..08c443418 100644
--- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java
+++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java
@@ -13,105 +13,105 @@
 
 public enum MysqlColumnTypeEnum implements ColumnBuilder {
 
-    BIT("BIT", true, false, true, false, false, false, true, true, false),
+    BIT("BIT", true, false, true, false, false, false, true, true, false, false),
 
-    TINYINT("TINYINT", false, false, true, true, false, false, true, true, false),
+    TINYINT("TINYINT", false, false, true, true, false, false, true, true, false, false),
 
-    TINYINT_UNSIGNED("TINYINT UNSIGNED", false, false, true, true, false, false, true, true, false),
+    TINYINT_UNSIGNED("TINYINT UNSIGNED", false, false, true, true, false, false, true, true, false, false),
 
-    SMALLINT("SMALLINT", false, false, true, true, false, false, true, true, false),
+    SMALLINT("SMALLINT", false, false, true, true, false, false, true, true, false, false),
 
-    SMALLINT_UNSIGNED("SMALLINT UNSIGNED", false, false, true, true, false, false, true, true, false),
+    SMALLINT_UNSIGNED("SMALLINT UNSIGNED", false, false, true, true, false, false, true, true, false, false),
 
-    MEDIUMINT("MEDIUMINT", false, false, true, true, false, false, true, true, false),
+    MEDIUMINT("MEDIUMINT", false, false, true, true, false, false, true, true, false, false),
 
-    MEDIUMINT_UNSIGNED("MEDIUMINT UNSIGNED", false, false, true, true, false, false, true, true, false),
+    MEDIUMINT_UNSIGNED("MEDIUMINT UNSIGNED", false, false, true, true, false, false, true, true, false, false),
 
-    INT("INT", false, false, true, true, false, false, true, true, false),
+    INT("INT", false, false, true, true, false, false, true, true, false, false),
 
 
-    INT_UNSIGNED("INT UNSIGNED", false, false, true, true, false, false, true, true, false),
+    INT_UNSIGNED("INT UNSIGNED", false, false, true, true, false, false, true, true, false, false),
 
-    BIGINT("BIGINT", false, false, true, true, false, false, true, true, false),
+    BIGINT("BIGINT", false, false, true, true, false, false, true, true, false, false),
 
 
-    BIGINT_UNSIGNED("BIGINT UNSIGNED", false, false, true, true, false, false, true, true, false),
+    BIGINT_UNSIGNED("BIGINT UNSIGNED", false, false, true, true, false, false, true, true, false, false),
 
 
-    DECIMAL("DECIMAL", true, true, true, false, false, false, true, true, false),
+    DECIMAL("DECIMAL", true, true, true, false, false, false, true, true, false, false),
 
-    DECIMAL_UNSIGNED("DECIMAL UNSIGNED", true, true, true, false, false, false, true, true, false),
+    DECIMAL_UNSIGNED("DECIMAL UNSIGNED", true, true, true, false, false, false, true, true, false, false),
 
 
-    FLOAT("FLOAT", true, true, true, false, false, false, true, true, false),
+    FLOAT("FLOAT", true, true, true, false, false, false, true, true, false, false),
 
-    FLOAT_UNSIGNED("FLOAT UNSIGNED", true, true, true, false, false, false, true, true, false),
+    FLOAT_UNSIGNED("FLOAT UNSIGNED", true, true, true, false, false, false, true, true, false, false),
 
-    DOUBLE("DOUBLE", true, true, true, false, false, false, true, true, false),
+    DOUBLE("DOUBLE", true, true, true, false, false, false, true, true, false, false),
 
-    DOUBLE_UNSIGNED("DOUBLE UNSIGNED", true, true, true, false, false, false, true, true, false),
-    DATE("DATE", false, false, true, false, false, false, true, true, false),
-    DATETIME("DATETIME", true, false, true, false, false, false, true, true, true),
+    DOUBLE_UNSIGNED("DOUBLE UNSIGNED", true, true, true, false, false, false, true, true, false, false),
+    DATE("DATE", false, false, true, false, false, false, true, true, false, false),
+    DATETIME("DATETIME", true, false, true, false, false, false, true, true, true, false),
 
-    TIMESTAMP("TIMESTAMP", true, false, true, false, false, false, true, true, true),
-    TIME("TIME", true, false, true, false, false, false, true, true, false),
-    YEAR("YEAR", false, false, true, false, false, false, true, true, false),
-    CHAR("CHAR", true, false, true, false, true, true, true, true, false),
+    TIMESTAMP("TIMESTAMP", true, false, true, false, false, false, true, true, true, false),
+    TIME("TIME", true, false, true, false, false, false, true, true, false, false),
+    YEAR("YEAR", false, false, true, false, false, false, true, true, false, false),
+    CHAR("CHAR", true, false, true, false, true, true, true, true, false, false),
 
-    VARCHAR("VARCHAR", true, false, true, false, true, true, true, true, false),
+    VARCHAR("VARCHAR", true, false, true, false, true, true, true, true, false, false),
 
-    BINARY("BINARY", true, false, true, false, false, false, true, true, false),
+    BINARY("BINARY", true, false, true, false, false, false, true, true, false, false),
 
-    VARBINARY("VARBINARY", true, false, true, false, false, false, true, true, false),
+    VARBINARY("VARBINARY", true, false, true, false, false, false, true, true, false, false),
 
-    TINYBLOB("TINYBLOB", false, false, true, false, false, false, true, false, false),
+    TINYBLOB("TINYBLOB", false, false, true, false, false, false, true, false, false, false),
 
-    BLOB("BLOB", false, false, true, false, false, false, true, false, false),
+    BLOB("BLOB", false, false, true, false, false, false, true, false, false, false),
 
-    MEDIUMBLOB("MEDIUMBLOB", false, false, true, false, false, false, true, false, false),
+    MEDIUMBLOB("MEDIUMBLOB", false, false, true, false, false, false, true, false, false, false),
 
-    LONGBLOB("LONGBLOB", false, false, true, false, false, false, true, false, false),
+    LONGBLOB("LONGBLOB", false, false, true, false, false, false, true, false, false, false),
 
-    TINYTEXT("TINYTEXT", false, false, true, false, false, true, true, false, false),
+    TINYTEXT("TINYTEXT", false, false, true, false, false, true, true, false, false, false),
 
-    TEXT("TEXT", false, false, true, false, false, true, true, false, false),
+    TEXT("TEXT", false, false, true, false, false, true, true, false, false, false),
 
-    MEDIUMTEXT("MEDIUMTEXT", false, false, true, false, false, true, true, false, false),
+    MEDIUMTEXT("MEDIUMTEXT", false, false, true, false, false, true, true, false, false, false),
 
-    LONGTEXT("LONGTEXT", false, false, true, false, false, true, true, false, false),
+    LONGTEXT("LONGTEXT", false, false, true, false, false, true, true, false, false, false),
 
 
-    ENUM("ENUM", false, false, true, false, false, true, true, true, true),
+    ENUM("ENUM", false, false, true, false, false, true, true, true, true, true),
 
 
-    BOOL("BOOL", false, false, true, true, false, false, true, true, false),
+    BOOL("BOOL", false, false, true, true, false, false, true, true, false, false),
 
-    INTEGER("INTEGER", false, false, true, true, false, false, true, true, false),
+    INTEGER("INTEGER", false, false, true, true, false, false, true, true, false, false),
 
-    INTEGER_UNSIGNED("INTEGER UNSIGNED", false, false, true, true, false, false, true, true, false),
+    INTEGER_UNSIGNED("INTEGER UNSIGNED", false, false, true, true, false, false, true, true, false, false),
 
-    REAL("REAL", true, true, true, false, false, false, true, true, false),
+    REAL("REAL", true, true, true, false, false, false, true, true, false, false),
 
-    SET("SET", false, false, true, false, false, true, true, true, true),
+    SET("SET", false, false, true, false, false, true, true, true, true, true),
 
 
-    GEOMETRY("GEOMETRY", false, false, true, false, false, false, true, false, false),
+    GEOMETRY("GEOMETRY", false, false, true, false, false, false, true, false, false, false),
 
-    POINT("POINT", false, false, true, false, false, false, true, false, false),
+    POINT("POINT", false, false, true, false, false, false, true, false, false, false),
 
-    LINESTRING("LINESTRING", false, false, true, false, false, false, true, false, false),
+    LINESTRING("LINESTRING", false, false, true, false, false, false, true, false, false, false),
 
-    POLYGON("POLYGON", false, false, true, false, false, false, true, false, false),
+    POLYGON("POLYGON", false, false, true, false, false, false, true, false, false, false),
 
-    MULTIPOINT("MULTIPOINT", false, false, true, false, false, false, true, false, false),
+    MULTIPOINT("MULTIPOINT", false, false, true, false, false, false, true, false, false, false),
 
-    MULTILINESTRING("MULTILINESTRING", false, false, true, false, false, false, true, false, false),
+    MULTILINESTRING("MULTILINESTRING", false, false, true, false, false, false, true, false, false, false),
 
-    MULTIPOLYGON("MULTIPOLYGON", false, false, true, false, false, false, true, false, false),
+    MULTIPOLYGON("MULTIPOLYGON", false, false, true, false, false, false, true, false, false, false),
 
-    GEOMETRYCOLLECTION("GEOMETRYCOLLECTION", false, false, true, false, false, false, true, false, false),
+    GEOMETRYCOLLECTION("GEOMETRYCOLLECTION", false, false, true, false, false, false, true, false, false, false),
 
-    JSON("JSON", false, false, true, false, false, false, true, false, false);
+    JSON("JSON", false, false, true, false, false, false, true, false, false, false);
 
     private ColumnType columnType;
 
@@ -124,8 +124,8 @@ public ColumnType getColumnType() {
     }
 
 
-    MysqlColumnTypeEnum(String dataTypeName, boolean supportLength, boolean supportScale, boolean supportNullable, boolean supportAutoIncrement, boolean supportCharset, boolean supportCollation, boolean supportComments, boolean supportDefaultValue, boolean supportExtent) {
-        this.columnType = new ColumnType(dataTypeName, supportLength, supportScale, supportNullable, supportAutoIncrement, supportCharset, supportCollation, supportComments, supportDefaultValue, supportExtent);
+    MysqlColumnTypeEnum(String dataTypeName, boolean supportLength, boolean supportScale, boolean supportNullable, boolean supportAutoIncrement, boolean supportCharset, boolean supportCollation, boolean supportComments, boolean supportDefaultValue, boolean supportExtent,boolean supportValue) {
+        this.columnType = new ColumnType(dataTypeName, supportLength, supportScale, supportNullable, supportAutoIncrement, supportCharset, supportCollation, supportComments, supportDefaultValue, supportExtent,supportValue);
     }
 
     private static Map<String, MysqlColumnTypeEnum> COLUMN_TYPE_MAP = Maps.newHashMap();
@@ -149,6 +149,10 @@ public String buildCreateColumnSql(TableColumn column) {
 
         script.append(buildDataType(column, type)).append(" ");
 
+        script.append(buildCharset(column,type)).append(" ");
+
+        script.append(buildCollation(column,type)).append(" ");
+
         script.append(buildNullable(column,type)).append(" ");
 
         script.append(buildDefaultValue(column,type)).append(" ");
@@ -162,6 +166,20 @@ public String buildCreateColumnSql(TableColumn column) {
         return script.toString();
     }
 
+    private String buildCharset(TableColumn column, MysqlColumnTypeEnum type) {
+        if(!type.getColumnType().isSupportCharset() || StringUtils.isEmpty(column.getCharSetName())){
+            return "";
+        }
+        return StringUtils.join("CHARACTER SET ",column.getCharSetName());
+    }
+
+    private String buildCollation(TableColumn column, MysqlColumnTypeEnum type) {
+        if(!type.getColumnType().isSupportCollation() || StringUtils.isEmpty(column.getCollationName())){
+            return "";
+        }
+        return StringUtils.join("COLLATE ",column.getCollationName());
+    }
+
     @Override
     public String buildModifyColumn(TableColumn tableColumn) {
 
@@ -218,7 +236,7 @@ private String buildDefaultValue(TableColumn column, MysqlColumnTypeEnum type) {
         }
 
         if(Arrays.asList(DATETIME,TIMESTAMP).contains(type)){
-            if("CURRENT_TIMESTAMP".equalsIgnoreCase(column.getDefaultValue())){
+            if("CURRENT_TIMESTAMP".equalsIgnoreCase(column.getDefaultValue().trim())){
                 return StringUtils.join("DEFAULT ",column.getDefaultValue());
             }
             return StringUtils.join("DEFAULT '",column.getDefaultValue(),"'");
@@ -282,8 +300,8 @@ private String buildDataType(TableColumn column, MysqlColumnTypeEnum type) {
         }
 
         if(Arrays.asList(SET,ENUM).contains(type)){
-            if(!StringUtils.isEmpty( column.getDefaultValue())){
-                return StringUtils.join(columnType,"(",column.getDefaultValue(),")");
+            if(!StringUtils.isEmpty( column.getValue())){
+                return StringUtils.join(columnType,"(",column.getValue(),")");
             }
             //List<String> enumList = column.
         }
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/ColumnType.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/ColumnType.java
index eb4cb31a6..715b8200f 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/ColumnType.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/ColumnType.java
@@ -17,4 +17,6 @@ public class ColumnType {
     private boolean supportComments;
     private boolean supportDefaultValue;
     private boolean supportExtent;
+
+    private boolean supportValue;
 }
diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/TableColumn.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/TableColumn.java
index 740dfa8c9..13588a12f 100644
--- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/TableColumn.java
+++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/model/TableColumn.java
@@ -165,4 +165,7 @@ public class TableColumn {
     private String charSetName;
 
     private String collationName;
+
+    private String value;
+
 }