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

Moves type default value validations to run only on DimVal and NoDimId fact column.

Browse Source 
Instead of running on all columns.
This commit is contained in:
Abhinav Sarkar 2015-12-29 16:24:40 +05:30
parent d758dc3310
commit 87a787ba8f
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Ringo/Validator.hs
View File

@ -25,12 +25,7 @@ checkTableForCol tab colName =
validateTable :: Table -> Reader Env [ValidationError] validateTable :: Table -> Reader Env [ValidationError]
validateTable table = do validateTable table = do
tables <- asks envTables tables <- asks envTables
defaults <- Map.keys <$> asks envTypeDefaults return . concatMap (checkConstraint tables) . tableConstraints $ table
let constVs = concatMap (checkConstraint tables) . tableConstraints $ table
typeDefaultVs = [ MissingTypeDefault cType
| Column _ cType _ <- tableColumns table
, null . filter (`Text.isPrefixOf` cType) $ defaults] -- TODO only dimval columns need this check
return $ constVs ++ typeDefaultVs
where where
checkConstraint _ (PrimaryKey colName) = checkTableForCol table colName checkConstraint _ (PrimaryKey colName) = checkTableForCol table colName
checkConstraint _ (UniqueKey columnNames) = checkTableForColRefs table columnNames checkConstraint _ (UniqueKey columnNames) = checkTableForColRefs table columnNames
@ -45,20 +40,29 @@ validateTable table = do
validateFact :: Fact -> Reader Env [ValidationError] validateFact :: Fact -> Reader Env [ValidationError]
validateFact Fact {..} = do validateFact Fact {..} = do
tables <- asks envTables tables <- asks envTables
defaults <- Map.keys <$> asks envTypeDefaults
case findTable factTableName tables of case findTable factTableName tables of
Nothing -> return [ MissingTable factTableName ] Nothing -> return [ MissingTable factTableName ]
Just table -> do Just table -> do
tableVs <- validateTable table tableVs <- validateTable table
parentVs <- concat <$> mapM checkFactParents factParentNames parentVs <- concat <$> mapM checkFactParents factParentNames
let colVs = concatMap (checkColumn tables table) factColumns let colVs = concatMap (checkColumn tables table) factColumns
let timeVs = [ MissingTimeColumn factTableName timeVs = [ MissingTimeColumn factTableName
| null [ c | DimTime c <- factColumns ] ] | null [ c | DimTime c <- factColumns ] ]
let notNullVs = [ MissingNotNullConstraint factTableName c notNullVs = [ MissingNotNullConstraint factTableName c
| DimTime c <- factColumns | DimTime c <- factColumns
, let col = findColumn c (tableColumns table) , let col = findColumn c (tableColumns table)
, isJust col , isJust col
, columnNullable (fromJust col) == Null ] , columnNullable (fromJust col) == Null ]
return $ tableVs ++ parentVs ++ colVs ++ timeVs ++ notNullVs typeDefaultVs =
[ MissingTypeDefault cType
| cName <- [ c | DimVal _ c <- factColumns ] ++ [ c | NoDimId c <- factColumns ]
, let col = findColumn cName (tableColumns table)
, isJust col
, let cType = columnType $ fromJust col
, null . filter (`Text.isPrefixOf` cType) $ defaults ]
return $ tableVs ++ parentVs ++ colVs ++ timeVs ++ notNullVs ++ typeDefaultVs
where where
checkFactParents fName = do checkFactParents fName = do
facts <- asks envFacts facts <- asks envFacts