fix(sql): qualify JoinKind/SortDir constructors to Ast.* - #1
Merged
Conversation
`Inner`/`Left`/`Right` (JoinKind) and `Asc`/`Desc` (SortDir) are declared by both `Ast` and `DataFrame`, so under current march they are ambiguous wherever both modules are in scope — 17 errors across build.march and compile.march that any consumer inherits (found compiling bastion). Every site here means the SQL AST's own constructors, so all qualify to `Ast.*`. Same treatment as f11be60 did for the `Expr.*` collisions, and the doctests in build.march are qualified along with the code they document so they keep running. `forge check`, `forge build` and `forge lint --strict` are clean against march main-a5c3dc70. `forge test` does not yet compile on that toolchain, for two reasons that are not this change: six `Module Depot.* not found` resolution failures, and test/eq_impls.march's universal `impl Eq(a)` now colliding with a built-in implementation (coherence). Both are unchanged by this commit and want separate fixes.
Ch4s3
added a commit
to march-language/conduit
that referenced
this pull request
Jul 29, 2026
…ted)
forge.toml declared depot via { registry = "forge", version = "0.1.0" },
switched from a path dep in bcead90 ("prepare conduit 0.1.0 for forge
registry publish"). forge's RegistryDep resolution is an unbuilt
placeholder (forge/lib/cmd_deps.ml: "RegistryDep: placeholder (registry
not yet built)"), so that dependency silently resolved to nothing —
depot was completely absent from MARCH_LIB_PATH, and every depot-backed
module (Db, Pool, Connection, ParamText, ...) in postgres.march showed as
unknown. This has been the actual cause of CI failing since that commit;
none of it was related to the March version bump in this branch.
CI's workflow already clones depot to ../depot specifically for this,
so switching back to a path dep re-enables what CI was built for.
Verified against a from-scratch sandbox: fresh depot clone, march built
from upstream main (after merging march-language/march#106 and
march-language/depot#1, both required for this to typecheck) — forge
build and forge test --release both pass clean (167 tests, 0 failures).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Inner/Left/Right(JoinKind) andAsc/Desc(SortDir) are declared by bothAstandDataFrame, so under current march they are ambiguous wherever both modules are in scope — 17 errors acrosslib/sql/build.marchandlib/sql/compile.marchthat any consumer inherits. Found while compiling bastion.Every site here means the SQL AST's own constructors, so all qualify to
Ast.*. Same treatment f11be60 gave theExpr.*collisions. The doctests inbuild.marchare qualified along with the code they document so they keep running.Verification
forge check,forge buildandforge lint --strictclean against marchmain+ march-language/march#106.forge testdoes not yet compile on that toolchain, for two reasons this PR does not touch and does not introduce:Module `Depot.*` not foundresolution failures — fixed by fix(resolver): resolve modules by declared name; stop silently dropping test modules march#106, which this was verified againsttest/eq_impls.march's universalimpl Eq(a)now collides with a built-in implementation (coherence). Removing that file clears it, but it exists for a reason (it discharges Eq constraints for the whole test compilation unit), so that wants its own decisionBoth are unchanged by this commit.