Skip to content
Open
57 changes: 15 additions & 42 deletions src/execute/layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ fn process_annotation_layer(layer: &mut Layer, dialect: &dyn SqlDialect) -> Resu
// non-positional scalar parameters (e.g., PLACE rule SETTING stroke => 'red')
if annotation_params.is_empty() {
// Add a dummy column so we can generate a valid VALUES clause
annotation_params.push(("__ggsql_dummy__".to_string(), ParameterValue::Number(1.0)));
annotation_params.push(("__ggsql_dummy__".to_string(), 1.0.into()));
}

// Step 3: Determine max array length from all annotation parameters
Expand Down Expand Up @@ -1003,16 +1003,9 @@ mod tests {
let mut layer = Layer::new(Geom::text());
layer.source = Some(DataSource::Annotation);
// Put values in parameters (not mappings) - process_annotation_layer will process them
layer
.parameters
.insert("pos1".to_string(), ParameterValue::Number(5.0));
layer
.parameters
.insert("pos2".to_string(), ParameterValue::Number(10.0));
layer.parameters.insert(
"label".to_string(),
ParameterValue::String("Test".to_string()),
);
layer.parameters.insert("pos1".to_string(), 5.0.into());
layer.parameters.insert("pos2".to_string(), 10.0.into());
layer.parameters.insert("label".to_string(), "Test".into());

let result = process_annotation_layer(&mut layer, &AnsiDialect).unwrap();

Expand Down Expand Up @@ -1045,13 +1038,8 @@ mod tests {
ArrayElement::Number(3.0),
]),
);
layer
.parameters
.insert("pos2".to_string(), ParameterValue::Number(10.0));
layer.parameters.insert(
"label".to_string(),
ParameterValue::String("Same".to_string()),
);
layer.parameters.insert("pos2".to_string(), 10.0.into());
layer.parameters.insert("label".to_string(), "Same".into());

let result = process_annotation_layer(&mut layer, &AnsiDialect).unwrap();

