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

hotfix sql-migration extension for release to PROD, remove usage of unreleased ads enum (#20879)

Browse Source 
* remove enum and vbump hotfix

* add update comments
This commit is contained in:
brian-harris
2022-10-19 14:31:59 -07:00
committed by GitHub
parent adc908c04b
commit 14cbe09a20
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-migration/package.json
View File

@@ -2,7 +2,7 @@
"name": "sql-migration", "name": "sql-migration",
"displayName": "%displayName%", "displayName": "%displayName%",
"description": "%description%", "description": "%description%",
"version": "1.1.0", "version": "1.1.1",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": false, "preview": false,
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",

8
extensions/sql-migration/src/api/sqlUtils.ts
View File

@@ -84,14 +84,14 @@ function getSqlDbConnectionProfile(
databaseName: databaseName, databaseName: databaseName,
userName: userName, userName: userName,
password: password, password: password,
authenticationType: azdata.connection.AuthenticationType.SqlLogin, authenticationType: 'SqlLogin',
savePassword: false, savePassword: false,
saveProfile: false, saveProfile: false,
options: { options: {
conectionName: '', conectionName: '',
server: serverName, server: serverName,
database: databaseName, database: databaseName,
authenticationType: azdata.connection.AuthenticationType.SqlLogin, authenticationType: 'SqlLogin',
user: userName, user: userName,
password: password, password: password,
connectionTimeout: 60, connectionTimeout: 60,
@@ -122,7 +122,7 @@ function getConnectionProfile(
azureResourceId: azureResourceId, azureResourceId: azureResourceId,
userName: userName, userName: userName,
password: password, password: password,
authenticationType: azdata.connection.AuthenticationType.SqlLogin, authenticationType: 'SqlLogin', // TODO: use azdata.connection.AuthenticationType.SqlLogin after next ADS release
savePassword: false, savePassword: false,
groupFullName: connectId, groupFullName: connectId,
groupId: connectId, groupId: connectId,
@@ -131,7 +131,7 @@ function getConnectionProfile(
options: { options: {
conectionName: connectId, conectionName: connectId,
server: serverName, server: serverName,
authenticationType: azdata.connection.AuthenticationType.SqlLogin, authenticationType: 'SqlLogin',
user: userName, user: userName,
password: password, password: password,
connectionTimeout: 60, connectionTimeout: 60,

4
extensions/sql-migration/src/wizard/databaseBackupPage.ts
View File

@@ -727,9 +727,9 @@ export class DatabaseBackupPage extends MigrationWizardPage {
this.migrationStateModel.sourceConnectionId)), query); this.migrationStateModel.sourceConnectionId)), query);
const username = results.rows[0][0].displayValue; const username = results.rows[0][0].displayValue;
this.migrationStateModel._authenticationType = connectionProfile.authenticationType === azdata.connection.AuthenticationType.SqlLogin this.migrationStateModel._authenticationType = connectionProfile.authenticationType === 'SqlLogin'
? MigrationSourceAuthenticationType.Sql ? MigrationSourceAuthenticationType.Sql
: connectionProfile.authenticationType === azdata.connection.AuthenticationType.Integrated : connectionProfile.authenticationType === 'Integrated' // TODO: use azdata.connection.AuthenticationType.Integrated after next ADS release
? MigrationSourceAuthenticationType.Integrated ? MigrationSourceAuthenticationType.Integrated
: undefined!; : undefined!;
this._sourceHelpText.value = constants.SQL_SOURCE_DETAILS( this._sourceHelpText.value = constants.SQL_SOURCE_DETAILS(

4
extensions/sql-migration/src/wizard/sqlSourceConfigurationPage.ts
View File

@@ -59,9 +59,9 @@ export class SqlSourceConfigurationPage extends MigrationWizardPage {
const query = 'select SUSER_NAME()'; const query = 'select SUSER_NAME()';
const results = await queryProvider.runQueryAndReturn(await (azdata.connection.getUriForConnection(this.migrationStateModel.sourceConnectionId)), query); const results = await queryProvider.runQueryAndReturn(await (azdata.connection.getUriForConnection(this.migrationStateModel.sourceConnectionId)), query);
const username = results.rows[0][0].displayValue; const username = results.rows[0][0].displayValue;
this.migrationStateModel._authenticationType = connectionProfile.authenticationType === azdata.connection.AuthenticationType.SqlLogin this.migrationStateModel._authenticationType = connectionProfile.authenticationType === 'SqlLogin'
? MigrationSourceAuthenticationType.Sql ? MigrationSourceAuthenticationType.Sql
: connectionProfile.authenticationType === azdata.connection.AuthenticationType.Integrated : connectionProfile.authenticationType === 'Integrated'
? MigrationSourceAuthenticationType.Integrated ? MigrationSourceAuthenticationType.Integrated
: undefined!; : undefined!;