Adapt to FunSQL#private-fields

Author: xitology

src/concept.jl

@@ -2,7 +2,7 @@
 
 concept() = begin
     from(concept)
-    as(omop)
+    into(omop)
     define(
         omop.concept_id,
         omop.concept_name,

src/format.jl

@@ -57,9 +57,40 @@ function _format_thead(df, fmt)
         fmt.group_by in names || throw(DomainError(fmt.group_by, "missing grouping column"))
         filter!(!=(fmt.group_by), names)
     end
+    cols = [HTTP.URIs.unescapeuri.(split(string(name), '.')) for name in names]
+    pushfirst!(cols, [""])
+    w = length(cols)
+    h = maximum(length.(cols))
+    headers = Union{String, Nothing}[get(col, i-h+length(col), "") for i = 1:h, col in cols]
+    for i = 1:h
+        for j = w:-1:3
+            if (i == 1 || headers[i-1, j] === nothing) && headers[i, j-1] == headers[i, j]
+                headers[i, j] = nothing
+            end
+        end
+    end
+    lines = Vector{Tuple{String, Int, Bool}}[]
+    for i = 1:h
+        line = Tuple{String, Int, Bool}[]
+        j = 1
+        while j <= w
+            colspan = 1
+            while j + colspan <= w && headers[i, j+colspan] === nothing
+                colspan += 1
+            end
+            border =
+                i > 1 && j > 2 && headers[i-1, j] !== nothing ||
+                i < h && j > 2 && headers[i, j] !== nothing
+            push!(line, (headers[i, j], colspan, border))
+            j += colspan
+        end
+        push!(lines, line)
+    end
     @htl """
     <thead>
-    <tr><th></th>$([@htl """<th scope="col">$name</th>""" for name in names])</tr>
+    $([@htl """<tr>$([@htl """<th scope="col" colspan="$colspan" class="$(border ? "trdw-border" : "")">$header</th>"""
+                      for (header, colspan, border) in lines[i]])</tr>"""
+       for i = 1:h])
     </thead>
     """
 end
@@ -171,6 +202,7 @@ function _format_style(df, fmt)
     .trdw-format > table { width: max-content; }
     .trdw-format > table > caption { padding: .2rem .5rem; }
     .trdw-format > table > thead > tr > th { vertical-align; baseline; }
+    .trdw-format > table > thead > tr > th.trdw-border { border-left: 1px solid var(--table-border-color); }
     .trdw-format > table > tbody > tr:first-child > th { border-top: 1px solid var(--table-border-color); }
     .trdw-format > table > tbody > tr:first-child > td { border-top: 1px solid var(--table-border-color); }
     .trdw-format > table > tbody > tr > th { vertical-align: baseline; }

src/inventory.jl

@@ -10,8 +10,8 @@ end
 
 array_frequency(expr; name = $(FunSQL.label(expr))) = begin
     partition(name = all)
-    cross_join(from(explode_outer($expr), columns = [$name]))
-    group($name)
+    cross_join(explode => from(explode_outer($expr), columns = [$name]))
+    group(explode.$name)
     define(n => count())
     define(`%` => floor(100 * n / any_value(all.count()), 1))
     order(n.desc())
@@ -114,6 +114,10 @@ validate_foreign_key(source, source_columns, target) =
 
 end
 
+const funsql_tally = funsql_frequency
+
+const funsql_tally_array = funsql_array_frequency
+
 function _primary_key_name(source, columns)
     table = FunSQL.label(source)
     if length(columns) == 1

src/nodes.jl

@@ -61,14 +61,16 @@ function FunSQL.resolve(n::UndefineNode, ctx)
         end
     end
     fields = FunSQL.FieldTypeMap()
+    private_fields = copy(t.private_fields)
     for (f, ft) in t.fields
         if f in keys(n.label_map)
+            delete!(private_fields, f)
             continue
         end
         fields[f] = ft
     end
     q′ = FunSQL.Padding(tail = tail′)
-    FunSQL.Resolved(FunSQL.RowType(fields, t.group), tail = q′)
+    FunSQL.Resolved(FunSQL.RowType(fields, t.group, private_fields), tail = q′)
 end
 
 mutable struct TryGetNode <: FunSQL.AbstractSQLNode
@@ -160,14 +162,15 @@ function FunSQL.resolve(n::ExplainConceptIdNode, ctx)
             left_join(
                 from(concept).define(args = $(n.args)).as($alias),
                 $f == $alias.concept_id,
-                optional = true)
+                optional = true,
+                private = true)
         end
         defs = [Symbol("$prefix$label") => @funsql($alias.$label) for label in keys(n.label_map)]
         dup_field_aliases = [first(def) for def in defs if haskey(t.fields, first(def))]
         if !isempty(dup_field_aliases)
             q = q |> Undefine(names = dup_field_aliases)
         end