Expand Down Expand Up @@ -1125,16 +1113,9 @@ mod tests {
fn test_annotation_mixed_types() {
let mut layer = Layer::new(Geom::text());
layer.source = Some(DataSource::Annotation);
layer
.parameters
.insert("pos1".to_string(), ParameterValue::Number(5.0));
layer
.parameters
.insert("pos2".to_string(), ParameterValue::Number(10.0));
layer.parameters.insert(
"label".to_string(),
ParameterValue::String("Text".to_string()),
);
layer.parameters.insert("pos1".to_string(), 5.0.into());
layer.parameters.insert("pos2".to_string(), 10.0.into());
layer.parameters.insert("label".to_string(), "Text".into());

let result = process_annotation_layer(&mut layer, &AnsiDialect).unwrap();

Expand All @@ -1151,7 +1132,7 @@ mod tests {
use arrow::datatypes::DataType;

// Date literal should parse to Date32 type
let array = literal_to_array(&ParameterValue::String("1973-06-01".to_string()), 5);
let array = literal_to_array(&"1973-06-01".into(), 5);
assert_eq!(
array.data_type(),
&DataType::Date32,
Expand All @@ -1166,10 +1147,7 @@ mod tests {
use arrow::datatypes::{DataType, TimeUnit};

// DateTime literal should parse to Timestamp type
let array = literal_to_array(
&ParameterValue::String("2024-03-17T14:30:00".to_string()),
3,
);
let array = literal_to_array(&"2024-03-17T14:30:00".into(), 3);
assert!(
matches!(
array.data_type(),
Expand All @@ -1186,7 +1164,7 @@ mod tests {
use arrow::datatypes::{DataType, TimeUnit};

// Time literal should parse to Time64 type
let array = literal_to_array(&ParameterValue::String("14:30:00".to_string()), 4);
let array = literal_to_array(&"14:30:00".into(), 4);
assert_eq!(
array.data_type(),
&DataType::Time64(TimeUnit::Nanosecond),
Expand All @@ -1201,7 +1179,7 @@ mod tests {
use arrow::datatypes::DataType;

// Non-temporal string should remain Utf8 type
let array = literal_to_array(&ParameterValue::String("not a date".to_string()), 2);
let array = literal_to_array(&"not a date".into(), 2);
assert_eq!(
array.data_type(),
&DataType::Utf8,
Expand All @@ -1216,13 +1194,8 @@ mod tests {
let mut layer = Layer::new(Geom::rule());
layer.source = Some(DataSource::Annotation);
// Only non-positional, non-required scalar parameters
layer.parameters.insert(
"stroke".to_string(),
ParameterValue::String("red".to_string()),
);
layer
.parameters
.insert("linewidth".to_string(), ParameterValue::Number(2.0));
layer.parameters.insert("stroke".to_string(), "red".into());
layer.parameters.insert("linewidth".to_string(), 2.0.into());

let result = process_annotation_layer(&mut layer, &AnsiDialect);

Expand Down
11 changes: 2 additions & 9 deletions src/execute/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -658,18 +658,11 @@ fn handle_missing_facet_columns(
None => return Ok(()),
};

// Get the missing setting (default to "repeat")
let missing_setting = facet
.properties
.get("missing")
.and_then(|v| {
if let ParameterValue::String(s) = v {
Some(s.as_str())
} else {
None
}
})
.unwrap_or("repeat");
.and_then(ParameterValue::as_str)
.expect("missing default filled by facet resolution");

// If null, do nothing (existing behavior handles this)
if missing_setting == "null" {
Expand Down
10 changes: 3 additions & 7 deletions src/execute/position.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ mod tests {
use crate::df;
use crate::plot::facet::{Facet, FacetLayout};
use crate::plot::layer::{Geom, Position};
use crate::plot::{AestheticValue, Mappings, ParameterValue, Scale, ScaleType};
use crate::plot::{AestheticValue, Mappings, Scale, ScaleType};
use arrow::array::Array;

fn make_continuous_scale(aesthetic: &str) -> Scale {
Expand Down Expand Up @@ -235,9 +235,7 @@ mod tests {
let df = make_test_df();
let mut layer = make_test_layer();
layer.position = Position::dodge();
layer
.parameters
.insert("width".to_string(), ParameterValue::Number(0.6));
layer.parameters.insert("width".to_string(), 0.6.into());

// Create spec with pos1 as discrete and pos2 as continuous
let mut spec = Plot::new();
Expand Down Expand Up @@ -316,9 +314,7 @@ mod tests {
let df = make_test_df();
let mut layer = make_test_layer();
layer.position = Position::jitter();
layer
.parameters
.insert("width".to_string(), ParameterValue::Number(0.6));
layer.parameters.insert("width".to_string(), 0.6.into());

// Create spec with pos1 as discrete and pos2 as continuous
let mut spec = Plot::new();
Expand Down
20 changes: 4 additions & 16 deletions src/execute/scale.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1769,10 +1769,7 @@ mod tests {

// Disable expansion for predictable test values
let mut scale = crate::plot::Scale::new("pos1");
scale.properties.insert(
"expand".to_string(),
crate::plot::ParameterValue::Number(0.0),
);
scale.properties = crate::params! { "expand" => -0.0 };
spec.scales.push(scale);
// Simulate post-merge state: mapping is in layer
let layer = Layer::new(Geom::point())
Expand Down Expand Up @@ -1817,10 +1814,7 @@ mod tests {
let mut scale = crate::plot::Scale::new("pos1");
scale.input_range = Some(vec![ArrayElement::Number(0.0), ArrayElement::Number(100.0)]);
// Disable expansion for predictable test values
scale.properties.insert(
"expand".to_string(),
crate::plot::ParameterValue::Number(0.0),
);
scale.properties = crate::params! { "expand" => -0.0 };
spec.scales.push(scale);
// Simulate post-merge state: mapping is in layer
let layer = Layer::new(Geom::point())
Expand Down Expand Up @@ -1911,10 +1905,7 @@ mod tests {
let mut scale = crate::plot::Scale::new("pos1");
scale.input_range = Some(vec![ArrayElement::Number(0.0), ArrayElement::Null]);
// Disable expansion for predictable test values
scale.properties.insert(
"expand".to_string(),
crate::plot::ParameterValue::Number(0.0),
);
scale.properties = crate::params! { "expand" => -0.0 };
spec.scales.push(scale);
// Simulate post-merge state: mapping is in layer
let layer = Layer::new(Geom::point())
Expand Down Expand Up @@ -1955,10 +1946,7 @@ mod tests {
let mut scale = crate::plot::Scale::new("pos1");
scale.input_range = Some(vec![ArrayElement::Null, ArrayElement::Number(100.0)]);
// Disable expansion for predictable test values
scale.properties.insert(
"expand".to_string(),
crate::plot::ParameterValue::Number(0.0),
);
scale.properties = crate::params! { "expand" => -0.0 };
spec.scales.push(scale);
// Simulate post-merge state: mapping is in layer
let layer = Layer::new(Geom::point())
Expand Down
44 changes: 21 additions & 23 deletions src/execute/table/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub(super) fn setup_formats(
) -> Result<HashMap<String, Format>> {
for (idx, format) in formats.iter().enumerate() {
format
.validate_settings()
.resolve_settings()
.map_err(|e| GgsqlError::ValidationError(format!("FORMAT {}: {}", idx + 1, e)))?;
}

Expand All @@ -47,7 +47,12 @@ pub(super) fn setup_formats(
}

// A column no clause claimed a section for resolves to the body.
// Settings were validated per clause above; resolving again post-merge
// only fills defaults.
for format in resolved.values_mut() {
format.settings = format
.resolve_settings()
.map_err(GgsqlError::ValidationError)?;
format.target.get_or_insert(ColumnSection::Body);
}
Ok(resolved)
Expand Down Expand Up @@ -186,7 +191,7 @@ mod tests {
Format {
columns: vec!["price".to_string(), "currency".to_string()],
wildcard: false,
..format_with_hjust(ParameterValue::String("left".to_string()))
..format_with_hjust("left".into())
},
];

Expand All @@ -196,21 +201,15 @@ mod tests {
// the earlier template survives; its settings are added.
let price = resolved.get("price").unwrap();
assert_eq!(price.value_template.as_deref(), Some("{:num %.2f}"));
assert_eq!(
price.settings.get("hjust"),
Some(&ParameterValue::String("left".to_string()))
);
assert_eq!(price.settings.get("hjust"), Some(&"left".into()));

let amount = resolved.get("amount").unwrap();
assert_eq!(amount.value_template.as_deref(), Some("{:num %.2f}"));
assert!(!amount.settings.contains_key("hjust"));

let currency = resolved.get("currency").unwrap();
assert_eq!(currency.value_template, None);
assert_eq!(
currency.settings.get("hjust"),
Some(&ParameterValue::String("left".to_string()))
);
assert_eq!(currency.settings.get("hjust"), Some(&"left".into()));
}

#[test]
Expand Down Expand Up @@ -317,8 +316,7 @@ mod tests {
}

fn format_with_hjust(hjust: ParameterValue) -> Format {
let mut settings = Parameters::new();
settings.insert("hjust".to_string(), hjust);
let settings = crate::params! { "hjust" => hjust };
Format {
columns: Vec::new(),
wildcard: false,
Expand All @@ -333,11 +331,11 @@ mod tests {
fn resolve_column_properties_defaults_hjust_by_dtype_when_absent() {
assert_eq!(
resolve_column_properties(&DataType::Float64, None).get("hjust"),
Some(&ParameterValue::Number(1.0))
Some(&1.0.into())
);
assert_eq!(
resolve_column_properties(&DataType::Utf8, None).get("hjust"),
Some(&ParameterValue::Number(0.0))
Some(&0.0.into())
);
}

Expand All @@ -354,38 +352,38 @@ mod tests {

assert_eq!(
resolve_column_properties(&DataType::Utf8, Some(&format)).get("hjust"),
Some(&ParameterValue::Number(1.0))
Some(&1.0.into())
);
}

#[test]
fn resolve_column_properties_standardises_keywords_to_numbers() {
let format = format_with_hjust(ParameterValue::String("left".to_string()));
let format = format_with_hjust("left".into());
assert_eq!(
resolve_column_properties(&DataType::Utf8, Some(&format)).get("hjust"),
Some(&ParameterValue::Number(0.0))
Some(&0.0.into())
);

let format = format_with_hjust(ParameterValue::String("centre".to_string()));
let format = format_with_hjust("centre".into());
assert_eq!(
resolve_column_properties(&DataType::Utf8, Some(&format)).get("hjust"),
Some(&ParameterValue::Number(0.5))
Some(&0.5.into())
);

let format = format_with_hjust(ParameterValue::String("right".to_string()));
let format = format_with_hjust("right".into());
assert_eq!(
resolve_column_properties(&DataType::Utf8, Some(&format)).get("hjust"),
Some(&ParameterValue::Number(1.0))
Some(&1.0.into())
);
}

#[test]
fn resolve_column_properties_keeps_an_explicit_number_unchanged() {
let format = format_with_hjust(ParameterValue::Number(0.25));
let format = format_with_hjust(0.25.into());

assert_eq!(
resolve_column_properties(&DataType::Float64, Some(&format)).get("hjust"),
Some(&ParameterValue::Number(0.25))
Some(&0.25.into())
);
}
}
17 changes: 4 additions & 13 deletions src/execute/table/layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -496,18 +496,9 @@ mod tests {
.get("hjust")
.cloned()
};
assert_eq!(
hjust(0, TableCellKind::ColumnLabel),
Some(ParameterValue::Number(1.0))
);
assert_eq!(
hjust(0, TableCellKind::Body),
Some(ParameterValue::Number(1.0))
);
assert_eq!(
hjust(1, TableCellKind::Body),
Some(ParameterValue::Number(0.0))
);
assert_eq!(hjust(0, TableCellKind::ColumnLabel), Some(1.0.into()));
assert_eq!(hjust(0, TableCellKind::Body), Some(1.0.into()));
assert_eq!(hjust(1, TableCellKind::Body), Some(0.0.into()));
}

#[test]
Expand Down Expand Up @@ -555,7 +546,7 @@ mod tests {
let mut table = Table::new();
table.spans = vec![
spanner(&["a", "b"]),
spanner_with_setting(&["b", "c"], "level", ParameterValue::Number(1.0)),
spanner_with_setting(&["b", "c"], "level", 1.0.into()),
];

assert!(resolve_cells(&frame, &table).is_err());
Expand Down
Loading
Loading