Merge pull request #828 from chat2db/dev

Dev

Author: shanhexi

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.0.13
+
+`2023-11-15`
+
+**Changelog**
+
+- 🐞【Fixed】oracle datatype error
+- 🐞【Fixed】DM index error
+
+
 ## 3.0.12
 
 `2023-11-13`

CHANGELOG_CN.md

@@ -1,3 +1,12 @@
+## 3.0.13
+
+`2023-11-15`
+
+**更新日志**
+
+- 🐞【修复】oracle datatype 错误
+- 🐞【修复】DM index 错误
+
 ## 3.0.12
 
 `2023-11-13`

chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx

@@ -503,18 +503,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
         )}
         {editingConfig?.supportDefaultValue && (
           <Form.Item labelCol={labelCol} label={i18n('editTable.label.defaultValue')} name="defaultValue">
-            <CustomSelect
-              options={[
-                {
-                  label: 'EMPTY_STRING',
-                  value: 'EMPTY_STRING',
-                },
-                {
-                  label: 'NULL',
-                  value: 'NULL',
-                },
-              ]}
-            />
+            <CustomSelect options={databaseSupportField.defaultValues} />
           </Form.Item>
         )}
         {editingConfig?.supportCharset && (

chat2db-client/src/blocks/DatabaseTableEditor/index.tsx

@@ -54,6 +54,7 @@ export interface IDatabaseSupportField {
   charsets: IOption[];
   collations: IOption[];
   indexTypes: IOption[];
+  defaultValues: IOption[];
 }
 
 export default memo((props: IProps) => {
@@ -93,6 +94,7 @@ export default memo((props: IProps) => {
     charsets: [],
     collations: [],
     indexTypes: [],
+    defaultValues: [],
   });
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
@@ -148,11 +150,20 @@ export default memo((props: IProps) => {
             };
           }) || [];
 
+        const defaultValues =
+            res?.defaultValues?.map((i) => {
+              return {
+                value: i.defaultValue,
+                label: i.defaultValue,
+              };
+            }) || [];
+
         setDatabaseSupportField({
           columnTypes,
           charsets,
           collations,
           indexTypes,
+          defaultValues,
         });
       });
   }

chat2db-client/src/components/Console/index.tsx

@@ -406,6 +406,7 @@ function Console(props: IProps, ref: ForwardedRef<IConsoleRef>) {
     const handleError = (error: any) => {
       console.error('Error:', error);
       setIsLoading(false);
+      setIsAiDrawerLoading(false);
       setIsStream(false);
       closeEventSource.current();
     };
@@ -576,7 +577,21 @@ function Console(props: IProps, ref: ForwardedRef<IConsoleRef>) {
 
         {/* <NewEditor id={uid} dataSource={props.executeParams.type} database={props.executeParams.databaseName} /> */}
 
-        <Drawer open={isAiDrawerOpen} getContainer={false} mask={false} onClose={() => setIsAiDrawerOpen(false)}>
+        <Drawer
+          open={isAiDrawerOpen}
+          getContainer={false}
+          mask={false}
+          onClose={() => {
+            try {
+              setIsAiDrawerOpen(false);
+              setIsAiDrawerLoading(false);
+              setIsStream(false);
+              closeEventSource.current && closeEventSource.current();
+            } catch (error) {
+              console.log('close drawer', error);
+            }
+          }}
+        >
           <Spin spinning={isAiDrawerLoading} style={{ height: '100%' }}>
             <div className={styles.aiBlock}>{aiContent}</div>
           </Spin>

chat2db-client/src/typings/database.ts

@@ -51,6 +51,7 @@ export interface IDatabaseSupportField {
   charsets: ICharset[];
   collations: ICollation[];
   indexTypes: IIndexTypes[];
+  defaultValues: IDefaultValue[];
 }
 
 /** 字段所对应的 字符集*/
@@ -84,3 +85,8 @@ export interface IColumnTypes {
   supportValue: boolean; // 是否支持值
   supportUnit: boolean; // 是否支持单位
 }
+
+/** 不同数据库支持不同的默认值 */
+export interface IDefaultValue {
+  defaultValue: string; // 默认值
+}

chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/DB2MetaData.java

@@ -8,6 +8,7 @@
 
 import ai.chat2db.plugin.db2.builder.DB2SqlBuilder;
 import ai.chat2db.plugin.db2.type.DB2ColumnTypeEnum;
+import ai.chat2db.plugin.db2.type.DB2DefaultValueEnum;
 import ai.chat2db.plugin.db2.type.DB2IndexTypeEnum;
 import ai.chat2db.spi.MetaData;
 import ai.chat2db.spi.SqlBuilder;
@@ -152,6 +153,7 @@ public TableMeta getTableMeta(String databaseName, String schemaName, String tab
                 .charsets(Lists.newArrayList())
                 .collations(Lists.newArrayList())
                 .indexTypes(DB2IndexTypeEnum.getIndexTypes())
+                .defaultValues(DB2DefaultValueEnum.getDefaultValues())
                 .build();
     }
 

chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/type/DB2DefaultValueEnum.java

@@ -0,0 +1,27 @@
+package ai.chat2db.plugin.db2.type;
+
+import ai.chat2db.spi.model.DefaultValue;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum DB2DefaultValueEnum {
+    EMPTY_STRING("EMPTY_STRING"),
+    NULL("NULL"),
+    ;
+    private DefaultValue defaultValue;
+
+    DB2DefaultValueEnum(String defaultValue) {
+        this.defaultValue = new DefaultValue(defaultValue);
+    }
+
+
+    public DefaultValue getDefaultValue() {
+        return defaultValue;
+    }
+
+    public static List<DefaultValue> getDefaultValues() {
+        return Arrays.stream(DB2DefaultValueEnum.values()).map(DB2DefaultValueEnum::getDefaultValue).collect(java.util.stream.Collectors.toList());
+    }
+
+}

chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java

@@ -8,6 +8,7 @@
 
 import ai.chat2db.plugin.dm.builder.DMSqlBuilder;
 import ai.chat2db.plugin.dm.type.DMColumnTypeEnum;
+import ai.chat2db.plugin.dm.type.DMDefaultValueEnum;
 import ai.chat2db.plugin.dm.type.DMIndexTypeEnum;
 import ai.chat2db.spi.MetaData;
 import ai.chat2db.spi.SqlBuilder;
@@ -218,6 +219,7 @@ public TableMeta getTableMeta(String databaseName, String schemaName, String tab
                 .charsets(Lists.newArrayList())
                 .collations(Lists.newArrayList())
                 .indexTypes(DMIndexTypeEnum.getIndexTypes())
+                .defaultValues(DMDefaultValueEnum.getDefaultValues())
                 .build();
     }
 

chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/type/DMDefaultValueEnum.java

@@ -0,0 +1,27 @@
+package ai.chat2db.plugin.dm.type;
+
+import ai.chat2db.spi.model.DefaultValue;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum DMDefaultValueEnum {
+    EMPTY_STRING("EMPTY_STRING"),
+    NULL("NULL"),
+    ;
+    private DefaultValue defaultValue;
+
+    DMDefaultValueEnum(String defaultValue) {
+        this.defaultValue = new DefaultValue(defaultValue);
+    }
+
+
+    public DefaultValue getDefaultValue() {
+        return defaultValue;
+    }
+
+    public static List<DefaultValue> getDefaultValues() {
+        return Arrays.stream(DMDefaultValueEnum.values()).map(DMDefaultValueEnum::getDefaultValue).collect(java.util.stream.Collectors.toList());
+    }
+
+}