implement suggestions from review

Author: thomasp85

CHANGELOG.md

@@ -5,19 +5,7 @@
 - New `aggregate` SETTING on Identity-stat layers (point, line, area, bar, ribbon,
   range, segment, arrow, rule, text). By default it collapses each group to a
   single row by replacing every numeric mapping in place with its aggregated
-  value. Accepts a single string or array of strings; entries are either
-  unprefixed defaults (`'mean'`) or per-aesthetic targets (`'y:max'`,
-  `'color:median'`). Up to two defaults may be supplied — the first applies to
-  lower-half aesthetics plus all non-range layers, the second to upper-half
-  (`max`/`end` suffix). Numeric mappings without a target or applicable default
-  are dropped with a warning. Targeting the same aesthetic more than once
-  (e.g. `aggregate => ('y:min', 'y:max')`) produces one row per function with
-  a synthetic `aggregate` column tagging each row, available for `REMAPPING` to
-  another aesthetic; targets with a single function and the unprefixed defaults
-  are reused unchanged across the exploded rows. The `aggregate` column's value
-  is built from the dedup-and-joined function names of all exploded targets at
-  each row, separated by `/` (so `('y:min', 'y:max', 'color:sum', 'color:prod')`
-  yields `'min/sum'` and `'max/prod'`). Mixed lengths above 1 are an error.
+  value. See the `DRAW` documentation for details.
 - Added panel decorations (grid lines, axes, background) for polar coordinates (#156).
 - Added `radar` setting to polar coordinates for making radar plots (#418).
 
@@ -27,7 +15,7 @@
 
 - Side effects like `CREATE TEMP TABLE` before the `VISUALISE` statement are now
   separated from directly feeding into the visualisation data (#415)
-- Fixed bug where panel axes were unintentionally anchored to zero when using 
+- Fixed bug where panel axes were unintentionally anchored to zero when using
   `FACET ... SETTING free => 'x'/'y'` (#410).
 - Fixed bug where faceted data were matched to the incorrect panels (#409)
 
@@ -47,7 +35,6 @@ issues on Linux and macOS caused by relative paths to dynamic libraries.
 
 ### Added
 
-
 - Add cell delimiters and code lens actions to the Positron extension (#366)
 - ODBC is now turned on for the CLI as well (#344)
 - `FROM` can now come before `VISUALIZE`, mirroring the DuckDB style. This means
@@ -96,7 +83,6 @@ portion (#364).
 - Removed polars from dependency list along with all its transient dependencies. Rewrote DataFrame struct on top of arrow (#350)
 - Moved ggsql-python to its own repo (posit-dev/ggsql-python) and cleaned up any additional references to it
 - Moved ggsql-r to its own repo (posit-dev/ggsql-r)
-- The `orientation` setting on `ribbon` and `range` layers. With explicit `xmin`/`xmax` or `ymin`/`ymax` mappings, orientation is unambiguous and is auto-detected from the mappings; the override is no longer needed.
 
 ## [2.7.0] - 2026-04-20
 

src/naming.rs

@@ -240,6 +240,22 @@ pub fn quote_ident(name: &str) -> String {
     format!("\"{}\"", name.replace('"', "\"\""))
 }
 
+/// Quote a SQL string literal: wraps in single quotes and escapes embedded
+/// single quotes by doubling them, per the SQL standard.
+///
+/// Use this when interpolating user-supplied (or otherwise variable) string
+/// values into SQL literals — e.g. `WHERE name = 'O''Brien'`.
+///
+/// # Example
+/// ```
+/// use ggsql::naming;
+/// assert_eq!(naming::quote_literal("foo"), "'foo'");
+/// assert_eq!(naming::quote_literal("O'Brien"), "'O''Brien'");
+/// ```
+pub fn quote_literal(s: &str) -> String {
+    format!("'{}'", s.replace('\'', "''"))
+}
+
 // ============================================================================
 // Detection Functions
 // ============================================================================

src/plot/layer/geom/area.rs

@@ -51,6 +51,7 @@ impl GeomTrait for Area {
                 default: DefaultParamValue::String(ALIGNED),
                 constraint: ParamConstraint::string_option(ORIENTATION_VALUES),
             },
+            super::types::AGGREGATE_PARAM,
         ];
         PARAMS
     }

src/plot/layer/geom/arrow.rs

@@ -32,11 +32,14 @@ impl GeomTrait for Arrow {
     }
 
     fn default_params(&self) -> &'static [ParamDefinition] {
-        const PARAMS: &[ParamDefinition] = &[ParamDefinition {
-            name: "position",
-            default: DefaultParamValue::String("identity"),
-            constraint: ParamConstraint::string_option(POSITION_VALUES),
-        }];
+        const PARAMS: &[ParamDefinition] = &[
+            ParamDefinition {
+                name: "position",
+                default: DefaultParamValue::String("identity"),
+                constraint: ParamConstraint::string_option(POSITION_VALUES),
+            },
+            super::types::AGGREGATE_PARAM,
+        ];
         PARAMS
     }
 

src/plot/layer/geom/bar.rs

@@ -72,6 +72,7 @@ impl GeomTrait for Bar {
                 default: DefaultParamValue::String("stack"),
                 constraint: ParamConstraint::string_option(POSITION_VALUES),
             },
+            super::types::AGGREGATE_PARAM,
         ];
         PARAMS
     }

src/plot/layer/geom/line.rs

@@ -33,11 +33,14 @@ impl GeomTrait for Line {
     }
 
     fn default_params(&self) -> &'static [ParamDefinition] {
-        const PARAMS: &[ParamDefinition] = &[ParamDefinition {
-            name: "orientation",
-            default: DefaultParamValue::String(ALIGNED),
-            constraint: ParamConstraint::string_option(ORIENTATION_VALUES),
-        }];
+        const PARAMS: &[ParamDefinition] = &[
+            ParamDefinition {
+                name: "orientation",
+                default: DefaultParamValue::String(ALIGNED),
+                constraint: ParamConstraint::string_option(ORIENTATION_VALUES),
+            },
+            super::types::AGGREGATE_PARAM,
+        ];
         PARAMS
     }
 

src/plot/layer/geom/mod.rs

@@ -296,9 +296,6 @@ pub trait GeomTrait: std::fmt::Debug + std::fmt::Display + Send + Sync {
         for param in self.default_params() {
             valid.push(param.name);
         }
-        if self.supports_aggregate() {
-            valid.push("aggregate");
-        }
         valid
     }
 }

src/plot/layer/geom/point.rs

@@ -31,11 +31,14 @@ impl GeomTrait for Point {
     }
 
     fn default_params(&self) -> &'static [ParamDefinition] {
-        const PARAMS: &[ParamDefinition] = &[ParamDefinition {
-            name: "position",
-            default: DefaultParamValue::String("identity"),
-            constraint: ParamConstraint::string_option(POSITION_VALUES),
-        }];
+        const PARAMS: &[ParamDefinition] = &[
+            ParamDefinition {
+                name: "position",
+                default: DefaultParamValue::String("identity"),
+                constraint: ParamConstraint::string_option(POSITION_VALUES),
+            },
+            super::types::AGGREGATE_PARAM,
+        ];
         PARAMS
     }
 

src/plot/layer/geom/range.rs

@@ -41,6 +41,7 @@ impl GeomTrait for Range {
                 default: DefaultParamValue::Number(10.0),
                 constraint: ParamConstraint::number_min(0.0),
             },
+            super::types::AGGREGATE_PARAM,
         ];
         PARAMS
     }

src/plot/layer/geom/ribbon.rs

@@ -32,11 +32,14 @@ impl GeomTrait for Ribbon {
     }
 
     fn default_params(&self) -> &'static [ParamDefinition] {
-        const PARAMS: &[ParamDefinition] = &[ParamDefinition {
-            name: "position",
-            default: DefaultParamValue::String("identity"),
-            constraint: ParamConstraint::string_option(POSITION_VALUES),
-        }];
+        const PARAMS: &[ParamDefinition] = &[
+            ParamDefinition {
+                name: "position",
+                default: DefaultParamValue::String("identity"),
+                constraint: ParamConstraint::string_option(POSITION_VALUES),
+            },
+            super::types::AGGREGATE_PARAM,
+        ];
         PARAMS
     }