Skip to content

Commit cca31f8

Browse files
committed
fix empty relationships
1 parent 83e0f0d commit cca31f8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/vpax/vpax_builder.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ std::vector<Value> VpaxBuilder::BuildColumns(const PreFetchedData &prefetched) {
377377

378378
std::string sql = R"(
379379
SELECT
380-
c.ExplicitName as ColumnName,
380+
COALESCE(c.ExplicitName, c.InferredName) as ColumnName,
381381
t.Name as TableName,
382382
c.ExplicitDataType,
383383
c.isHidden,
@@ -550,9 +550,9 @@ std::vector<Value> VpaxBuilder::BuildRelationships() {
550550
std::string sql = R"(
551551
SELECT
552552
ft.Name AS FromTableName,
553-
fc.ExplicitName AS FromColumnName,
553+
COALESCE(fc.ExplicitName, fc.InferredName) AS FromColumnName,
554554
tt.Name AS ToTableName,
555-
tc.ExplicitName AS ToColumnName,
555+
COALESCE(tc.ExplicitName, tc.InferredName) AS ToColumnName,
556556
rel.IsActive,
557557
CASE
558558
WHEN rel.FromCardinality = 2 THEN 'Many'
@@ -578,7 +578,7 @@ std::vector<Value> VpaxBuilder::BuildRelationships() {
578578
FROM Relationship rel
579579
LEFT JOIN [Table] ft ON rel.FromTableID = ft.id
580580
LEFT JOIN [Column] fc ON rel.FromColumnID = fc.id
581-
LEFT JOIN [Table] tt ON rel.ToTableID = tt.id AND tt.systemflags = 0
581+
LEFT JOIN [Table] tt ON rel.ToTableID = tt.id
582582
LEFT JOIN [Column] tc ON rel.ToColumnID = tc.id
583583
LEFT JOIN RelationshipStorage rs ON rs.id = rel.RelationshipStorageID
584584
LEFT JOIN RelationshipIndexStorage rid ON rs.RelationshipIndexStorageID = rid.id
@@ -643,8 +643,8 @@ std::vector<Value> VpaxBuilder::BuildColumnHierarchies() {
643643
std::string sql = R"(
644644
SELECT DISTINCT
645645
t.Name as TableName,
646-
c.ExplicitName as ColumnName,
647-
sc.ExplicitName as StructureName,
646+
COALESCE(c.ExplicitName, c.InferredName) as ColumnName,
647+
COALESCE(sc.ExplicitName, sc.InferredName) as StructureName,
648648
sfi.FileName
649649
FROM COLUMN c
650650
JOIN [Table] t

0 commit comments

Comments
 (0)