Skip to content

Commit 0b570ab

Browse files
committed
refactor: share target lookup and load-selection request reading
Named-target checks reuse the compile attachment's resolved_target instead of a copy, the named-target schema binding declares its keyword arguments directly, and both load-selection bindings read their request through one helper.
1 parent dc9e1c7 commit 0b570ab

4 files changed

Lines changed: 55 additions & 73 deletions

File tree

‎crates/sqlbuild-python/src/bindings/_helpers/compile_attachment/target.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const DATABASE_KEY: &str = "database";
2323
const SCHEMA_KEY: &str = "schema";
2424

2525
/// The selected target's name and merged config, or `(None, None)`.
26-
fn resolved_target<'py>(
26+
pub(crate) fn resolved_target<'py>(
2727
discovered: &Bound<'py, PyAny>,
2828
selected_target: &Bound<'py, PyAny>,
2929
) -> PyResult<(Bound<'py, PyAny>, Bound<'py, PyAny>)> {

‎crates/sqlbuild-python/src/bindings/_helpers/compile_driver/targets.rs‎

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ const DEFAULTS_HELP_PURPOSE: &str = "to set project-wide defaults";
4242
const NAMED_TARGET_HELP_PURPOSE: &str = "to build this target into that schema";
4343
use crate::bindings::_helpers::compile_attachment::effective_config::build_effective_connection_config;
4444
use crate::bindings::_helpers::compile_attachment::effective_config::build_effective_runtime_config;
45+
use crate::bindings::_helpers::compile_attachment::target::resolved_target;
4546
use crate::bindings::_helpers::contracts::spec_resolution::resolve_target_config;
46-
use crate::bindings::_helpers::contracts::spec_resolution::resolve_target_name;
4747
use crate::bindings::_helpers::discovery::guidance::setting_help;
4848
use crate::bindings::_helpers::records::construct::error_class;
4949
use crate::bindings::_helpers::records::fields::field as native_field;
@@ -148,26 +148,20 @@ fn project_setting_help(
148148

149149
/// Require shared-warehouse named targets to choose a schema strategy.
150150
#[pyfunction]
151-
#[pyo3(signature = (**options))]
151+
#[pyo3(signature = (*, discovered_inputs, adapter, selected_target, cli_vars = None))]
152152
fn validate_named_target_schema_strategy<'py>(
153-
py: Python<'py>,
154-
options: Option<Bound<'py, PyDict>>,
153+
discovered_inputs: &Bound<'py, PyAny>,
154+
adapter: &Bound<'py, PyAny>,
155+
selected_target: &Bound<'py, PyAny>,
156+
cli_vars: Option<Bound<'py, PyAny>>,
155157
) -> Result<(), PyErr> {
156-
let arguments: KeywordArguments<'py> = KeywordArguments::read(
157-
py,
158-
"validate_named_target_schema_strategy",
159-
options,
160-
(
161-
&["discovered_inputs", "adapter", "selected_target"],
162-
&["cli_vars"],
163-
),
164-
)?;
158+
let py: Python<'py> = discovered_inputs.py();
165159
named_target_schema_strategy(
166-
&arguments.value("discovered_inputs")?,
167-
&arguments.value("adapter")?,
160+
discovered_inputs,
161+
adapter,
168162
(
169-
&arguments.value("selected_target")?,
170-
&arguments.value("cli_vars")?,
163+
selected_target,
164+
&cli_vars.unwrap_or_else(|| py.None().into_bound(py)),
171165
),
172166
)
173167
}
@@ -182,10 +176,10 @@ pub(crate) fn named_target_schema_strategy(
182176
if native_field(adapter, "allows_implicit_managed_write_schema")?.is_truthy()? {
183177
return Ok(());
184178
}
185-
let Some((target_name, target_config)) = selected_target_config(discovered, selected_target)?
186-
else {
179+
let (target_name, target_config) = resolved_target(discovered, selected_target)?;
180+
if target_name.is_none() {
187181
return Ok(());
188-
};
182+
}
189183
let schema: Option<String> = text_or_none(&native_field(&target_config, "schema")?)?;
190184
if schema.is_some_and(|schema| !python_strip(&schema).is_empty()) {
191185
return Ok(());
@@ -647,9 +641,10 @@ pub(crate) fn preserved_loader_schemas(
647641
loaders: &HashSet<String>,
648642
) -> PyResult<()> {
649643
let py: Python<'_> = discovered.py();
650-
let Some((_, target_config)) = selected_target_config(discovered, selected_target)? else {
644+
let (target_name, target_config) = resolved_target(discovered, selected_target)?;
645+
if target_name.is_none() {
651646
return Ok(());
652-
};
647+
}
653648
if !text_or_none(&native_field(&target_config, "schema")?)?
654649
.is_some_and(|schema| python_strip(&schema) == PRESERVE_TARGET_VALUE)
655650
{
@@ -676,30 +671,6 @@ pub(crate) fn preserved_loader_schemas(
676671
Ok(())
677672
}
678673

679-
/// The selected target's name and configuration, or `None` when no named target is selected.
680-
fn selected_target_config<'py>(
681-
discovered: &Bound<'py, PyAny>,
682-
selected_target: &Bound<'py, PyAny>,
683-
) -> PyResult<Option<(Bound<'py, PyAny>, Bound<'py, PyAny>)>> {
684-
let py: Python<'py> = discovered.py();
685-
let project_config: Bound<'py, PyAny> = native_field(discovered, "project_config")?;
686-
let local_config: Bound<'py, PyAny> = native_field(discovered, "local_config")?;
687-
let target_name: Bound<'py, PyAny> = resolve_target_name(
688-
py,
689-
&project_config.clone(),
690-
&local_config.clone(),
691-
&selected_target.clone(),
692-
)
693-
.and_then(|value| value.into_bound_py_any(py))?;
694-
if target_name.is_none() {
695-
return Ok(None);
696-
}
697-
let target_config: Bound<'py, PyAny> =
698-
resolve_target_config(py, &project_config, &local_config, &target_name.clone())
699-
.and_then(|value| value.into_bound_py_any(py))?;
700-
Ok(Some((target_name, target_config)))
701-
}
702-
703674
/// Raise when neither the resource nor the project names a physical write schema.
704675
pub(crate) fn managed_write_schema(
705676
resource_label: &str,

‎crates/sqlbuild-python/src/bindings/_helpers/load/load_selection.rs‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -459,11 +459,33 @@ fn names(value: &Bound<'_, PyAny>) -> PyResult<Vec<String>> {
459459
value.extract()
460460
}
461461

462-
fn passed_defaults<'py>(arguments: &KeywordArguments<'py>) -> PyResult<LoaderDefaults<'py>> {
463-
Ok(LoaderDefaults {
462+
/// A Python selection request's arguments, the project it names and its loader defaults.
463+
fn selection_request<'py>(
464+
py: Python<'py>,
465+
(function, required): (&str, &[&str]),
466+
options: Option<Bound<'py, PyDict>>,
467+
) -> PyResult<(KeywordArguments<'py>, LoadProject<'py>, LoaderDefaults<'py>)> {
468+
let arguments: KeywordArguments<'py> = KeywordArguments::read(
469+
py,
470+
function,
471+
options,
472+
(
473+
required,
474+
&["loader_default_database", "loader_default_schema"],
475+
),
476+
)?;
477+
let project: LoadProject<'py> = LoadProject::new(
478+
&arguments.value("discovered_inputs")?,
479+
(
480+
&arguments.value("target_config")?,
481+
&py.None().into_bound(py),
482+
),
483+
)?;
484+
let defaults: LoaderDefaults<'py> = LoaderDefaults {
464485
database: arguments.value("loader_default_database")?,
465486
schema: arguments.value("loader_default_schema")?,
466-
})
487+
};
488+
Ok((arguments, project, defaults))
467489
}
468490

