Allow using nulls order without explicit order direction, fix #552

2016-10-04 16:11:19 -05:00
parent 9b7685e5d1
commit 50ae48295d
5 changed files with 19 additions and 6 deletions
@@ -137,13 +137,14 @@ pOrderTerm :: Parser OrderTerm
 pOrderTerm =
  try ( do
    c <- pFieldName
-    _ <- pDelimiter
-    d <- (string "asc" *> pure OrderAsc)
-         <|> (string "desc" *> pure OrderDesc)
+    d <- optionMaybe (try $ pDelimiter *> (
+               try(string "asc" *> pure OrderAsc)
+           <|> try(string "desc" *> pure OrderDesc)
+         ))
    nls <- optionMaybe (pDelimiter *> (
                 try(string "nullslast" *> pure OrderNullsLast)
             <|> try(string "nullsfirst" *> pure OrderNullsFirst)
           ))
    return $ OrderTerm c d nls
  )
-  <|> OrderTerm <$> (toS <$> pFieldName) <*> pure OrderAsc <*> pure Nothing
+  <|> OrderTerm <$> (toS <$> pFieldName) <*> pure Nothing <*> pure Nothing