Moves SQL type defaults to input json from code.

pull/1/head
Abhinav Sarkar 7 years ago
parent 8a530618e4
commit bcd210e7a5
  1. 6
      app/Main.hs
  2. 8
      app/Ringo/InputParser.hs
  3. 26
      src/Ringo/Generator.hs
  4. 20
      src/Ringo/Types.hs
  5. 14
      src/Ringo/Validator.hs

@ -24,9 +24,9 @@ main = do
ProgArgs {..} <- parseArgs
result <- parseInput progInputFile
case result of
Left err -> putStrLn err >> exitFailure
Right (tables, facts) -> do
let env = Env tables facts progSettings
Left err -> putStrLn err >> exitFailure
Right (tables, facts, defaults) -> do
let env = Env tables facts progSettings defaults
let errors = nub $ concatMap (validateTable env) tables ++ concatMap (validateFact env) facts
if not $ null errors
then mapM_ print errors >> exitFailure

@ -68,15 +68,15 @@ instance FromJSON Fact where
<*> o .: "columns"
parseJSON o = fail $ "Cannot parse fact: " ++ show o
data Input = Input [Table] [Fact] deriving (Eq, Show)
data Input = Input [Table] [Fact] TypeDefaults deriving (Eq, Show)
instance FromJSON Input where
parseJSON (Object o) = Input <$> o .: "tables" <*> o .: "facts"
parseJSON (Object o) = Input <$> o .: "tables" <*> o .: "facts" <*> o .: "defaults"
parseJSON o = fail $ "Cannot parse input: " ++ show o
parseInput :: FilePath -> IO (Either String ([Table], [Fact]))
parseInput :: FilePath -> IO (Either String ([Table], [Fact], TypeDefaults))
parseInput file = do
result <- decodeFileEither file
return $ case result of
Left pe -> Left $ prettyPrintParseException pe
Right (Input tables facts) -> Right (tables, facts)
Right (Input tables facts defaults) -> Right (tables, facts, defaults)

