graph, store: Rename count to AggregateFn::Count

Author: lutter

graph/src/schema/input_schema.rs

@@ -440,7 +440,7 @@ pub enum AggregateFn {
     Sum,
     Max,
     Min,
-    Cnt,
+    Count,
     First,
     Last,
 }
@@ -453,7 +453,7 @@ impl FromStr for AggregateFn {
             "sum" => Ok(AggregateFn::Sum),
             "max" => Ok(AggregateFn::Max),
             "min" => Ok(AggregateFn::Min),
-            "count" => Ok(AggregateFn::Cnt),
+            "count" => Ok(AggregateFn::Count),
             "first" => Ok(AggregateFn::First),
             "last" => Ok(AggregateFn::Last),
             _ => Err(anyhow!("invalid aggregate function `{}`", s)),
@@ -466,7 +466,7 @@ impl AggregateFn {
         use AggregateFn::*;
         match self {
             Sum | Max | Min | First | Last => true,
-            Cnt => false,
+            Count => false,
         }
     }
 
@@ -476,7 +476,7 @@ impl AggregateFn {
             Sum => "sum",
             Max => "max",
             Min => "min",
-            Cnt => "count",
+            Count => "count",
             First => "first",
             Last => "last",
         }

store/postgres/src/relational/rollup.rs

@@ -51,7 +51,7 @@ impl<'a> Agg<'a> {
             Min => write!(w, "min(\"{}\")", self.src_column.unwrap().name)?,
             First => write!(w, "first(\"{}\")", self.src_column.unwrap().name)?,
             Last => write!(w, "last(\"{}\")", self.src_column.unwrap().name)?,
-            Cnt => write!(w, "count(*)")?,
+            Count => write!(w, "count(*)")?,
         }
         write!(w, " as \"{}\"", self.agg_column.name)
     }