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

Some MSSQL strict null check fixes (#22383)

Browse Source
This commit is contained in:
Charles Gagnon
2023-03-21 16:10:57 -07:00
committed by GitHub
parent 2be49a9911
commit 62ece298cc
7 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/mssql/src/contextProvider.ts
View File

@@ -37,22 +37,17 @@ export default class ContextProvider {
}
public onDashboardOpen(e: azdata.DashboardDocument): void {
let iscloud: boolean;
let edition: number;
let serverMajorVersion: number;
let isCloud: boolean = false;
let edition: number | undefined;
let serverMajorVersion: number | undefined;
if (e.profile.providerName.toLowerCase() === 'mssql' && !types.isUndefinedOrNull(e.serverInfo) && !types.isUndefinedOrNull(e.serverInfo.engineEditionId)) {
if (isCloudEditions.some(i => i === e.serverInfo.engineEditionId)) {
iscloud = true;
} else {
iscloud = false;
}
isCloud = isCloudEditions.some(i => i === e.serverInfo.engineEditionId);
edition = e.serverInfo.engineEditionId;
serverMajorVersion = e.serverInfo.serverMajorVersion;
}
if (iscloud === true || iscloud === false) {
void setCommandContext(ContextKeys.ISCLOUD, iscloud);
if (isCloud === true || isCloud === false) {
void setCommandContext(ContextKeys.ISCLOUD, isCloud);
}
if (!types.isUndefinedOrNull(edition)) {

2
extensions/mssql/src/contracts.ts
View File

@@ -387,7 +387,7 @@ export namespace UpdateAgentNotebookRunPinRequest {
}
export namespace AgentNotebookTemplateRequest {
export const type = new RequestType<AgentNotebookTemplateParams, azdata.ResultStatus, void, void>('agent/notebooktemplate');
export const type = new RequestType<AgentNotebookTemplateParams, azdata.AgentNotebookTemplateResult, void, void>('agent/notebooktemplate');
}
export namespace CreateAgentNotebookRequest {

91
extensions/mssql/src/features.ts
View File

@@ -192,12 +192,12 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
// Job management methods
let getJobs = (ownerUri: string): Thenable<azdata.AgentJobsResult> => {
let params: contracts.AgentJobsParams = { ownerUri: ownerUri, jobId: null };
let params: contracts.AgentJobsParams = { ownerUri: ownerUri, jobId: '' };
return client.sendRequest(contracts.AgentJobsRequest.type, params).then(
r => r,
e => {
client.logFailedRequest(contracts.AgentJobsRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -209,7 +209,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.AgentJobHistoryRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -220,7 +220,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.AgentJobActionRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -238,7 +238,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -257,7 +257,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -275,7 +275,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -289,7 +289,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -308,7 +308,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -327,7 +327,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -345,7 +345,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -357,7 +357,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.AgentNotebooksRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -370,7 +370,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.AgentNotebookHistoryRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -382,7 +382,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.AgentNotebookMaterializedRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -394,7 +394,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.AgentNotebookTemplateRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -413,7 +413,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -434,7 +434,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -452,7 +452,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -464,7 +464,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.DeleteMaterializedNotebookRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -476,7 +476,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.UpdateAgentNotebookRunNameRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -488,7 +488,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(contracts.UpdateAgentNotebookRunPinRequest.type, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -505,7 +505,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -523,7 +523,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -542,7 +542,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -560,7 +560,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -575,7 +575,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -593,7 +593,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -612,7 +612,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -630,7 +630,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -645,12 +645,12 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
let createProxy = (ownerUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable<azdata.CreateAgentOperatorResult> => {
let createProxy = (ownerUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable<azdata.CreateAgentProxyResult> => {
let params: contracts.CreateAgentProxyParams = {
ownerUri: ownerUri,
proxy: proxyInfo
@@ -663,12 +663,12 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
let updateProxy = (ownerUri: string, originalProxyName: string, proxyInfo: azdata.AgentProxyInfo): Thenable<azdata.UpdateAgentOperatorResult> => {
let updateProxy = (ownerUri: string, originalProxyName: string, proxyInfo: azdata.AgentProxyInfo): Thenable<azdata.UpdateAgentProxyResult> => {
let params: contracts.UpdateAgentProxyParams = {
ownerUri: ownerUri,
originalProxyName: originalProxyName,
@@ -682,7 +682,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -700,7 +700,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -715,7 +715,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -731,7 +731,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
r => r,
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -749,7 +749,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -768,7 +768,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -786,7 +786,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
},
e => {
client.logFailedRequest(requestType, e);
return Promise.resolve(undefined);
return Promise.reject(e);
}
);
};
@@ -926,9 +926,8 @@ export class SqlAssessmentServicesFeature extends SqlOpsFeature<undefined> {
}
catch (e) {
client.logFailedRequest(contracts.SqlAssessmentInvokeRequest.type, e);
throw e;
}
return undefined;
};
let getAssessmentItems = async (ownerUri: string, targetType: azdata.sqlAssessment.SqlAssessmentTargetType): Promise<azdata.SqlAssessmentResult> => {
@@ -938,9 +937,8 @@ export class SqlAssessmentServicesFeature extends SqlOpsFeature<undefined> {
}
catch (e) {
client.logFailedRequest(contracts.GetSqlAssessmentItemsRequest.type, e);
throw e;
}
return undefined;
};
let generateAssessmentScript = async (items: azdata.SqlAssessmentResultItem[]): Promise<azdata.ResultStatus> => {
@@ -950,9 +948,8 @@ export class SqlAssessmentServicesFeature extends SqlOpsFeature<undefined> {
}
catch (e) {
client.logFailedRequest(contracts.GenerateSqlAssessmentScriptRequest.type, e);
throw e;
}
return undefined;
};
return azdata.dataprotocol.registerSqlAssessmentServicesProvider({
@@ -1062,7 +1059,7 @@ export class ProfilerFeature extends SqlOpsFeature<undefined> {
};
let connectSession = (sessionId: string): Thenable<boolean> => {
return undefined;
return Promise.resolve(false);
};
let disconnectSession = (ownerUri: string): Thenable<boolean> => {

3
extensions/mssql/src/localizedConstants.ts
View File

@@ -10,3 +10,6 @@ export function failedToFindTenants(tenantId: string, accountName: string): stri
export function tokenRefreshFailed(name: string): string { return localize('mssql.tokenRefreshFailed', "{0} AAD token refresh failed, please reconnect to enable {0}", name); }
export const tokenRefreshFailedNoSecurityToken = localize('mssql.tokenRefreshFailedNoSecurityToken', "Editor token refresh failed, autocompletion will be disabled until the editor is disconnected and reconnected");
export function failedToFindAccount(accountName: string) { return localize('mssql.failedToFindAccount', "Failed to find azure account {0} when executing token refresh", accountName); }
export const noConvertResult = localize('mssql.noConvertResult', "No result returned from Notebook convert request")
export function noDocumentFound(uri: string): string { return localize('mssql.noDocumentFound', "No document found for URI {0}", uri); }
export function unsupportedPlatform(platform: string): string { return localize('mssql.unsupportedPlatform', "Unsupported platform {0}", platform); }

16
extensions/mssql/src/main.ts
View File

@@ -6,6 +6,7 @@
import * as vscode from 'vscode';
import * as azdata from 'azdata';
import * as path from 'path';
import * as os from 'os';
import * as Constants from './constants';
import ContextProvider from './contextProvider';
@@ -25,6 +26,7 @@ import { registerTableDesignerCommands } from './tableDesigner/tableDesigner';
// import { SqlNotebookController } from './sqlNotebook/sqlNotebookController';
import { registerObjectManagementCommands } from './objectManagement/commands';
import { TelemetryActions, TelemetryReporter, TelemetryViews } from './telemetry';
import { noConvertResult, noDocumentFound, unsupportedPlatform } from './localizedConstants';
const localize = nls.loadMessageBundle();
@@ -33,8 +35,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<IExten
let supported = await Utils.verifyPlatform();
if (!supported) {
void vscode.window.showErrorMessage('Unsupported platform');
return undefined;
const msg = unsupportedPlatform(os.platform());
void vscode.window.showErrorMessage(msg);
throw new Error(unsupportedPlatform(msg));
}
// ensure our log path exists
@@ -68,6 +71,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<IExten
context.subscriptions.push(vscode.commands.registerCommand('mssql.exportSqlAsNotebook', async (uri: vscode.Uri) => {
try {
const result = await appContext.getService<INotebookConvertService>(Constants.NotebookConvertService).convertSqlToNotebook(uri.toString());
if (!result) {
throw new Error(noConvertResult);
}
const title = findNextUntitledEditorName();
const untitledUri = vscode.Uri.parse(`untitled:${title}`);
await azdata.nb.showNotebookDocument(untitledUri, { initialContent: result.content });
@@ -82,7 +88,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<IExten
// We use vscode.workspace.textDocuments here because the azdata.nb.notebookDocuments don't actually contain their contents
// (they're left out for perf purposes)
const doc = vscode.workspace.textDocuments.find(doc => doc.uri.toString() === uri.toString());
if (!doc) {
throw new Error(noDocumentFound(uri.toString()));
}
const result = await appContext.getService<INotebookConvertService>(Constants.NotebookConvertService).convertNotebookToSql(doc.getText());
if (!result) {
throw new Error(noConvertResult);
}
await azdata.queryeditor.openQueryDocument({ content: result.content });
} catch (err) {
void vscode.window.showErrorMessage(localize('mssql.errorConvertingToSQL', "An error occurred converting the Notebook document to SQL. Error : {0}", err.toString()));

4
extensions/mssql/src/telemetry.ts
View File

@@ -25,8 +25,8 @@ export const TelemetryReporter = new AdsTelemetryReporter<string, string>(packag
export function fillServerInfo(telemetryInfo: { [key: string]: string }, serverInfo: ServerInfo): void {
telemetryInfo['serverEdition'] = serverInfo?.serverEdition;
telemetryInfo['serverLevel'] = serverInfo?.serverLevel;
telemetryInfo['serverMajorVersion'] = serverInfo?.serverMajorVersion.toString();
telemetryInfo['serverMinorVersion'] = serverInfo?.serverMinorVersion.toString();
telemetryInfo['serverMajorVersion'] = serverInfo?.serverMajorVersion?.toString() || '';
telemetryInfo['serverMinorVersion'] = serverInfo?.serverMinorVersion?.toString() || '';
telemetryInfo['isCloud'] = serverInfo?.isCloud.toString();
}

4
src/sql/azdata.d.ts vendored
View File

@@ -1947,8 +1947,8 @@ declare module 'azdata' {
// Proxy management methods
getProxies(ownerUri: string): Thenable<AgentProxiesResult>;
createProxy(ownerUri: string, proxyInfo: AgentProxyInfo): Thenable<CreateAgentOperatorResult>;
updateProxy(ownerUri: string, originalProxyName: string, proxyInfo: AgentProxyInfo): Thenable<UpdateAgentOperatorResult>;
createProxy(ownerUri: string, proxyInfo: AgentProxyInfo): Thenable<CreateAgentProxyResult>;
updateProxy(ownerUri: string, originalProxyName: string, proxyInfo: AgentProxyInfo): Thenable<UpdateAgentProxyResult>;
deleteProxy(ownerUri: string, proxyInfo: AgentProxyInfo): Thenable<ResultStatus>;
// Credential method