Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions extensions/mssql/l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -2839,6 +2839,7 @@
},
"Copy As": "Copy As",
"Copy as INSERT INTO": "Copy as INSERT INTO",
"Copying as an IN clause requires selecting exactly one column.": "Copying as an IN clause requires selecting exactly one column.",
"NULL": "NULL",
"Blanks": "Blanks",
"Search...": "Search...",
Expand Down
13 changes: 9 additions & 4 deletions extensions/mssql/src/notebooks/sqlNotebookController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import type {
NotebookQueryResultGridBlock,
NotebookQueryResultOutputData,
NotebookSaveAsMessage,
NotebookShowErrorMessage,
} from "../sharedInterfaces/notebookQueryResult";
import { saveNotebookResults } from "./notebookResultsSerializer";
import { sendActionEvent, startActivity } from "../telemetry/telemetry";
Expand Down Expand Up @@ -196,11 +197,15 @@ export class SqlNotebookController implements vscode.Disposable {
const messaging = vscode.notebooks.createRendererMessaging(NOTEBOOK_RESULT_RENDERER_ID);
this.disposables.push(
messaging.onDidReceiveMessage((e) => {
const message = e.message as NotebookSaveAsMessage | undefined;
if (message?.type !== "saveAs") {
return;
const message = e.message as
| NotebookSaveAsMessage
| NotebookShowErrorMessage
| undefined;
if (message?.type === "saveAs") {
void this.handleSaveAs(e.editor.notebook, message);
} else if (message?.type === "showError") {
void vscode.window.showErrorMessage(message.message);
}
void this.handleSaveAs(e.editor.notebook, message);
}),
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,8 @@ export interface NotebookSaveAsMessage {
rows: DbCellValue[][];
resultSetIndex: number;
}

export interface NotebookShowErrorMessage {
type: "showError";
message: string;
}
3 changes: 3 additions & 0 deletions extensions/mssql/src/webviews/common/locConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,9 @@ export class LocConstants {
copyAsJson: l10n.t("Copy as JSON"),
copyAsInClause: l10n.t("Copy as IN clause"),
copyAsInsertInto: l10n.t("Copy as INSERT INTO"),
copyAsInClauseRequiresSingleColumn: l10n.t(
"Copying as an IN clause requires selecting exactly one column.",
),
null: l10n.t("NULL"),
blankString: l10n.t("Blanks"),
apply: l10n.t("Apply"),
Expand Down
Loading
Loading