fix(grid): show field comments for Oracle joined bare-star queries
This commit is contained in:
4 files changed
+82
-19
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { analyzeEditableQueryEditability, resolveSourceColumnsByOrdinal } from "@/lib/sql/sqlAnalysis";
|
||||
import { analyzeEditableQueryEditability, analyzeSelectStructureForDisplay, resolveSourceColumnsByOrdinal } from "@/lib/sql/sqlAnalysis";
|
||||
|
||||
/**
|
||||
* Result columns resolve by projection ordinal, each carrying its source
|
||||
@@ -7,6 +7,27 @@ import { analyzeEditableQueryEditability, resolveSourceColumnsByOrdinal } from "
|
||||
* per-source comments instead of first-source-wins on name clashes.
|
||||
*/
|
||||
describe("multi-source result column mapping", () => {
|
||||
it("expands a bare star in a joined result for display metadata", () => {
|
||||
const analysis = analyzeSelectStructureForDisplay("SELECT * FROM orders a JOIN users b ON a.user_id = b.id");
|
||||
expect(analysis?.selectStar).toBe(true);
|
||||
|
||||
const resolved = resolveSourceColumnsByOrdinal(
|
||||
"oracle",
|
||||
analysis!,
|
||||
[
|
||||
{ source: analysis!.sources![0]!, columns: [{ name: "ID" }, { name: "USER_ID" }] },
|
||||
{ source: analysis!.sources![1]!, columns: [{ name: "ID" }, { name: "NAME" }] },
|
||||
],
|
||||
4,
|
||||
);
|
||||
expect(resolved).toEqual([
|
||||
{ sourceKey: "a:0", sourceColumn: "ID" },
|
||||
{ sourceKey: "a:0", sourceColumn: "USER_ID" },
|
||||
{ sourceKey: "b:1", sourceColumn: "ID" },
|
||||
{ sourceKey: "b:1", sourceColumn: "NAME" },
|
||||
]);
|
||||
});
|
||||
|
||||
it("parses a JOIN as multi-source with per-source columns", () => {
|
||||
const result = analyzeEditableQueryEditability("SELECT a.id, a.user_id, b.name FROM orders a JOIN users b ON a.user_id = b.id");
|
||||
expect(result.editable).toBe(true);
|
||||
|
||||
@@ -338,7 +338,10 @@ export function analyzeSelectStructureForDisplay(sql: string): EditableQueryInfo
|
||||
const hasWindowClause = findTopLevelKeyword(normalized, "OVER", "SELECT".length) >= 0 || findTopLevelKeyword(normalized, "WINDOW", fromIndex + "FROM".length) >= 0;
|
||||
const hasRightJoinClause = hasTopLevelRightJoin(fromBody);
|
||||
|
||||
const selectStar = sources.length === 1 && isSelectStar(selectBody, source.alias);
|
||||
// A bare `*` in a multi-source query expands in source/projection order.
|
||||
// Keep it as a display-only star so joined result columns can still resolve
|
||||
// to their physical metadata without making the query editable.
|
||||
const selectStar = isSelectStar(selectBody, source.alias);
|
||||
const columns = selectStar ? [] : parseSelectColumns(selectBody, sources);
|
||||
if (!selectStar && columns.length === 0) return null;
|
||||
if (sources.length > 1 && columns.some((column) => column.star && !column.sourceKey)) return null;
|
||||
|
||||
Reference in new issue
Block a user