Merge branch 'master' into develop

This commit is contained in:
Jan Prochazka
2021-10-24 10:30:34 +02:00
9 changed files with 66 additions and 35 deletions

View File

@@ -71,6 +71,6 @@
"webpack-cli": "^3.3.11"
},
"optionalDependencies": {
"msnodesqlv8": "^2.0.10"
"msnodesqlv8": "^2.4.0"
}
}

View File

@@ -47,6 +47,7 @@ export interface EngineDriver {
showConnectionTab?: (tab: 'ssl' | 'sshTunnel', values: any) => boolean;
beforeConnectionSave?: (values: any) => any;
databaseUrlPlaceholder?: string;
defaultAuthTypeName?: string;
connect({ server, port, user, password, database }): Promise<any>;
close(pool): Promise<any>;
query(pool: any, sql: string, options?: QueryOptions): Promise<QueryResult>;

View File

@@ -65,6 +65,8 @@
<FormSelectField
label="Authentication"
name="authType"
isNative
defaultValue={driver?.defaultAuthTypeName}
options={$authTypes.map(auth => ({
value: auth.name,
label: auth.title,