-        q = q |> FunSQL.Define(args = defs, after = f)
+        q = q |> FunSQL.Define(args = defs, after = f, private = (f in t.private_fields))
         if n.replace
             q = q |> Undefine(f)
         end
@@ -180,19 +183,21 @@ mutable struct SummaryNode <: FunSQL.TabularNode
     type::Bool
     top_k::Int
     nested::Bool
+    private::Bool
     exact::Bool
 
-    SummaryNode(; names = Symbol[], type = true, top_k = 0, nested = false, exact = false) =
-        new(names, type, top_k, nested, exact)
+    SummaryNode(; names = Symbol[], type = true, top_k = 0, nested = false, private = false, exact = false) =
+        new(names, type, top_k, nested, private, exact)
 end
 
-SummaryNode(names...; type = true, top_k = 0, nested = false, exact = false) =
-    SummaryNode(names = Symbol[names...], type = type, top_k = top_k, nested = nested, exact = exact)
+SummaryNode(names...; type = true, top_k = 0, nested = false, private = false, exact = false) =
+    SummaryNode(names = Symbol[names...], type = type, top_k = top_k, nested = nested, private = private, exact = exact)
 
 const Summary = FunSQL.SQLQueryCtor{SummaryNode}(:Summary)
 
 const funsql_summary = Summary
 const funsql_density = Summary
+const funsql_summarize = Summary
 
 function FunSQL.PrettyPrinting.quoteof(n::SummaryNode, ctx::FunSQL.QuoteContext)
     ex = Expr(:call, :Summary, FunSQL.quoteof(n.names, ctx)...)
@@ -205,6 +210,9 @@ function FunSQL.PrettyPrinting.quoteof(n::SummaryNode, ctx::FunSQL.QuoteContext)
     if n.nested
         push!(ex.args, Expr(:kw, :nested, n.nested))
     end
+    if n.private
+        push!(ex.args, Expr(:kw, :private, n.private))
+    end
     if n.exact
         push!(ex.args, Expr(:kw, :exact, n.exact))
     end
@@ -224,7 +232,7 @@ function FunSQL.resolve(n::SummaryNode, ctx)
         end
     end
     names = isempty(n.names) ? Set(keys(t.fields)) : Set(n.names)
-    cases = _summary_cases(t, names, n.nested)
+    cases = _summary_cases(t, names, n.nested || n.private)
     if isempty(cases) && !n.nested
         cases = _summary_cases(t, names, true)
     end
@@ -255,20 +263,23 @@ function FunSQL.resolve(n::SummaryNode, ctx)
     q = @funsql begin
         $tail′
         group()
-        cross_join(summary_case => from(explode(sequence(1, $max_i)), columns = [index]))
+        cross_join(
+            summary_case => from(explode(sequence(1, $max_i)), columns = [index]),
+            private = true)
         define(args = $args)
     end
     FunSQL.resolve(q, ctx)
 end
 
-function _summary_cases(t, name_set, nested)
+function _summary_cases(t, name_set, private)
     cases = Tuple{String, FunSQL.SQLQuery}[]
     for (f, ft) in t.fields
         f in name_set || continue
+        !(f in t.private_fields) || private || continue
         if ft isa FunSQL.ScalarType
             push!(cases, (String(f), FunSQL.Get(f)))
-        elseif ft isa FunSQL.RowType && nested
-            subcases = _summary_cases(ft, Set(keys(ft.fields)), nested)
+        elseif ft isa FunSQL.RowType
+            subcases = _summary_cases(ft, Set(keys(ft.fields)), private)
             for (n, q) in subcases
                 push!(cases, ("$f.$n", FunSQL.Get(f) |> q))
             end
@@ -507,7 +518,7 @@ function resolve_concept_id(cat::FunSQL.SQLCatalog, n::AssertValidConceptNode)
     m !== nothing && m.concept_cache !== nothing || return
     (conn, dir) = m.concept_cache
     db = FunSQL.SQLConnection(conn, catalog = cat)
-    q = @funsql concept($(n.condition)).order(concept_id).limit(3)
+    q = @funsql concept().filter($(n.condition)).order(concept_id).limit(3)
     sql = FunSQL.render(db, q)
     key = bytes2hex(sha256(sql))
     filename = joinpath(dir, key * ".arrow")