fixes oceanbase/odc#778

oceanbase · Nov 13, 2023 · bdc5e71 · bdc5e71
1 parent aaee738
commit bdc5e71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/common/datasource/oceanbase/obmysql.ts b/src/common/datasource/oceanbase/obmysql.ts
@@ -138,7 +138,6 @@ const items: Record<
       language: 'obmysql',
       escapeChar: '`',
     },
-    disable: true,
   },
 };
 if (haveOCP()) {

diff --git a/src/common/network/connection.ts b/src/common/network/connection.ts
@@ -42,6 +42,7 @@ function generateConnectionParams(formData: Partial<IConnectionFormData>, isHide
   const params: Partial<IConnection> = {
     creatorId: userId,
     type: formData.type,
+    defaultSchema: formData?.defaultSchema,
     name: formData.name,
     username: formData.username,
     password: encrypt(formData.password),

diff --git a/src/d.ts/index.ts b/src/d.ts/index.ts
@@ -712,6 +712,7 @@ export interface IConnection {
   errorMessage?: string;
   jdbcUrlParameters?: Record<string, string>;
   sessionInitScript?: string;
+  defaultSchema?: string;
 }
 
 export interface IConnectionLabel {

diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
@@ -87,6 +87,7 @@ export default forwardRef<IFormRef, IProps>(function DatasourceForm(
         'sslConfig',
         'sessionInitScript',
         'jdbcUrlParameters',
+        'defaultSchema',
       ]);
     } catch (e) {}
     if (!values) {
@@ -259,6 +260,11 @@ export default forwardRef<IFormRef, IProps>(function DatasourceForm(
               <>
                 {!haveOCP() && <ParseURLItem autoType={!isEdit} />}
                 <AddressItems />
+                {dsc?.defaultSchema ? (
+                  <Form.Item label="默认数据库" rules={[{ required: true }]} name={'defaultSchema'}>
+                    <Input style={{ width: 208 }} />
+                  </Form.Item>
+                ) : null}
                 <Account isEdit={isEdit} />
                 <Form.Item
                   rules={[