Skip to content

Refactor for wrapper changes #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ecmel merged 1 commit into from
Feb 9, 2026
Merged

Refactor for wrapper changes #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/classes/localConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,21 +138,22 @@ export class LocalConnection {
args.push(
context ?? ".",
command,
null,
stringify ? "text" : "structuredText",
);
}
this.connection.k(wrapper, ...args, (err: Error, res: QueryResult) => {
if (err) {
reject(handleQueryResults(err.toString(), QueryResultType.Error));
} else if (res.errored) {
} else if (res.error) {
resolve(
handleQueryResults(
res.error + (res.backtrace ? "\n" + res.backtrace : ""),
res.errorMsg + (res.stacktrace ? "\n" + res.stacktrace : ""),
QueryResultType.Error,
),
);
} else {
const result = res.result === null ? "" : res.result;
const result = res.data === null ? "" : res.data;
if (stringify) {
resolve(result);
} else {
Expand Down
3 changes: 3 additions & 0 deletions src/models/queryResult.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ export type QueryResult = {
text: string;
index: number;
}[];

errorMsg?: string;
stacktrace?: string;
};

export enum QueryResultType {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ export async function convertBase64License(
}

export function isTable(result: QueryResult): boolean {
if (!result.result || !result.meta || result.meta.length === 0) {
if (!result.data || !result.meta || result.meta.length === 0) {
return false;
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/queryUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ export function getPythonWrapper(
sample_fn: "first",
sample_size: 10000,
};
return `{[returnFormat;code;sample_fn;sample_size] res:${wrapper}[returnFormat;code;sample_fn;sample_size];$[res\`errored;res\`error;res\`result]}["${args.returnFormat}";"${args.code}";"${args.sample_fn}";${args.sample_size}]`;
return `{[returnFormat;code;sample_fn;sample_size] res:${wrapper}[returnFormat;code;sample_fn;sample_size];$[res\`error;res\`errorMsg;res\`data]}["${args.returnFormat}";"${args.code}";"${args.sample_fn}";${args.sample_size}]`;
}

export function getQSQLWrapper(
Expand Down