Merge PR #713

Resolve petty CHANGELOG conflict

src/PostgREST/Parsers.hs

@@ -136,7 +136,7 @@ pOrder = lexeme pOrderTerm `sepBy` char ','
 pOrderTerm :: Parser OrderTerm
 pOrderTerm =
   try ( do
-    c <- pFieldName
+    c <- pField
     d <- optionMaybe (try $ pDelimiter *> (
                try(string "asc" *> pure OrderAsc)
            <|> try(string "desc" *> pure OrderDesc)
@@ -147,4 +147,4 @@ pOrderTerm =
            ))
     return $ OrderTerm c d nls
   )
-  <|> OrderTerm <$> (toS <$> pFieldName) <*> pure Nothing <*> pure Nothing
+  <|> OrderTerm <$> pField <*> pure Nothing <*> pure Nothing

src/PostgREST/QueryBuilder.hs

@@ -348,7 +348,7 @@ requestToQuery schema isParent (DbRead (Node (Select colSelects tbls conditions
             clause = intercalate "," (map queryTerm ts)
             queryTerm :: OrderTerm -> Text
             queryTerm t = " "
-                <> toS (pgFmtColumn qi $ otTerm t) <> " "
+                <> toS (pgFmtField qi $ otTerm t) <> " "
                 <> maybe "" show (otDirection t) <> " "
                 <> maybe "" show (otNullOrder t) <> " "
     (joins, selects) = foldr getQueryParts ([],[]) forest

src/PostgREST/Types.hs

@@ -77,7 +77,7 @@ instance Show OrderNulls where
   show OrderNullsLast  = "nulls last"
 
 data OrderTerm = OrderTerm {
-  otTerm      :: Text
+  otTerm      :: Field
 , otDirection :: Maybe OrderDirection
 , otNullOrder :: Maybe OrderNulls
 } deriving (Show, Eq)