abhin4v
/
ringo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor formatting.

master
Abhinav Sarkar 2016-07-11 23:36:39 +05:30
parent 4a874d8f46
commit 80bd3fdd9b
No known key found for this signature in database
GPG Key ID: 7C9166A6F5465AD5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ringo/src/Ringo/Generator/Create.hs
View File

@ -89,14 +89,14 @@ factTableIndexStatements fact table = do
tabName = tableName table <> settingTableNameSuffixTemplate tabName = tableName table <> settingTableNameSuffixTemplate
dimTimeColName cName = timeUnitColumnName settingDimTableIdColumnName cName settingTimeUnit dimTimeColName cName = timeUnitColumnName settingDimTableIdColumnName cName settingTimeUnit
factCols = forMaybe (factColumns fact) $ \FactColumn {factColTargetColumn = cName, ..} -> factCols = forMaybe (factColumns fact) $ \FactColumn {factColTargetColumn = cName, ..} ->
case factColType of case factColType of
DimTime -> Just [dimTimeColName cName] DimTime -> Just [dimTimeColName cName]
NoDimId -> Just [cName] NoDimId -> Just [cName]
TenantId -> Just [cName] TenantId -> Just [cName]
_ -> Nothing _ -> Nothing
dimCols = [ [ factDimFKIdColumnName settingDimPrefix settingDimTableIdColumnName dimFact dimTable tables ] dimCols = [ [ factDimFKIdColumnName settingDimPrefix settingDimTableIdColumnName dimFact dimTable tables ]
| (dimFact, dimTable) <- allDims ] | (dimFact, dimTable) <- allDims ]
tenantCols = [ [cName, dimTimeColName dimTimeCol] | cName <- maybeToList tenantIdCol ] tenantCols = [ [cName, dimTimeColName dimTimeCol] | cName <- maybeToList tenantIdCol ]

6
ringo/src/Ringo/Validator.hs
View File

@ -91,11 +91,11 @@ validateEnv tables facts settings@Settings {..} typeDefaults = let
tableVs <- concat <$> mapM validateTable tables tableVs <- concat <$> mapM validateTable tables
factVs <- concat <$> mapM validateFact facts factVs <- concat <$> mapM validateFact facts
let dupTableVs = [ DuplicateTable table | table <- findDups . map tableName $ tables ] let dupTableVs = [ DuplicateTable table | table <- findDups . map tableName $ tables ]
let dupFactVs = [ DuplicateFact fact | fact <- findDups . map factName $ facts ] dupFactVs = [ DuplicateFact fact | fact <- findDups . map factName $ facts ]
let dupColVs = [ DuplicateColumn tableName col dupColVs = [ DuplicateColumn tableName col
| Table{..} <- tables | Table{..} <- tables
, col <- findDups . map columnName $ tableColumns ] , col <- findDups . map columnName $ tableColumns ]
let dupDimVs = facts dupDimVs = facts
>>- concatMap (dimColumnMappings settingDimPrefix) >>- concatMap (dimColumnMappings settingDimPrefix)
>>> sort >>> sort
>>> groupBy ((==) `on` fst) >>> groupBy ((==) `on` fst)