removide duplication from data types (all tests passing)

src/PostgREST/Parsers.hs

@@ -29,16 +29,27 @@ parseGetRequest httpRequest =
     selectStr = fromMaybe "*" $ fromMaybe (Just "*") $ lookup "select" qString --in case the parametre is missing or empty we default to *
     whereFilters = [ (k, fromJust v) | (k,v) <- qString, k `notElem` ["select", "order"], isJust v ]
 
+{--
+data Query = Select {
+  mainTable::Text
+, fields::[SelectItem]
+, joinTables::[Text]
+, filters::[Filter]
+, order::Maybe [OrderTerm]
+, relation::Maybe Relation
+} deriving (Show)
+
+--}
 pRequestSelect :: Text -> Parser ApiRequest
 pRequestSelect rootNodeName = do
   fieldTree <- pFieldForest
-  return $ foldr treeEntry (Node (RequestNode rootNodeName [] [] Nothing) []) fieldTree
+  return $ foldr treeEntry (Node (Select rootNodeName [] [] [] Nothing Nothing) []) fieldTree
   where
-    treeEntry :: Tree SelectItem -> Tree RequestNode -> Tree RequestNode
+    treeEntry :: Tree SelectItem -> ApiRequest -> ApiRequest
     treeEntry (Node fld@((fn, _),_) fldForest) (Node rNode rForest) =
       case fldForest of
         [] -> Node (rNode {fields=fld:fields rNode}) rForest
-        _  -> Node rNode (foldr treeEntry (Node (RequestNode fn [] [] Nothing) []) fldForest:rForest)
+        _  -> Node rNode (foldr treeEntry (Node (Select fn [] [] [] Nothing Nothing) []) fldForest:rForest)
 
 pRequestFilter :: (String, String) -> Either ParseError (Path, Filter)
 pRequestFilter (k, v) = (,) <$> path <*> (Filter <$> fld <*> op <*> val)
@@ -51,7 +62,7 @@ pRequestFilter (k, v) = (,) <$> path <*> (Filter <$> fld <*> op <*> val)
     val = snd <$> opVal
 
 addFilter :: (Path, Filter) -> ApiRequest -> ApiRequest
-addFilter ([], flt) (Node rn@(RequestNode {filters=flts}) forest) = Node (rn {filters=flt:flts}) forest
+addFilter ([], flt) (Node rn@(Select {filters=flts}) forest) = Node (rn {filters=flt:flts}) forest
 addFilter (path, flt) (Node rn forest) =
   case targetNode of
     Nothing -> Node rn forest -- the filter is silenty dropped in the Request does not contain the required path
@@ -63,7 +74,7 @@ addFilter (path, flt) (Node rn forest) =
       case maybeNode of
         Nothing -> (Nothing,forest)
         Just node -> (Just node, delete node forest)
-      where maybeNode = find ((name==).nodeName.rootLabel) forst
+      where maybeNode = find ((name==).mainTable.rootLabel) forst
 
 ws :: Parser Text
 ws = cs <$> many (oneOf " \t")
@@ -136,7 +147,7 @@ pOperator = cs <$> ( try (string "lte") -- has to be before lt
 --pValue = (VInt <$> try (pInt <* eof))
 --     <|>(VString <$> many anyChar)
 pValue :: Parser FValue
-pValue = cs <$> many anyChar
+pValue = VText <$> (cs <$> many anyChar)
 
 pDelimiter :: Parser Char
 pDelimiter = char '.' <?> "delimiter (.)"