Adds max and min fact column types.

app/Ringo/InputParser.hs

@@ -59,6 +59,8 @@ instance FromJSON FactColumn where
       "factsum"           -> FactSum           <$> o .: "sourcecolumn"  <*> o .: "column"
       "factaverage"       -> FactAverage       <$> o .: "sourcecolumn"  <*> o .: "column"
       "factcountdistinct" -> FactCountDistinct <$> o .:? "sourcecolumn" <*> o .: "column"
+      "factmax"           -> FactMax           <$> o .: "sourcecolumn"  <*> o .: "column"
+      "factmin"           -> FactMin           <$> o .: "sourcecolumn"  <*> o .: "column"
       _                   -> fail $ "Invalid fact column type: " ++ cType
   parseJSON o          = fail $ "Cannot parse fact column: " ++ show o
 

src/Ringo/Extractor.hs

@@ -37,6 +37,8 @@ extractFactTable fact = do
         TenantId cName            -> [ notNullSourceColumnCopy cName ]
         FactCount _ cName         -> [ Column cName countColType NotNull ]
         FactSum scName cName      -> [ notNullSourceColumnRename scName cName ]
+        FactMax scName cName      -> [ notNullSourceColumnRename scName cName ]
+        FactMin scName cName      -> [ notNullSourceColumnRename scName cName ]
         FactAverage scName cName  ->
           [ Column (cName <> settingAvgCountColumSuffix) countColType NotNull
           , notNullSourceColumnRename scName (cName <> settingAvgSumColumnSuffix)

src/Ringo/Generator/Populate/Fact.hs

@@ -141,6 +141,10 @@ factTablePopulateSQL popMode fact = do
           [ (cName, "count(" <> maybe "*" (fullColumnName fTableName) scName <> ")", False) ]
         FactSum scName cName      ->
           [ (cName, "sum(" <> fullColumnName fTableName scName <> ")", False) ]
+        FactMax scName cName      ->
+          [ (cName, "max(" <> fullColumnName fTableName scName <> ")", False) ]
+        FactMin scName cName      ->
+          [ (cName, "min(" <> fullColumnName fTableName scName <> ")", False) ]
         FactAverage scName cName  ->
           [ ( cName <> settingAvgCountColumSuffix
             , "count(" <> fullColumnName fTableName scName <> ")"

src/Ringo/Types.hs

@@ -57,6 +57,8 @@ data FactColumn = DimTime           !ColumnName
                 | FactSum           !ColumnName         !ColumnName
                 | FactAverage       !ColumnName         !ColumnName
                 | FactCountDistinct !(Maybe ColumnName) !ColumnName
+                | FactMax           !ColumnName         !ColumnName
+                | FactMin           !ColumnName         !ColumnName
                 deriving (Eq, Show)
 
 factSourceColumnName :: FactColumn -> Maybe ColumnName
@@ -69,6 +71,8 @@ factSourceColumnName (FactCount cName _)         = cName
 factSourceColumnName (FactSum cName _)           = Just cName
 factSourceColumnName (FactAverage cName _)       = Just cName
 factSourceColumnName (FactCountDistinct cName _) = cName
+factSourceColumnName (FactMax cName _)           = Just cName
+factSourceColumnName (FactMin cName _)           = Just cName
 
 data Settings = Settings
                 { settingDimPrefix                  :: !Text