fix haddock, hlint, rename Prec2TypeName to PrecScaleTypeName
This commit is contained in:
parent
e61672ebf8
commit
60cf309953
|
@ -117,7 +117,7 @@ the fixity code.
|
||||||
> var = HSE.Var . HSE.UnQual . HSE.Ident
|
> var = HSE.Var . HSE.UnQual . HSE.Ident
|
||||||
> sym = HSE.UnQual . HSE.Symbol
|
> sym = HSE.UnQual . HSE.Symbol
|
||||||
> name n = case n of
|
> name n = case n of
|
||||||
> QName q -> '"' ++ q
|
> QName q -> '"' : q
|
||||||
> Name m -> m
|
> Name m -> m
|
||||||
> orderExps = map (toHaskell . (\(OrderField a _ _) -> a))
|
> orderExps = map (toHaskell . (\(OrderField a _ _) -> a))
|
||||||
> orderInf = map (\(OrderField _ b c) -> (b,c))
|
> orderInf = map (\(OrderField _ b c) -> (b,c))
|
||||||
|
|
|
@ -331,7 +331,7 @@ that SQL supports.
|
||||||
> where
|
> where
|
||||||
> precision t = try (parens (commaSep integerLiteral)) >>= makeWrap t
|
> precision t = try (parens (commaSep integerLiteral)) >>= makeWrap t
|
||||||
> makeWrap (TypeName t) [a] = return $ PrecTypeName t a
|
> makeWrap (TypeName t) [a] = return $ PrecTypeName t a
|
||||||
> makeWrap (TypeName t) [a,b] = return $ Prec2TypeName t a b
|
> makeWrap (TypeName t) [a,b] = return $ PrecScaleTypeName t a b
|
||||||
> makeWrap _ _ = fail "there must be one or two precision components"
|
> makeWrap _ _ = fail "there must be one or two precision components"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,7 @@
|
||||||
> typeName :: TypeName -> Doc
|
> typeName :: TypeName -> Doc
|
||||||
> typeName (TypeName t) = text t
|
> typeName (TypeName t) = text t
|
||||||
> typeName (PrecTypeName t a) = text t <+> parens (text $ show a)
|
> typeName (PrecTypeName t a) = text t <+> parens (text $ show a)
|
||||||
> typeName (Prec2TypeName t a b) =
|
> typeName (PrecScaleTypeName t a b) =
|
||||||
> text t <+> parens (text (show a) <+> comma <+> text (show b))
|
> text t <+> parens (text (show a) <+> comma <+> text (show b))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -45,8 +45,7 @@
|
||||||
> -- * 12.34e-6
|
> -- * 12.34e-6
|
||||||
> NumLit String
|
> NumLit String
|
||||||
> -- | string literal, currently only basic strings between
|
> -- | string literal, currently only basic strings between
|
||||||
> -- single quotes without escapes (no single quotes in strings
|
> -- single quotes with a single quote escaped using ''
|
||||||
> -- then)
|
|
||||||
> | StringLit String
|
> | StringLit String
|
||||||
> -- | text of interval literal, units of interval precision,
|
> -- | text of interval literal, units of interval precision,
|
||||||
> -- e.g. interval 3 days (3)
|
> -- e.g. interval 3 days (3)
|
||||||
|
@ -95,9 +94,7 @@
|
||||||
> -- keywords instead of commas to separate the arguments,
|
> -- keywords instead of commas to separate the arguments,
|
||||||
> -- e.g. substring(t from 1 to 5)
|
> -- e.g. substring(t from 1 to 5)
|
||||||
> | SpecialOp Name [ScalarExpr]
|
> | SpecialOp Name [ScalarExpr]
|
||||||
> -- | case expression. both flavours supported. Multiple
|
> -- | case expression. both flavours supported
|
||||||
> -- condition when branches not currently supported (case when
|
|
||||||
> -- a=4,b=5 then x end)
|
|
||||||
> | Case
|
> | Case
|
||||||
> {caseTest :: Maybe ScalarExpr -- ^ test value
|
> {caseTest :: Maybe ScalarExpr -- ^ test value
|
||||||
> ,caseWhens :: [([ScalarExpr],ScalarExpr)] -- ^ when branches
|
> ,caseWhens :: [([ScalarExpr],ScalarExpr)] -- ^ when branches
|
||||||
|
@ -123,7 +120,7 @@
|
||||||
> -- | Represents a type name, used in casts.
|
> -- | Represents a type name, used in casts.
|
||||||
> data TypeName = TypeName String
|
> data TypeName = TypeName String
|
||||||
> | PrecTypeName String Int
|
> | PrecTypeName String Int
|
||||||
> | Prec2TypeName String Int Int
|
> | PrecScaleTypeName String Int Int
|
||||||
> deriving (Eq,Show,Read)
|
> deriving (Eq,Show,Read)
|
||||||
|
|
||||||
|
|
||||||
|
@ -147,15 +144,17 @@
|
||||||
> | SqAny
|
> | SqAny
|
||||||
> deriving (Eq,Show,Read)
|
> deriving (Eq,Show,Read)
|
||||||
|
|
||||||
|
> -- | Represents one field in an order by list
|
||||||
> data OrderField = OrderField ScalarExpr Direction NullsOrder
|
> data OrderField = OrderField ScalarExpr Direction NullsOrder
|
||||||
> deriving (Eq,Show,Read)
|
> deriving (Eq,Show,Read)
|
||||||
|
|
||||||
|
> -- | Represents 'nulls first' or 'nulls last' in an order by clause
|
||||||
> data NullsOrder = NullsOrderDefault
|
> data NullsOrder = NullsOrderDefault
|
||||||
> | NullsFirst
|
> | NullsFirst
|
||||||
> | NullsLast
|
> | NullsLast
|
||||||
> deriving (Eq,Show,Read)
|
> deriving (Eq,Show,Read)
|
||||||
|
|
||||||
> -- | Represents the frame clause of a window
|
> -- | Represents theq frame clause of a window
|
||||||
> -- this can be [range | rows] frame_start
|
> -- this can be [range | rows] frame_start
|
||||||
> -- or [range | rows] between frame_start and frame_end
|
> -- or [range | rows] between frame_start and frame_end
|
||||||
> data Frame = FrameFrom FrameRows FramePos
|
> data Frame = FrameFrom FrameRows FramePos
|
||||||
|
@ -182,10 +181,10 @@
|
||||||
> --
|
> --
|
||||||
> -- * a common table expression (with);
|
> -- * a common table expression (with);
|
||||||
> --
|
> --
|
||||||
> -- * a values expression (not yet supported);
|
> -- * a values expression;
|
||||||
> --
|
> --
|
||||||
> -- * or the table syntax - 'table t', shorthand for 'select * from
|
> -- * or the table syntax - 'table t', shorthand for 'select * from
|
||||||
> -- t' (not yet supported).
|
> -- t'.
|
||||||
> data QueryExpr
|
> data QueryExpr
|
||||||
> = Select
|
> = Select
|
||||||
> {qeDuplicates :: Duplicates
|
> {qeDuplicates :: Duplicates
|
||||||
|
@ -244,6 +243,7 @@ I'm not sure if this is valid syntax or not.
|
||||||
> -- | Corresponding, an option for the set operators
|
> -- | Corresponding, an option for the set operators
|
||||||
> data Corresponding = Corresponding | Respectively deriving (Eq,Show,Read)
|
> data Corresponding = Corresponding | Respectively deriving (Eq,Show,Read)
|
||||||
|
|
||||||
|
> -- | Represents an item in a group by clause
|
||||||
> data GroupingExpr
|
> data GroupingExpr
|
||||||
> = GroupingParens [GroupingExpr]
|
> = GroupingParens [GroupingExpr]
|
||||||
> | Cube [GroupingExpr]
|
> | Cube [GroupingExpr]
|
||||||
|
|
|
@ -145,7 +145,7 @@ Tests for parsing scalar expressions
|
||||||
> ,Cast (StringLit "1") $ PrecTypeName "float" 8)
|
> ,Cast (StringLit "1") $ PrecTypeName "float" 8)
|
||||||
|
|
||||||
> ,("cast('1' as decimal(15,2))"
|
> ,("cast('1' as decimal(15,2))"
|
||||||
> ,Cast (StringLit "1") $ Prec2TypeName "decimal" 15 2)
|
> ,Cast (StringLit "1") $ PrecScaleTypeName "decimal" 15 2)
|
||||||
|
|
||||||
|
|
||||||
> ,("double precision '3'"
|
> ,("double precision '3'"
|
||||||
|
|
Loading…
Reference in a new issue