@ -5,6 +5,7 @@ module Ringo.Generator
, factTablePopulateSQL
) where
import qualified Data.Map as Map
import qualified Data.Text as Text
#if MIN_VERSION_base(4,8,0)
@ -77,33 +78,33 @@ dimColumnMapping dimPrefix fact dimTableName =
[ (dimColumnName dName cName, cName)
| DimVal dName cName <- factColumns fact , dimPrefix <> dName == dimTableName]
coalesceColumn :: TableName -> Column -> Text
coalesceColumn tName Column{..} =
coalesceColumn :: TypeDefaults -> TableName -> Column -> Text
coalesceColumn defaults tName Column{..} =
if columnNullable == Null
then "coalesce(" <> fqColName <> "," <> defVal columnType <> ")"
else fqColName
where
fqColName = fullColName tName columnName
defVal colType
| "integer" `Text.isPrefixOf` colType = "-42"
| "timestamp" `Text.isPrefixOf` colType = "'00-00-00 00:00:00'"
| "character" `Text.isPrefixOf` colType = "'XXX_UNKNOWN_'"
| "uuid" `Text.isPrefixOf` colType = "'00000000-0000-0000-0000-000000000000'::uuid"
| "boolean" `Text.isPrefixOf` colType = "false"
| otherwise = error $ "Unknown column type: " ++ Text.unpack colType
defVal colType =
fromMaybe (error $ "Default value not known for column type: " ++ Text.unpack colType)
. fmap snd
. find (\(k, _) -> k `Text.isPrefixOf` colType)
. Map.toList
$ defaults
dimensionTablePopulateSQL :: TablePopulationMode -> Fact -> TableName -> Reader Env Text
dimensionTablePopulateSQL popMode fact dimTableName = do
dimPrefix <- settingDimPrefix <$> asks envSettings
tables <- asks envTables
defaults <- asks envTypeDefaults
let factTable = fromJust $ findTable (factTableName fact) tables
colMapping = dimColumnMapping dimPrefix fact dimTableName
baseSelectC = "SELECT DISTINCT\n"
<> joinColumnNames
(map (\(_, cName) ->
let col = fromJust . findColumn cName $ tableColumns factTable
in coalesceColumn (factTableName fact) col <> " AS " <> cName)
in coalesceColumn defaults (factTableName fact) col <> " AS " <> cName)
colMapping)
<> "\n"
<> "FROM " <> factTableName fact
@ -139,6 +140,7 @@ factTablePopulateSQL popMode fact = do
Settings {..} <- asks envSettings
allDims <- extractAllDimensionTables fact
tables <- asks envTables
defaults <- asks envTypeDefaults
let fTableName = factTableName fact
fTable = fromJust . findTable fTableName $ tables
dimIdColName = settingDimTableIdColumnName
@ -156,7 +158,7 @@ factTablePopulateSQL popMode fact = do
DimTime cName -> [ timeUnitColumnInsertSQL cName ]
NoDimId cName ->
let sCol = fromJust . findColumn cName $ tableColumns fTable
in [ (cName, coalesceColumn fTableName sCol, True) ]
in [ (cName, coalesceColumn defaults fTableName sCol, True) ]
FactCount scName cName ->
[ (cName, "count(" <> maybe "*" (fullColName fTableName) scName <> ")", False) ]
FactSum scName cName ->
@ -184,7 +186,7 @@ factTablePopulateSQL popMode fact = do
$ fullColName factSourceTableName colName
else let
dimLookupWhereClauses =
[ fullColName tableName c1 <> " = " <> coalesceColumn factSourceTableName col2
[ fullColName tableName c1 <> " = " <> coalesceColumn defaults factSourceTableName col2
| (c1, c2) <- dimColumnMapping settingDimPrefix dimFact tableName
, let col2 = fromJust . findColumn c2 $ tableColumns factSourceTable ]
in "SELECT " <> dimIdColName <> " FROM " <> tableName <> "\nWHERE "

@ -101,17 +101,21 @@ defSettings = Settings
, settingDimensionJSONFileName = "dimensions.json"
}
data ValidationError = MissingTable !TableName
| MissingFact !TableName
| MissingColumn !TableName !ColumnName
| MissingTimeColumn !TableName
| NullableColumn !TableName !ColumnName
data ValidationError = MissingTable !TableName
| MissingFact !TableName
| MissingColumn !TableName !ColumnName
| MissingTimeColumn !TableName
| MissingNotNullConstraint !TableName !ColumnName
| MissingTypeDefault !Text
deriving (Eq, Show)
type TypeDefaults = Map Text Text
data Env = Env
{ envTables :: ![Table]
, envFacts :: ![Fact]
, envSettings :: !Settings
{ envTables :: ![Table]
, envFacts :: ![Fact]
, envSettings :: !Settings
, envTypeDefaults :: !TypeDefaults
} deriving (Eq, Show)
data TablePopulationMode = FullPopulation | IncrementalPopulation deriving (Eq, Show)

@ -3,6 +3,9 @@ module Ringo.Validator
, validateFact
) where
import qualified Data.Map as Map
import qualified Data.Text as Text
#if MIN_VERSION_base(4,8,0)
#else
import Control.Applicative ((<$>))
@ -21,8 +24,13 @@ checkTableForCol tab colName =
validateTable :: Table -> Reader Env [ValidationError]
validateTable table = do
tables <- asks envTables
return . concatMap (checkConstraint tables) . tableConstraints $ table
tables <- asks envTables
defaults <- Map.keys <$> asks envTypeDefaults
let constVs = concatMap (checkConstraint tables) . tableConstraints $ table
typeDefaultVs = [ MissingTypeDefault cType
| Column _ cType _ <- tableColumns table
, null . filter (`Text.isPrefixOf` cType) $ defaults]
return $ constVs ++ typeDefaultVs
where
checkConstraint _ (PrimaryKey colName) = checkTableForCol table colName
checkConstraint _ (UniqueKey columnNames) = checkTableForColRefs table columnNames
@ -45,7 +53,7 @@ validateFact Fact {..} = do
let colVs = concatMap (checkColumn tables table) factColumns
let timeVs = [ MissingTimeColumn factTableName
| null [ c | DimTime c <- factColumns ] ]
let notNullVs = [ NullableColumn factTableName c
let notNullVs = [ MissingNotNullConstraint factTableName c
| DimTime c <- factColumns
, let col = findColumn c (tableColumns table)
, isJust col

Loading…
Cancel
Save