Merged PRs

dolt

• 9474: go/store/nbs: file_table_persister.go: Let PruneTableFiles clean up old archive files as well.
  Fix a bug where a conjoin running during PruneTableFiles could cause errors, instead of the code correctly ignoring the removed files.
• 9466: refactor(import): show actual arg count in import error messages
  Update import command validation to display the number of arguments received when validation fails. Previously, errors only showed "expected 1 or 2 arguments" without indicating how many were actually provided. Now shows "expected 1 argument (for stdin) or 2 arguments (table and file), but received N" for clearer debugging.
  The argparser already shows argument counts for too many arguments (e.g. "Expected at most 2, found 3"), but this change ensures consistent messaging for all validation cases.
  Refs: #1083
• 9465: Bug fix: Copy lookup details for dolt_commit_diff
  When used in a join (e.g. LEFT JOIN) that requires a table's partitions to be loaded multiple times, a bug in the dolt_commit_diff was preventing the query from running. This change fixes that by making a copy of the lookup details before the dolt_commit_diff system table alters them, so that the original lookup data can be preserved for any future calls to get table partitions.
• 9443: Dolt Rm CLI command
  Adds dolt rm command for the cli. Uses the dolt_rm() stored procedure and takes the same options (currently only --cached).
• 9433: --set-upstream and improved --track for dolt branch
  Adds --set-upstream as an option to dolt branch, alongside making --track more ubiquitous.
  Both now allow you to set the upstream remote for both an existing or new branch, along with or excluding a starting commit.
• 9429: refactor(import): show actual arg count in import error messages

  Description

  This addresses the second comment/request in #1083. It improves the error messages for dolt table import when incorrect argument counts are provided.

  Problem

  Previously, when users provided the wrong number of arguments to dolt table import, they would see:
  expected 1 or 2 arguments
  This message didn't indicate how many arguments were actually provided, making it difficult to debug command issues.

  Solution

  Updated the argument validation to show the actual argument count:
  • For 0 arguments:
    expected 1 argument (for stdin) or 2 arguments (table and file), but received 0
  • For >2 arguments:
    "expected at most 2 arguments (table and file), but received N
    Additionally, the argparser now shows all provided arguments when there are too many, e.g.:
    error: import has too many positional arguments.
    Expected at most 2, found 3: year,state_fips, precinct_results, test.csv

  Testing

  Added bats tests to verify the improved error messages:
  • Test for 0 arguments case
  • Test for valid 1 argument case (stdin)
  • Test for the specific -pks flag issue mentioned in #1083

Closed Issues

• 7623: Migrate dolt stash to SQL
• 8476: Add --upstream option to branch
• 9424: Foreign Keys with enum columns
• 9292: Push not updating remote branches table
• 9449: Querying garbage collection config at runtime