Skip to content

Commit bbd4f89

Browse files
committed
fixed single atom results for boolean byte short real float
1 parent d8d3b4e commit bbd4f89

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

src/models/queryResult.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,16 @@ export const queryConstants = {
4040
};
4141

4242
export interface StructuredTextColumns {
43-
name: "values" | "value" | string;
43+
name: string;
4444
type: string;
4545
values: string[] | string;
46-
/* not the order for initial display */
47-
order: number[] | "Not Yet Implemented for the input";
46+
order:
47+
| number[] /* ascending indexes if the column is sorted */
48+
| string /* error message if sorting is not possible */;
4849
}
4950

5051
export interface StructuredTextResults {
5152
columns: StructuredTextColumns[] | StructuredTextColumns;
52-
/* values array length may differ */
53+
/* note: values array length may differ */
5354
count: number;
5455
}

src/services/resultsPanelProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
227227

228228
const columnDefs = columnsArray.map((column) => {
229229
const sanitizedKey = this.sanitizeString(column.name);
230-
const cellDataType = this.kdbToAgGridCellType(column.type);
230+
const cellDataType = "text";
231231
const headerName = column.type
232232
? `${sanitizedKey} [${column.type}]`
233233
: sanitizedKey;
@@ -236,7 +236,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
236236
field: column.name,
237237
headerName: headerName,
238238
cellDataType: cellDataType,
239-
cellRendererParams: { disabled: cellDataType === "boolean" },
239+
cellRendererParams: { disabled: false },
240240
};
241241
});
242242

src/utils/queryUtils.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,10 @@ export function formatScratchpadStacktrace(stacktrace: ScratchpadStacktrace) {
399399
const PNG = ["0x89", "0x50", "0x4e", "0x47", "0x0d", "0x0a", "0x1a", "0x0a"];
400400

401401
export function resultToBase64(result: any): string | undefined {
402-
const bytes = Array.isArray(result?.columns)
403-
? result.columns[0].values
404-
: result?.columns?.values || result;
402+
const bytes =
403+
(Array.isArray(result?.columns) && result.columns[0]?.values) ||
404+
result?.columns?.values ||
405+
result;
405406
if (Array.isArray(bytes) && bytes.length > 66) {
406407
for (let i = 0; i < PNG.length; i++) {
407408
if (bytes[i] !== PNG[i] && bytes[i] !== parseInt(PNG[i], 16)) {

test/suite/utils.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@ describe("Utils", () => {
20352035
});
20362036
it("should return undefined for bogus structuredText v2", () => {
20372037
const result = queryUtils.resultToBase64({
2038-
columns: [{}],
2038+
columns: [],
20392039
});
20402040
assert.strictEqual(result, undefined);
20412041
});

0 commit comments

Comments
 (0)