Fixes a typo in a setting name.

7 years ago · 11e7d7d3b2
parent 207b11bee1
commit 11e7d7d3b2
4 changed files with 5 additions and 5 deletions
--- a/ringo-app/src/Ringo/ArgParser.hs
+++ b/ringo-app/src/Ringo/ArgParser.hs
@ -43,7 +43,7 @@ settingsParser = let Settings {..} = defSettings
                         <> help ("Time unit granularity for fact tables. Possible values: "
                                    ++ intercalate ", " timeunits))
     <*> minorOption "avg-count-col-suffix"
-                     settingAvgCountColumSuffix
+                     settingAvgCountColumnSuffix
                     "Suffix for average count columns"
     <*> minorOption "avg-sum-col-suffix"
                     settingAvgSumColumnSuffix
--- a/ringo/src/Ringo/Extractor.hs
+++ b/ringo/src/Ringo/Extractor.hs
@ -45,7 +45,7 @@ extractFactTable fact = do
          FactMax {..}           -> [ notNullSourceColumnRename factColSourceColumn cName ]
          FactMin {..}           -> [ notNullSourceColumnRename factColSourceColumn cName ]
          FactAverage {..}       ->
-            [ Column (cName <> settingAvgCountColumSuffix) countColType NotNull
+            [ Column (cName <> settingAvgCountColumnSuffix) countColType NotNull
            , notNullSourceColumnRename factColSourceColumn (cName <> settingAvgSumColumnSuffix)
            ]
          _                      -> []
--- a/ringo/src/Ringo/Generator/Populate/Fact.hs
+++ b/ringo/src/Ringo/Generator/Populate/Fact.hs
@ -162,7 +162,7 @@ factTablePopulateStmts popMode fact = do
          FactMax {..}           -> [ (cName, app' "max" factColSourceColumn, False) ]
          FactMin {..}           -> [ (cName, app' "min" factColSourceColumn, False) ]
          FactAverage {..}       ->
-            [ ( cName <> settingAvgCountColumSuffix, app' "count" factColSourceColumn, False )
+            [ ( cName <> settingAvgCountColumnSuffix, app' "count" factColSourceColumn, False )
            , ( cName <> settingAvgSumColumnSuffix , app' "sum" factColSourceColumn  , False)
            ]
          _                      -> []
--- a/ringo/src/Ringo/Types/Internal.hs
+++ b/ringo/src/Ringo/Types/Internal.hs
@ -121,7 +121,7 @@ data Settings = Settings
                { settingDimPrefix                  :: !Text
                , settingFactPrefix                 :: !Text
                , settingTimeUnit                   :: !TimeUnit
-                , settingAvgCountColumSuffix        :: !Text
+                , settingAvgCountColumnSuffix       :: !Text
                , settingAvgSumColumnSuffix         :: !Text
                , settingDimTableIdColumnName       :: !Text
                , settingDimTableIdColumnType       :: !Text
@ -140,7 +140,7 @@ defSettings = Settings
              { settingDimPrefix                  = "dim_"
              , settingFactPrefix                 = "fact_"
              , settingTimeUnit                   = Minute
-              , settingAvgCountColumSuffix        = "_count"
+              , settingAvgCountColumnSuffix       = "_count"
              , settingAvgSumColumnSuffix         = "_sum"
              , settingDimTableIdColumnName       = "id"
              , settingDimTableIdColumnType       = "serial"