ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Import Flat File Wizard - hangs at table schema (#10216)

Browse Source 
* Using azure sql compatible query

* Included changes requested in PR for azure specific DBs and then fixed issue #9361 for contained databases.

* Made some changes mentioned in the PR
- Converted let to const
- Logging the error
This commit is contained in:
Aasim Khan
2020-05-01 10:53:02 -07:00
committed by GitHub
parent 8449888db8
commit 64c375a12d
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/import/src/wizard/pages/fileConfigPage.ts
View File

@@ -124,6 +124,9 @@ export class FileConfigPage extends ImportPage {
this.databaseDropdown.onValueChanged(async (db) => { this.databaseDropdown.onValueChanged(async (db) => {
this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name; this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name;
//this.populateTableNames(); //this.populateTableNames();
let connectionProvider = azdata.dataprotocol.getProvider<azdata.ConnectionProvider>(this.model.server.providerName, azdata.DataProviderType.ConnectionProvider);
let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId);
connectionProvider.changeDatabase(connectionUri, this.model.database);
this.populateSchemaDropdown(); this.populateSchemaDropdown();
}); });
@@ -146,13 +149,25 @@ export class FileConfigPage extends ImportPage {
return false; return false;
} }
let values = await this.getDatabaseValues(); let defaultServerDatabase = this.model.server.options.database;
this.model.database = values[0].name; let values: any[];
try {
values = await this.getDatabaseValues();
} catch (error) {
// This code is used in case of contained databases when the query will return an error.
console.log(error);
values = [{ displayName: defaultServerDatabase, name: defaultServerDatabase }];
this.databaseDropdown.editable = false;
}
this.model.database = defaultServerDatabase;
this.databaseDropdown.updateProperties({ this.databaseDropdown.updateProperties({
values: values values: values
}); });
this.databaseDropdown.value = { displayName: this.model.database, name: this.model.database };
this.databaseLoader.loading = false; this.databaseLoader.loading = false;
return true; return true;
@@ -266,11 +281,11 @@ export class FileConfigPage extends ImportPage {
private async populateSchemaDropdown(): Promise<boolean> { private async populateSchemaDropdown(): Promise<boolean> {
this.schemaLoader.loading = true; this.schemaLoader.loading = true;
let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId);
let queryProvider = azdata.dataprotocol.getProvider<azdata.QueryProvider>(this.model.server.providerName, azdata.DataProviderType.QueryProvider); let queryProvider = azdata.dataprotocol.getProvider<azdata.QueryProvider>(this.model.server.providerName, azdata.DataProviderType.QueryProvider);
const escapedQuotedDb = this.databaseDropdown.value ? `[${(<azdata.CategoryValue>this.databaseDropdown.value).name.replace(/]/g, ']]')}].` : ''; const query = `SELECT name FROM sys.schemas`;
const query = `SELECT name FROM ${escapedQuotedDb}sys.schemas`;
let results = await queryProvider.runQueryAndReturn(connectionUri, query); let results = await queryProvider.runQueryAndReturn(connectionUri, query);