469491
/// Select source and intermediate loader execution entries for `sqb load`.
@@ -473,26 +495,20 @@ fn select_load_entries_entry<'py>(
473495
py: Python<'py>,
474496
options: Option<Bound<'py, PyDict>>,
475497
) -> PyResult<Bound<'py, PyTuple>> {
476-
let arguments: KeywordArguments<'py> = KeywordArguments::read(
498+
let (arguments, project, defaults) = selection_request(
477499
py,
478-
"select_load_entries",
479-
options,
480500
(
501+
"select_load_entries",
481502
&["discovered_inputs", "select", "exclude", "target_config"],
482-
&["loader_default_database", "loader_default_schema"],
483503
),
484-
)?;
485-
let target_config: Bound<'py, PyAny> = arguments.value("target_config")?;
486-
let project: LoadProject<'py> = LoadProject::new(
487-
&arguments.value("discovered_inputs")?,
488-
(&target_config, &py.None().into_bound(py)),
504+
options,
489505
)?;
490506
let entries: Vec<Bound<'py, PyAny>> = project.selected_entries(
491507
(
492508
&names(&arguments.value("select")?)?,
493509
&names(&arguments.value("exclude")?)?,
494510
),
495-
&passed_defaults(&arguments)?,
511+
&defaults,
496512
)?;
497513
PyTuple::new(py, entries)
498514
}
@@ -504,28 +520,19 @@ fn select_load_reference_entries<'py>(
504520
py: Python<'py>,
505521
options: Option<Bound<'py, PyDict>>,
506522
) -> PyResult<Bound<'py, PyTuple>> {
507-
let arguments: KeywordArguments<'py> = KeywordArguments::read(
523+
let (arguments, project, defaults) = selection_request(
508524
py,
509-
"select_load_reference_entries",
510-
options,
511525
(
526+
"select_load_reference_entries",
512527
&["discovered_inputs", "selected_sources", "target_config"],
513-
&["loader_default_database", "loader_default_schema"],
514528
),
515-
)?;
516-
let target_config: Bound<'py, PyAny> = arguments.value("target_config")?;
517-
let project: LoadProject<'py> = LoadProject::new(
518-
&arguments.value("discovered_inputs")?,
519-
(&target_config, &py.None().into_bound(py)),
529+
options,
520530
)?;
521531
let selected: Vec<Bound<'py, PyAny>> = arguments
522532
.value("selected_sources")?
523533
.try_iter()?
524534
.collect::<PyResult<_>>()?;
525-
PyTuple::new(
526-
py,
527-
project.reference_entries(&selected, &passed_defaults(&arguments)?)?,
528-
)
535+
PyTuple::new(py, project.reference_entries(&selected, &defaults)?)
529536
}
530537

531538
/// The default database and schema intermediate loader tables are written to.

‎fensu.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,10 @@ reason = "Each callback or worker report forwards one distinct build or check ev
14411441
paths = ["crates/sqlbuild-python/src/bindings/_helpers/command_runtime/connection.rs"]
14421442
reason = "Two Python entry points with different keyword contracts, project and named target, delegate to project_connection_config."
14431443

1444+
[[dupes.allowlist]]
1445+
paths = ["crates/sqlbuild-python/src/bindings/_helpers/load/load_selection.rs"]
1446+
reason = "Two Python entry points with different keyword contracts, selected and referenced loader entries, delegate to selection_request and LoadProject."
1447+
14441448
[[dupes.allowlist]]
14451449
paths = ["crates/sqlbuild-cli/src/native_commands/main/_location_metadata.rs", "crates/sqlbuild-cli/src/native_commands/main/_location_work.rs"]
14461450
reason = "Metadata sync keeps its pending page for retry and work polling drops the failed request; each reports its own failure."

0 commit comments

Comments
 (0)