jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: pIdentifierChar -> pIdentifier

Browse Source 
Signed-off-by: Wolfgang Walther <walther@technowledgy.de>
This commit is contained in:
Wolfgang Walther
2022-10-27 21:54:44 +02:00
committed by Wolfgang Walther
parent b78b096ae4
commit da632ac7d3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/ApiRequest/QueryParams.hs
+5 -5
View File
@@ -359,7 +359,7 @@ pStar = string "*" $> "*"
pFieldName :: Parser Text pFieldName :: Parser Text
pFieldName = pFieldName =
pQuotedValue <|> pQuotedValue <|>
T.intercalate "-" . map toS <$> (many1 pIdentifierChar `sepBy1` dash) <?> T.intercalate "-" . map toS <$> (pIdentifier `sepBy1` dash) <?>
"field name (* or [a..z0..9_ $])" "field name (* or [a..z0..9_ $])"
where where
isDash :: GenParser Char st () isDash :: GenParser Char st ()
@@ -505,7 +505,7 @@ pFieldSelect = lexeme $
do do
alias <- optionMaybe ( try(pFieldName <* aliasSeparator) ) alias <- optionMaybe ( try(pFieldName <* aliasSeparator) )
fld <- pField fld <- pField
cast' <- optionMaybe (string "::" *> many1 pIdentifierChar) cast' <- optionMaybe (string "::" *> pIdentifier)
pEnd pEnd
return $ SelectField fld (toS <$> cast') alias return $ SelectField fld (toS <$> cast') alias
) )
@@ -547,7 +547,7 @@ pOpExpr pSVal = try ( string "not" *> pDelimiter *> (OpExpr True <$> pOperation)
pFts = do pFts = do
opStr <- try (P.many (noneOf ".(")) opStr <- try (P.many (noneOf ".("))
op <- parseMaybe ("unknown fts operator " <> opStr) . ftsOperator $ toS opStr op <- parseMaybe ("unknown fts operator " <> opStr) . ftsOperator $ toS opStr
lang <- optionMaybe $ try (between (char '(') (char ')') $ many1 pIdentifierChar) lang <- optionMaybe $ try (between (char '(') (char ')') pIdentifier)
pDelimiter >> Fts op (toS <$> lang) <$> pSVal pDelimiter >> Fts op (toS <$> lang) <$> pSVal
parseMaybe :: [Char] -> Maybe a -> Parser a parseMaybe :: [Char] -> Maybe a -> Parser a
@@ -630,8 +630,8 @@ pLogicPath = do
pColumns :: Parser [FieldName] pColumns :: Parser [FieldName]
pColumns = pFieldName `sepBy1` lexeme (char ',') pColumns = pFieldName `sepBy1` lexeme (char ',')
pIdentifierChar :: Parser Char pIdentifier :: Parser [Char]
pIdentifierChar = letter <|> digit <|> oneOf "_ $" pIdentifier = many1 $ letter <|> digit <|> oneOf "_ $"
mapError :: Either ParseError a -> Either QPError a mapError :: Either ParseError a -> Either QPError a
mapError = mapLeft translateError mapError = mapLeft translateError