starlitcanopy/simple-sql-parser
1
Fork 0
Code Activity

refactor parsing code slightly, small parse error tweaks

Browse source
This commit is contained in:
Jake Wheat 2024-02-08 10:49:37 +00:00
parent 742382fcc0
commit b3bfb5e723
2 changed files with 290 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

328
Language/SQL/SimpleSQL/Parse.hs
View file

@ -196,6 +196,8 @@ import Text.Megaparsec
,ParseErrorBundle(..) ,ParseErrorBundle(..)
,errorBundlePretty ,errorBundlePretty
,hidden ,hidden
,failure
,ErrorItem(..)
,(<|>) ,(<|>)
,token ,token
@ -209,6 +211,7 @@ import Text.Megaparsec
,some ,some
,many ,many
,between ,between
,lookAhead
) )
import qualified Control.Monad.Combinators.Expr as E import qualified Control.Monad.Combinators.Expr as E
import qualified Control.Monad.Permutations as P import qualified Control.Monad.Permutations as P
@ -222,6 +225,7 @@ import Control.Monad.Reader
) )
import qualified Data.Set as Set import qualified Data.Set as Set
import qualified Data.List.NonEmpty as NE
import Data.Void (Void) import Data.Void (Void)
import Control.Monad (guard, void) import Control.Monad (guard, void)
@ -381,21 +385,22 @@ with U& or u&
u&"example quoted" u&"example quoted"
-} -}
name :: Parser Name name :: Text -> Parser Name
name = label "name" $ do name lbl = label lbl $ do
bl <- askDialect diKeywords bl <- askDialect diKeywords
uncurry Name <$> identifierTok bl uncurry Name <$> identifierTok bl
-- todo: replace (:[]) with a named function all over -- todo: replace (:[]) with a named function all over
names :: Parser [Name] names :: Text -> Parser [Name]
names = label "name" (reverse <$> (((:[]) <$> name) <??*> anotherName)) names lbl =
label lbl (reverse <$> (((:[]) <$> name lbl) `chainrSuffix` anotherName))
-- can't use a simple chain here since we -- can't use a simple chain here since we
-- want to wrap the . + name in a try -- want to wrap the . + name in a try
-- this will change when this is left factored -- this will change when this is left factored
where where
anotherName :: Parser ([Name] -> [Name]) anotherName :: Parser ([Name] -> [Name])
anotherName = try ((:) <$> (hidden (symbol "." *> name))) anotherName = try ((:) <$> (hidden (symbol "." *> name lbl)))
{- {-
= Type Names = Type Names
@ -519,11 +524,11 @@ typeName' :: Bool -> Parser TypeName
typeName' hideArg = typeName' hideArg =
label "typename" ( label "typename" (
(rowTypeName <|> intervalTypeName <|> otherTypeName) (rowTypeName <|> intervalTypeName <|> otherTypeName)
<??*> tnSuffix) `chainrSuffix` tnSuffix)
where where
rowTypeName = rowTypeName =
RowTypeName <$> (hidden (keyword_ "row") *> parens (commaSep1 rowField)) RowTypeName <$> (hidden (keyword_ "row") *> parens (commaSep1 rowField))
rowField = (,) <$> name <*> typeName rowField = (,) <$> name "type name" <*> typeName
---------------------------- ----------------------------
intervalTypeName = intervalTypeName =
hidden (keyword_ "interval") *> hidden (keyword_ "interval") *>
@ -534,9 +539,9 @@ typeName' hideArg =
(typeNameWithParens (typeNameWithParens
<|> pure Nothing <**> (hidden timeTypeName <|> hidden charTypeName) <|> pure Nothing <**> (hidden timeTypeName <|> hidden charTypeName)
<|> pure TypeName) <|> pure TypeName)
nameOfType = reservedTypeNames <|> names nameOfType = reservedTypeNames <|> names "type name"
charTypeName = charSet <**> (option [] tcollate <$$$$> CharTypeName) charTypeName = charSet <**> (option [] tcollate <**> pure (flip4 CharTypeName))
<|> pure [] <**> (tcollate <$$$$> CharTypeName) <|> pure [] <**> (tcollate <**> pure (flip4 CharTypeName))
typeNameWithParens = typeNameWithParens =
(hidden openParen *> (if hideArg then hidden unsignedInteger else unsignedInteger)) (hidden openParen *> (if hideArg then hidden unsignedInteger else unsignedInteger))
<**> (closeParen *> hidden precMaybeSuffix <**> (closeParen *> hidden precMaybeSuffix
@ -545,12 +550,12 @@ typeName' hideArg =
<|> pure (flip PrecTypeName) <|> pure (flip PrecTypeName)
precScaleTypeName = precScaleTypeName =
(hidden comma *> (if hideArg then hidden unsignedInteger else unsignedInteger)) (hidden comma *> (if hideArg then hidden unsignedInteger else unsignedInteger))
<$$$> PrecScaleTypeName <**> pure (flip3 PrecScaleTypeName)
precLengthTypeName = precLengthTypeName =
Just <$> lobPrecSuffix Just <$> lobPrecSuffix
<**> (optional lobUnits <$$$$> PrecLengthTypeName) <**> (optional lobUnits <**> pure (flip4 PrecLengthTypeName))
<|> pure Nothing <**> ((Just <$> lobUnits) <$$$$> PrecLengthTypeName) <|> pure Nothing <**> ((Just <$> lobUnits) <**> pure (flip4 PrecLengthTypeName))
timeTypeName = tz <$$$> TimeTypeName timeTypeName = tz <**> pure (flip3 TimeTypeName)
---------------------------- ----------------------------
lobPrecSuffix = PrecK <$ keyword_ "k" lobPrecSuffix = PrecK <$ keyword_ "k"
<|> PrecM <$ keyword_ "m" <|> PrecM <$ keyword_ "m"
@ -565,13 +570,13 @@ typeName' hideArg =
<|> PrecOctets <$ keyword_ "byte" <|> PrecOctets <$ keyword_ "byte"
tz = True <$ keywords_ ["with", "time","zone"] tz = True <$ keywords_ ["with", "time","zone"]
<|> False <$ keywords_ ["without", "time","zone"] <|> False <$ keywords_ ["without", "time","zone"]
charSet = keywords_ ["character", "set"] *> names charSet = keywords_ ["character", "set"] *> names "character set name"
tcollate = keyword_ "collate" *> names tcollate = keyword_ "collate" *> names "collation name"
---------------------------- ----------------------------
tnSuffix = multiset <|> array tnSuffix = multiset <|> array
multiset = MultisetTypeName <$ keyword_ "multiset" multiset = MultisetTypeName <$ keyword_ "multiset"
array = keyword_ "array" *> array = keyword_ "array" *>
(optional (brackets unsignedInteger) <$$> ArrayTypeName) (optional (brackets unsignedInteger) <**> pure (flip ArrayTypeName))
---------------------------- ----------------------------
-- this parser handles the fixed set of multi word -- this parser handles the fixed set of multi word
-- type names, plus all the type names which are -- type names, plus all the type names which are
@ -616,7 +621,7 @@ star =
[Star <$ symbol "*" [Star <$ symbol "*"
-- much easier to use try here than to left factor where -- much easier to use try here than to left factor where
-- this is allowed and not allowed -- this is allowed and not allowed
,try (QStar <$> (names <* symbol "." <* symbol "*"))] ,try (QStar <$> (names "qualified star" <* symbol "." <* symbol "*"))]
{- {-
== parameter == parameter
@ -732,7 +737,7 @@ multisetCtor =
nextValueFor :: Parser ScalarExpr nextValueFor :: Parser ScalarExpr
nextValueFor = keywords_ ["next","value","for"] >> nextValueFor = keywords_ ["next","value","for"] >>
NextValueFor <$> names NextValueFor <$> names "sequence generator name"
{- {-
=== interval === interval
@ -796,7 +801,8 @@ idenExpr =
-- if it could potentially be a typed literal typename 'literaltext' -- if it could potentially be a typed literal typename 'literaltext'
-- optionally try to parse that -- optionally try to parse that
regularAppLike = do regularAppLike = do
e <- (keywordFunctionOrIden <|> (names <**> hoption Iden app)) e <- (keywordFunctionOrIden
<|> (names "identifier" <**> (hidden app <|> pure Iden)))
let getInt s = readMaybe (T.unpack s) let getInt s = readMaybe (T.unpack s)
case e of case e of
Iden nm -> tryTypedLiteral (TypeName nm) <|> pure e Iden nm -> tryTypedLiteral (TypeName nm) <|> pure e
@ -810,14 +816,15 @@ idenExpr =
_ -> pure e _ -> pure e
tryTypedLiteral tn = tryTypedLiteral tn =
TypedLit tn <$> hidden singleQuotesOnlyStringTok TypedLit tn <$> hidden singleQuotesOnlyStringTok
typedLiteral = TypedLit <$> hidden (typeName' True) <*> singleQuotesOnlyStringTok typedLiteral =
TypedLit <$> hidden (typeName' True) <*> singleQuotesOnlyStringTok
keywordFunctionOrIden = do keywordFunctionOrIden = do
d <- askDialect id d <- askDialect id
x <- hidden (keywordTok (diIdentifierKeywords d ++ diAppKeywords d)) x <- hidden (keywordTok (diIdentifierKeywords d ++ diAppKeywords d))
let i = T.toLower x `elem` diIdentifierKeywords d let i = T.toLower x `elem` diIdentifierKeywords d
a = T.toLower x `elem` diAppKeywords d a = T.toLower x `elem` diAppKeywords d
case () of case () of
_ | i && a -> pure [Name Nothing x] <**> hoption Iden app _ | i && a -> pure [Name Nothing x] <**> (hidden app <|> pure Iden)
| i -> pure (Iden [Name Nothing x]) | i -> pure (Iden [Name Nothing x])
| a -> pure [Name Nothing x] <**> app | a -> pure [Name Nothing x] <**> app
| otherwise -> -- shouldn't get here | otherwise -> -- shouldn't get here
@ -966,7 +973,7 @@ app =
[hidden duplicates [hidden duplicates
<**> (commaSep1 scalarExprOrStar <**> (commaSep1 scalarExprOrStar
<**> ((hoption [] orderBy <* closeParen) <**> ((hoption [] orderBy <* closeParen)
<**> (hoptional afilter <$$$$$> AggregateApp))) <**> (hoptional afilter <**> pure (flip5 AggregateApp))))
-- separate cases with no all or distinct which must have at -- separate cases with no all or distinct which must have at
-- least one scalar expr -- least one scalar expr
,commaSep1 scalarExprOrStar ,commaSep1 scalarExprOrStar
@ -974,12 +981,15 @@ app =
[closeParen *> hidden (choice [closeParen *> hidden (choice
[window [window
,withinGroup ,withinGroup
,(Just <$> afilter) <$$$> aggAppWithoutDupeOrd ,(Just <$> afilter) <**> pure (flip3 aggAppWithoutDupeOrd)
,pure (flip App)]) ,pure (flip App)])
,hidden orderBy <* closeParen ,hidden orderBy <* closeParen
<**> (hoptional afilter <$$$$> aggAppWithoutDupe)] <**> (hoptional afilter <**> pure (flip4 aggAppWithoutDupe))]
-- no scalarExprs: duplicates and order by not allowed -- no scalarExprs: duplicates and order by not allowed
,([] <$ closeParen) <**> hoption (flip App) (window <|> withinGroup) ,([] <$ closeParen) <**> choice
[window
,withinGroup
,pure $ flip App]
] ]
where where
aggAppWithoutDupeOrd n es f = AggregateApp n SQDefault es [] f aggAppWithoutDupeOrd n es f = AggregateApp n SQDefault es [] f
@ -990,7 +1000,7 @@ afilter = keyword_ "filter" *> parens (keyword_ "where" *> scalarExpr)
withinGroup :: Parser ([ScalarExpr] -> [Name] -> ScalarExpr) withinGroup :: Parser ([ScalarExpr] -> [Name] -> ScalarExpr)
withinGroup = withinGroup =
(keywords_ ["within", "group"] *> parens orderBy) <$$$> AggregateAppGroup (keywords_ ["within", "group"] *> parens orderBy) <**> pure (flip3 AggregateAppGroup)
{- {-
==== window ==== window
@ -1009,7 +1019,7 @@ window :: Parser ([ScalarExpr] -> [Name] -> ScalarExpr)
window = window =
keyword_ "over" *> openParen *> option [] partitionBy keyword_ "over" *> openParen *> option [] partitionBy
<**> (option [] orderBy <**> (option [] orderBy
<**> ((optional frameClause <* closeParen) <$$$$$> WindowApp)) <**> ((optional frameClause <* closeParen) <**> pure (flip5 WindowApp)))
where where
partitionBy = partitionBy =
label "partition by" $ label "partition by" $
@ -1019,7 +1029,7 @@ window =
frameRowsRange -- TODO: this 'and' could be an issue frameRowsRange -- TODO: this 'and' could be an issue
<**> choice [(keyword_ "between" *> frameLimit True) <**> choice [(keyword_ "between" *> frameLimit True)
<**> ((keyword_ "and" *> frameLimit True) <**> ((keyword_ "and" *> frameLimit True)
<$$$> FrameBetween) <**> pure (flip3 FrameBetween))
-- maybe this should still use a b expression -- maybe this should still use a b expression
-- for consistency -- for consistency
,frameLimit False <**> pure (flip FrameFrom)] ,frameLimit False <**> pure (flip FrameFrom)]
@ -1160,7 +1170,7 @@ escapeSuffix = do
collateSuffix:: Parser (ScalarExpr -> ScalarExpr) collateSuffix:: Parser (ScalarExpr -> ScalarExpr)
collateSuffix = do collateSuffix = do
keyword_ "collate" keyword_ "collate"
i <- names i <- names "collation name"
pure $ \v -> Collate v i pure $ \v -> Collate v i
{- {-
@ -1315,17 +1325,22 @@ documenting/fixing.
-} -}
scalarExpr :: Parser ScalarExpr scalarExpr :: Parser ScalarExpr
scalarExpr = label "expression" $ E.makeExprParser term (opTable False) scalarExpr = expressionLabel $ E.makeExprParser term (opTable False)
-- used when parsing contexts where a * or x.* is allowed -- used when parsing contexts where a * or x.* is allowed
-- currently at the top level of a select item or top level of -- currently at the top level of a select item or top level of
-- argument passed to an app-like. This list may need to be extended. -- argument passed to an app-like. This list may need to be extended.
scalarExprOrStar :: Parser ScalarExpr scalarExprOrStar :: Parser ScalarExpr
scalarExprOrStar = label "expression" (star <|> scalarExpr) scalarExprOrStar = star <|> scalarExpr
-- use this to get a nice unexpected keyword error which doesn't also
-- mangle other errors
expressionLabel :: Parser a -> Parser a
expressionLabel p = label "expression" p <|> failOnKeyword
term :: Parser ScalarExpr term :: Parser ScalarExpr
term = label "expression" $ term = expressionLabel $
choice choice
[simpleLiteral [simpleLiteral
,parameter ,parameter
@ -1401,7 +1416,7 @@ selectItem =
[(,Nothing) <$> star [(,Nothing) <$> star
,(,) <$> scalarExpr <*> optional als] ,(,) <$> scalarExpr <*> optional als]
where where
als = label "alias" $ optional (keyword_ "as") *> name als = label "alias" $ optional (keyword_ "as") *> name "alias"
selectList :: Parser [(ScalarExpr,Maybe Name)] selectList :: Parser [(ScalarExpr,Maybe Name)]
selectList = commaSep1 selectItem selectList = commaSep1 selectItem
@ -1424,31 +1439,30 @@ aliases.
from :: Parser [TableRef] from :: Parser [TableRef]
from = label "from" (keyword_ "from" *> commaSep1 tref) from = label "from" (keyword_ "from" *> commaSep1 tref)
where where
-- TODO: use P (a->) for the join tref suffix tref = nonJoinTref <**> (hidden (chainl tjoin) <|> pure id)
-- chainl or buildexpressionparser nonJoinTref =
tref = (nonJoinTref <?> "table ref") >>= hoptionSuffix joinTrefSuffix label "table ref" $ choice
nonJoinTref = choice
[hidden $ parens $ choice [hidden $ parens $ choice
[TRQueryExpr <$> queryExpr [TRQueryExpr <$> queryExpr
,TRParens <$> tref] ,TRParens <$> tref]
,TRLateral <$> (hidden (keyword_ "lateral") ,TRLateral <$> (hidden (keyword_ "lateral") *> nonJoinTref)
*> nonJoinTref)
,do ,do
n <- names n <- names "table name"
choice [TRFunction n choice [TRFunction n <$> hidden (parens (commaSep scalarExpr))
<$> hidden (parens (commaSep scalarExpr))
,pure $ TRSimple n] ,pure $ TRSimple n]
-- todo: I think you can only have outer joins inside the oj, -- todo: I think you can only have outer joins inside the oj,
-- not sure. -- not sure.
,TROdbc <$> (hidden (braces (keyword_ "oj" *> tref))) ,TROdbc <$> (hidden (braces (keyword_ "oj" *> tref)))
] <??> aliasSuffix ] <**> (talias <|> pure id)
aliasSuffix = hidden (fromAlias <$$> TRAlias) talias = fromAlias <**> pure (flip TRAlias)
joinTrefSuffix t = tjoin =
((TRJoin t <$> option False (True <$ keyword_ "natural") (\jn jt tr1 jc tr0 -> TRJoin tr0 jn jt tr1 jc)
<*> joinType <$> option False (True <$ keyword_ "natural")
<*> nonJoinTref <*> joinType
<*> hoptional joinCondition) <*> nonJoinTref
>>= hoptionSuffix joinTrefSuffix) <*> hoptional joinCondition
chainl p = foldr (.) id . reverse <$> some p
{- {-
TODO: factor the join stuff to produce better error messages (and make TODO: factor the join stuff to produce better error messages (and make
@ -1473,13 +1487,13 @@ joinType = choice
joinCondition :: Parser JoinCondition joinCondition :: Parser JoinCondition
joinCondition = choice joinCondition = choice
[keyword_ "on" >> JoinOn <$> scalarExpr [keyword_ "on" >> JoinOn <$> scalarExpr
,keyword_ "using" >> JoinUsing <$> parens (commaSep1 name)] ,keyword_ "using" >> JoinUsing <$> parens (commaSep1 (name "column name"))]
fromAlias :: Parser Alias fromAlias :: Parser Alias
fromAlias = Alias <$> tableAlias <*> columnAliases fromAlias = Alias <$> tableAlias <*> columnAliases
where where
tableAlias = hoptional (keyword_ "as") *> name tableAlias = hoptional (keyword_ "as") *> name "alias"
columnAliases = hoptional $ parens $ commaSep1 name columnAliases = hoptional $ parens $ commaSep1 (name "column name")
{- {-
== simple other parts == simple other parts
@ -1495,7 +1509,9 @@ groupByClause :: Parser [GroupingExpr]
groupByClause = groupByClause =
label "group by" (keywords_ ["group","by"] *> commaSep1 groupingExpression) label "group by" (keywords_ ["group","by"] *> commaSep1 groupingExpression)
where where
groupingExpression = choice groupingExpression =
label "grouping expression" $
choice
[keyword_ "cube" >> [keyword_ "cube" >>
Cube <$> parens (commaSep groupingExpression) Cube <$> parens (commaSep groupingExpression)
,keyword_ "rollup" >> ,keyword_ "rollup" >>
@ -1558,8 +1574,8 @@ with = keyword_ "with" >>
where where
withQuery = (,) <$> (withAlias <* keyword_ "as") withQuery = (,) <$> (withAlias <* keyword_ "as")
<*> parens queryExpr <*> parens queryExpr
withAlias = Alias <$> name <*> columnAliases withAlias = Alias <$> name "alias" <*> columnAliases
columnAliases = hoptional $ parens $ commaSep1 name columnAliases = hoptional $ parens $ commaSep1 (name "column alias")
{- {-
@ -1585,7 +1601,7 @@ queryExpr = label "query expr" $ E.makeExprParser qeterm qeOpTable
Select d sl f w g h od ofs fe Select d sl f w g h od ofs fe
values = keyword_ "values" values = keyword_ "values"
>> Values <$> commaSep (parens (commaSep scalarExpr)) >> Values <$> commaSep (parens (commaSep scalarExpr))
table = keyword_ "table" >> Table <$> names table = keyword_ "table" >> Table <$> names "table name"
qeOpTable = qeOpTable =
[[E.InfixL $ setOp Intersect "intersect"] [[E.InfixL $ setOp Intersect "intersect"]
@ -1688,7 +1704,7 @@ statement = statementWithoutSemicolon <* optional semi <|> EmptyStatement <$ hid
createSchema :: Parser Statement createSchema :: Parser Statement
createSchema = keyword_ "schema" >> createSchema = keyword_ "schema" >>
CreateSchema <$> names CreateSchema <$> names "schema name"
createTable :: Parser Statement createTable :: Parser Statement
createTable = do createTable = do
@ -1704,7 +1720,7 @@ createTable = do
keyword_ "table" >> keyword_ "table" >>
CreateTable CreateTable
<$> names <$> names "table name"
<*> parens entries <*> parens entries
createIndex :: Parser Statement createIndex :: Parser Statement
@ -1712,12 +1728,12 @@ createIndex =
CreateIndex CreateIndex
<$> ((keyword_ "index" >> pure False) <|> <$> ((keyword_ "index" >> pure False) <|>
(keywords_ ["unique", "index"] >> pure True)) (keywords_ ["unique", "index"] >> pure True))
<*> names <*> names "index name"
<*> (keyword_ "on" >> names) <*> (keyword_ "on" >> names "table name")
<*> parens (commaSep1 name) <*> parens (commaSep1 (name "column name"))
columnDef :: Parser ColumnDef columnDef :: Parser ColumnDef
columnDef = ColumnDef <$> name <*> typeName columnDef = ColumnDef <$> name "column name" <*> typeName
<*> optional defaultClause <*> optional defaultClause
<*> option [] (some colConstraintDef) <*> option [] (some colConstraintDef)
where where
@ -1737,20 +1753,21 @@ columnDef = ColumnDef <$> name <*> typeName
tableConstraintDef :: Parser (Maybe [Name], TableConstraint) tableConstraintDef :: Parser (Maybe [Name], TableConstraint)
tableConstraintDef = tableConstraintDef =
label "table constraint" $
(,) (,)
<$> optional (keyword_ "constraint" *> names) <$> optional (keyword_ "constraint" *> names "constraint name")
<*> (unique <|> primaryKey <|> check <|> references) <*> (unique <|> primaryKey <|> check <|> references)
where where
unique = keyword_ "unique" >> unique = keyword_ "unique" >>
TableUniqueConstraint <$> parens (commaSep1 name) TableUniqueConstraint <$> parens (commaSep1 $ name "column name")
primaryKey = keywords_ ["primary", "key"] >> primaryKey = keywords_ ["primary", "key"] >>
TablePrimaryKeyConstraint <$> parens (commaSep1 name) TablePrimaryKeyConstraint <$> parens (commaSep1 $ name "column name")
check = keyword_ "check" >> TableCheckConstraint <$> parens scalarExpr check = keyword_ "check" >> TableCheckConstraint <$> parens scalarExpr
references = keywords_ ["foreign", "key"] >> references = keywords_ ["foreign", "key"] >>
(\cs ft ftcs m (u,d) -> TableReferencesConstraint cs ft ftcs m u d) (\cs ft ftcs m (u,d) -> TableReferencesConstraint cs ft ftcs m u d)
<$> parens (commaSep1 name) <$> parens (commaSep1 $ name "column name")
<*> (keyword_ "references" *> names) <*> (keyword_ "references" *> names "table name")
<*> hoptional (parens $ commaSep1 name) <*> hoptional (parens $ commaSep1 $ name "column name")
<*> refMatch <*> refMatch
<*> refActions <*> refActions
@ -1780,7 +1797,7 @@ refActions =
colConstraintDef :: Parser ColConstraintDef colConstraintDef :: Parser ColConstraintDef
colConstraintDef = colConstraintDef =
ColConstraintDef ColConstraintDef
<$> optional (keyword_ "constraint" *> names) <$> optional (keyword_ "constraint" *> names "constraint name")
<*> (nullable <|> notNull <|> unique <|> primaryKey <|> check <|> references) <*> (nullable <|> notNull <|> unique <|> primaryKey <|> check <|> references)
where where
nullable = ColNullableConstraint <$ keyword "null" nullable = ColNullableConstraint <$ keyword "null"
@ -1796,8 +1813,8 @@ colConstraintDef =
check = keyword_ "check" >> ColCheckConstraint <$> parens scalarExpr check = keyword_ "check" >> ColCheckConstraint <$> parens scalarExpr
references = keyword_ "references" >> references = keyword_ "references" >>
(\t c m (ou,od) -> ColReferencesConstraint t c m ou od) (\t c m (ou,od) -> ColReferencesConstraint t c m ou od)
<$> names <$> names "table name"
<*> optional (parens name) <*> optional (parens $ name "column name")
<*> refMatch <*> refMatch
<*> refActions <*> refActions
@ -1849,54 +1866,56 @@ sequenceGeneratorOptions =
alterTable :: Parser Statement alterTable :: Parser Statement
alterTable = keyword_ "table" >> alterTable = keyword_ "table" >>
-- the choices have been ordered so that it works -- the choices have been ordered so that it works
AlterTable <$> names <*> choice [addConstraint AlterTable <$> names "table name"
,dropConstraint <*> choice [addConstraint
,addColumnDef ,dropConstraint
,alterColumn ,addColumnDef
,dropColumn ,alterColumn
] ,dropColumn
]
where where
addColumnDef = try (keyword_ "add" addColumnDef = try (keyword_ "add"
*> optional (keyword_ "column")) >> *> optional (keyword_ "column")) >>
AddColumnDef <$> columnDef AddColumnDef <$> columnDef
alterColumn = keyword_ "alter" >> optional (keyword_ "column") >> alterColumn = keyword_ "alter" >> optional (keyword_ "column") >>
name <**> choice [setDefault name "column name"
,dropDefault <**> choice [setDefault
,setNotNull ,dropDefault
,dropNotNull ,setNotNull
,setDataType] ,dropNotNull
,setDataType]
setDefault :: Parser (Name -> AlterTableAction) setDefault :: Parser (Name -> AlterTableAction)
-- todo: left factor -- todo: left factor
setDefault = try (keywords_ ["set","default"]) >> setDefault = try (keywords_ ["set","default"]) >>
scalarExpr <$$> AlterColumnSetDefault scalarExpr <**> pure (flip AlterColumnSetDefault)
dropDefault = AlterColumnDropDefault <$ try (keywords_ ["drop","default"]) dropDefault = AlterColumnDropDefault <$ try (keywords_ ["drop","default"])
setNotNull = AlterColumnSetNotNull <$ try (keywords_ ["set","not","null"]) setNotNull = AlterColumnSetNotNull <$ try (keywords_ ["set","not","null"])
dropNotNull = AlterColumnDropNotNull <$ try (keywords_ ["drop","not","null"]) dropNotNull = AlterColumnDropNotNull <$ try (keywords_ ["drop","not","null"])
setDataType = try (keywords_ ["set","data","type"]) >> setDataType = try (keywords_ ["set","data","type"]) >>
typeName <$$> AlterColumnSetDataType typeName <**> pure (flip AlterColumnSetDataType)
dropColumn = try (keyword_ "drop" *> optional (keyword_ "column")) >> dropColumn = try (keyword_ "drop" *> optional (keyword_ "column")) >>
DropColumn <$> name <*> dropBehaviour DropColumn <$> name "column name" <*> dropBehaviour
-- todo: left factor, this try is especially bad -- todo: left factor, this try is especially bad
addConstraint = try (keyword_ "add" >> addConstraint = try (keyword_ "add" >>
uncurry AddTableConstraintDef <$> tableConstraintDef) uncurry AddTableConstraintDef <$> tableConstraintDef)
dropConstraint = try (keywords_ ["drop","constraint"]) >> dropConstraint = try (keywords_ ["drop","constraint"]) >>
DropTableConstraintDef <$> names <*> dropBehaviour DropTableConstraintDef <$> names "constraint name" <*> dropBehaviour
dropSchema :: Parser Statement dropSchema :: Parser Statement
dropSchema = keyword_ "schema" >> dropSchema = keyword_ "schema" >>
DropSchema <$> names <*> dropBehaviour DropSchema <$> names "schema name" <*> dropBehaviour
dropTable :: Parser Statement dropTable :: Parser Statement
dropTable = keyword_ "table" >> dropTable = keyword_ "table" >>
DropTable <$> names <*> dropBehaviour DropTable <$> names "table name" <*> dropBehaviour
createView :: Parser Statement createView :: Parser Statement
createView = createView =
CreateView CreateView
<$> (hoption False (True <$ keyword_ "recursive") <* keyword_ "view") <$> (hoption False (True <$ keyword_ "recursive") <* keyword_ "view")
<*> names <*> names "view name"
<*> optional (parens (commaSep1 name)) <*> optional (parens (commaSep1 $ name "column name"))
<*> (keyword_ "as" *> queryExpr) <*> (keyword_ "as" *> queryExpr)
<*> hoptional (choice [ <*> hoptional (choice [
-- todo: left factor -- todo: left factor
@ -1907,64 +1926,64 @@ createView =
dropView :: Parser Statement dropView :: Parser Statement
dropView = keyword_ "view" >> dropView = keyword_ "view" >>
DropView <$> names <*> dropBehaviour DropView <$> names "view name" <*> dropBehaviour
createDomain :: Parser Statement createDomain :: Parser Statement
createDomain = keyword_ "domain" >> createDomain = keyword_ "domain" >>
CreateDomain CreateDomain
<$> names <$> names "domain name"
<*> ((optional (keyword_ "as") *> typeName) <?> "alias") <*> ((optional (keyword_ "as") *> typeName) <?> "alias")
<*> optional (keyword_ "default" *> scalarExpr) <*> optional (keyword_ "default" *> scalarExpr)
<*> many con <*> many con
where where
con = (,) <$> optional (keyword_ "constraint" *> names) con = (,) <$> optional (keyword_ "constraint" *> names "constraint name")
<*> (keyword_ "check" *> parens scalarExpr) <*> (keyword_ "check" *> parens scalarExpr)
alterDomain :: Parser Statement alterDomain :: Parser Statement
alterDomain = keyword_ "domain" >> alterDomain = keyword_ "domain" >>
AlterDomain AlterDomain
<$> names <$> names "domain name"
<*> (setDefault <|> constraint <*> (setDefault <|> constraint
<|> (keyword_ "drop" *> (dropDefault <|> dropConstraint))) <|> (keyword_ "drop" *> (dropDefault <|> dropConstraint)))
where where
setDefault = keywords_ ["set", "default"] >> ADSetDefault <$> scalarExpr setDefault = keywords_ ["set", "default"] >> ADSetDefault <$> scalarExpr
constraint = keyword_ "add" >> constraint = keyword_ "add" >>
ADAddConstraint ADAddConstraint
<$> optional (keyword_ "constraint" *> names) <$> optional (keyword_ "constraint" *> names "constraint name")
<*> (keyword_ "check" *> parens scalarExpr) <*> (keyword_ "check" *> parens scalarExpr)
dropDefault = ADDropDefault <$ keyword_ "default" dropDefault = ADDropDefault <$ keyword_ "default"
dropConstraint = keyword_ "constraint" >> ADDropConstraint <$> names dropConstraint = keyword_ "constraint" >> ADDropConstraint <$> names "constraint name"
dropDomain :: Parser Statement dropDomain :: Parser Statement
dropDomain = keyword_ "domain" >> dropDomain = keyword_ "domain" >>
DropDomain <$> names <*> dropBehaviour DropDomain <$> names "domain name" <*> dropBehaviour
createSequence :: Parser Statement createSequence :: Parser Statement
createSequence = keyword_ "sequence" >> createSequence = keyword_ "sequence" >>
CreateSequence CreateSequence
<$> names <$> names "sequence name"
<*> sequenceGeneratorOptions <*> sequenceGeneratorOptions
alterSequence :: Parser Statement alterSequence :: Parser Statement
alterSequence = keyword_ "sequence" >> alterSequence = keyword_ "sequence" >>
AlterSequence AlterSequence
<$> names <$> names "sequence name"
<*> sequenceGeneratorOptions <*> sequenceGeneratorOptions
dropSequence :: Parser Statement dropSequence :: Parser Statement
dropSequence = keyword_ "sequence" >> dropSequence = keyword_ "sequence" >>
DropSequence <$> names <*> dropBehaviour DropSequence <$> names "sequence name" <*> dropBehaviour
createAssertion :: Parser Statement createAssertion :: Parser Statement
createAssertion = keyword_ "assertion" >> createAssertion = keyword_ "assertion" >>
CreateAssertion CreateAssertion
<$> names <$> names "assertion name"
<*> (keyword_ "check" *> parens scalarExpr) <*> (keyword_ "check" *> parens scalarExpr)
dropAssertion :: Parser Statement dropAssertion :: Parser Statement
dropAssertion = keyword_ "assertion" >> dropAssertion = keyword_ "assertion" >>
DropAssertion <$> names <*> dropBehaviour DropAssertion <$> names "assertion name" <*> dropBehaviour
{- {-
----------------- -----------------
@ -1975,40 +1994,42 @@ dropAssertion = keyword_ "assertion" >>
delete :: Parser Statement delete :: Parser Statement
delete = keywords_ ["delete","from"] >> delete = keywords_ ["delete","from"] >>
Delete Delete
<$> names <$> names "table name"
<*> optional (optional (keyword_ "as") *> name) <*> optional (hoptional (keyword_ "as") *> name "alias")
<*> optional (keyword_ "where" *> scalarExpr) <*> optional (keyword_ "where" *> scalarExpr)
truncateSt :: Parser Statement truncateSt :: Parser Statement
truncateSt = keywords_ ["truncate", "table"] >> truncateSt = keywords_ ["truncate", "table"] >>
Truncate Truncate
<$> names <$> names "table name"
<*> option DefaultIdentityRestart <*> hoption DefaultIdentityRestart
(ContinueIdentity <$ keywords_ ["continue","identity"] (ContinueIdentity <$ keywords_ ["continue","identity"]
<|> RestartIdentity <$ keywords_ ["restart","identity"]) <|> RestartIdentity <$ keywords_ ["restart","identity"])
insert :: Parser Statement insert :: Parser Statement
insert = keywords_ ["insert", "into"] >> insert = keywords_ ["insert", "into"] >>
Insert Insert
<$> names <$> names "table name"
<*> label "parens column names" (optional (parens $ commaSep1 name)) <*> (hoptional (parens $ commaSep1 $ name "column name"))
<*> (DefaultInsertValues <$ keywords_ ["default", "values"] <*>
-- slight hack
(DefaultInsertValues <$ label "values" (keywords_ ["default", "values"])
<|> InsertQuery <$> queryExpr) <|> InsertQuery <$> queryExpr)
update :: Parser Statement update :: Parser Statement
update = keywords_ ["update"] >> update = keywords_ ["update"] >>
Update Update
<$> names <$> names "table name"
<*> label "alias" (optional (optional (keyword_ "as") *> name)) <*> label "alias" (optional (optional (keyword_ "as") *> name "alias"))
<*> (keyword_ "set" *> commaSep1 setClause) <*> (keyword_ "set" *> commaSep1 setClause)
<*> optional (keyword_ "where" *> scalarExpr) <*> optional (keyword_ "where" *> scalarExpr)
where where
setClause = multipleSet <|> singleSet setClause = label "set clause" (multipleSet <|> singleSet)
multipleSet = SetMultiple multipleSet = SetMultiple
<$> parens (commaSep1 names) <$> parens (commaSep1 $ names "column name")
<*> (symbol "=" *> parens (commaSep1 scalarExpr)) <*> (symbol "=" *> parens (commaSep1 scalarExpr))
singleSet = Set singleSet = Set
<$> names <$> names "column name"
<*> (symbol "=" *> scalarExpr) <*> (symbol "=" *> scalarExpr)
dropBehaviour :: Parser DropBehaviour dropBehaviour :: Parser DropBehaviour
@ -2028,18 +2049,18 @@ startTransaction = StartTransaction <$ keywords_ ["start","transaction"]
savepoint :: Parser Statement savepoint :: Parser Statement
savepoint = keyword_ "savepoint" >> savepoint = keyword_ "savepoint" >>
Savepoint <$> name Savepoint <$> name "savepoint name"
releaseSavepoint :: Parser Statement releaseSavepoint :: Parser Statement
releaseSavepoint = keywords_ ["release","savepoint"] >> releaseSavepoint = keywords_ ["release","savepoint"] >>
ReleaseSavepoint <$> name ReleaseSavepoint <$> name "savepoint name"
commit :: Parser Statement commit :: Parser Statement
commit = Commit <$ keyword_ "commit" <* hoptional (keyword_ "work") commit = Commit <$ keyword_ "commit" <* hoptional (keyword_ "work")
rollback :: Parser Statement rollback :: Parser Statement
rollback = keyword_ "rollback" >> hoptional (keyword_ "work") >> rollback = keyword_ "rollback" >> hoptional (keyword_ "work") >>
Rollback <$> optional (keywords_ ["to", "savepoint"] *> name) Rollback <$> optional (keywords_ ["to", "savepoint"] *> name "savepoint name")
{- {-
@ -2056,22 +2077,22 @@ grant = keyword_ "grant" >> (try priv <|> role)
priv = GrantPrivilege priv = GrantPrivilege
<$> commaSep privilegeAction <$> commaSep privilegeAction
<*> (keyword_ "on" *> privilegeObject) <*> (keyword_ "on" *> privilegeObject)
<*> (keyword_ "to" *> commaSep name) <*> (keyword_ "to" *> commaSep (name "role name"))
<*> option WithoutGrantOption <*> option WithoutGrantOption
(WithGrantOption <$ keywords_ ["with","grant","option"]) (WithGrantOption <$ keywords_ ["with","grant","option"])
role = GrantRole role = GrantRole
<$> commaSep name <$> commaSep (name "role name")
<*> (keyword_ "to" *> commaSep name) <*> (keyword_ "to" *> commaSep (name "role name"))
<*> option WithoutAdminOption <*> option WithoutAdminOption
(WithAdminOption <$ keywords_ ["with","admin","option"]) (WithAdminOption <$ keywords_ ["with","admin","option"])
createRole :: Parser Statement createRole :: Parser Statement
createRole = keyword_ "role" >> createRole = keyword_ "role" >>
CreateRole <$> name CreateRole <$> name "role name"
dropRole :: Parser Statement dropRole :: Parser Statement
dropRole = keyword_ "role" >> dropRole = keyword_ "role" >>
DropRole <$> name DropRole <$> name "role name"
-- TODO: fix try at the 'on' -- TODO: fix try at the 'on'
@ -2083,39 +2104,39 @@ revoke = keyword_ "revoke" >> (try priv <|> role)
(GrantOptionFor <$ keywords_ ["grant","option","for"]) (GrantOptionFor <$ keywords_ ["grant","option","for"])
<*> commaSep privilegeAction <*> commaSep privilegeAction
<*> (keyword_ "on" *> privilegeObject) <*> (keyword_ "on" *> privilegeObject)
<*> (keyword_ "from" *> commaSep name) <*> (keyword_ "from" *> commaSep (name "role name"))
<*> dropBehaviour <*> dropBehaviour
role = RevokeRole role = RevokeRole
<$> option NoAdminOptionFor <$> option NoAdminOptionFor
(AdminOptionFor <$ keywords_ ["admin","option", "for"]) (AdminOptionFor <$ keywords_ ["admin","option", "for"])
<*> commaSep name <*> commaSep (name "role name")
<*> (keyword_ "from" *> commaSep name) <*> (keyword_ "from" *> commaSep (name "role name"))
<*> dropBehaviour <*> dropBehaviour
privilegeAction :: Parser PrivilegeAction privilegeAction :: Parser PrivilegeAction
privilegeAction = choice privilegeAction = choice
[PrivAll <$ keywords_ ["all","privileges"] [PrivAll <$ keywords_ ["all","privileges"]
,keyword_ "select" >> ,keyword_ "select" >>
PrivSelect <$> option [] (parens $ commaSep name) PrivSelect <$> option [] (parens $ commaSep $ name "column name")
,PrivDelete <$ keyword_ "delete" ,PrivDelete <$ keyword_ "delete"
,PrivUsage <$ keyword_ "usage" ,PrivUsage <$ keyword_ "usage"
,PrivTrigger <$ keyword_ "trigger" ,PrivTrigger <$ keyword_ "trigger"
,PrivExecute <$ keyword_ "execute" ,PrivExecute <$ keyword_ "execute"
,keyword_ "insert" >> ,keyword_ "insert" >>
PrivInsert <$> option [] (parens $ commaSep name) PrivInsert <$> option [] (parens $ commaSep $ name "column name")
,keyword_ "update" >> ,keyword_ "update" >>
PrivUpdate <$> option [] (parens $ commaSep name) PrivUpdate <$> option [] (parens $ commaSep $ name "column name")
,keyword_ "references" >> ,keyword_ "references" >>
PrivReferences <$> option [] (parens $ commaSep name) PrivReferences <$> option [] (parens $ commaSep $ name "column name")
] ]
privilegeObject :: Parser PrivilegeObject privilegeObject :: Parser PrivilegeObject
privilegeObject = choice privilegeObject = choice
[keyword_ "domain" >> PrivDomain <$> names [keyword_ "domain" >> PrivDomain <$> names "domain name"
,keyword_ "type" >> PrivType <$> names ,keyword_ "type" >> PrivType <$> names "type name"
,keyword_ "sequence" >> PrivSequence <$> names ,keyword_ "sequence" >> PrivSequence <$> names "sequence name"
,keywords_ ["specific","function"] >> PrivFunction <$> names ,keywords_ ["specific","function"] >> PrivFunction <$> names "function name"
,optional (keyword_ "table") >> PrivTable <$> names ,optional (keyword_ "table") >> PrivTable <$> names "table name"
] ]
@ -2178,27 +2199,15 @@ makeKeywordTree sets =
-- parser helpers -- parser helpers
(<$$>) :: Parser b -> (a -> b -> c) -> Parser (a -> c)
(<$$>) pa c = pa <**> pure (flip c)
(<$$$>) :: Parser c -> (a -> b -> c -> t) -> Parser (b -> a -> t)
p <$$$> c = p <**> pure (flip3 c)
(<$$$$>) :: Parser d -> (a -> b -> c -> d -> t) -> Parser (c -> b -> a -> t)
p <$$$$> c = p <**> pure (flip4 c)
(<$$$$$>) :: Parser e -> (a -> b -> c -> d -> e -> t) -> Parser (d -> c -> b -> a -> t)
p <$$$$$> c = p <**> pure (flip5 c)
hoptionSuffix :: (a -> Parser a) -> a -> Parser a
hoptionSuffix p a = hoption a (p a)
{- {-
parses an optional postfix element and applies its result to its left parses an optional postfix element and applies its result to its left
hand result, taken from uu-parsinglib hand result, taken from uu-parsinglib
TODO: make sure the precedence higher than <|> and lower than the TODO: make sure the precedence higher than <|> and lower than the
other operators so it can be used nicely other operators so it can be used nicely
TODO: this name is not so good because it's similar to <?> which does
something completely different
-} -}
(<??>) :: Parser a -> Parser (a -> a) -> Parser a (<??>) :: Parser a -> Parser (a -> a) -> Parser a
@ -2206,8 +2215,8 @@ p <??> q = p <**> hoption id q
-- 0 to many repeated applications of suffix parser -- 0 to many repeated applications of suffix parser
(<??*>) :: Parser a -> Parser (a -> a) -> Parser a chainrSuffix :: Parser a -> Parser (a -> a) -> Parser a
p <??*> q = foldr ($) <$> p <*> (reverse <$> many (hidden q)) chainrSuffix p q = foldr ($) <$> p <*> (reverse <$> many (hidden q))
{- {-
These are to help with left factored parsers: These are to help with left factored parsers:
@ -2327,6 +2336,8 @@ This is to support SQL strings where you can write
and it will parse as a single string and it will parse as a single string
It is only allowed when all the strings are quoted with ' atm. It is only allowed when all the strings are quoted with ' atm.
TODO: move this to the lexer?
-} -}
stringTokExtend :: Parser (Text,Text,Text) stringTokExtend :: Parser (Text,Text,Text)
@ -2424,6 +2435,17 @@ keywordTok allowed = do
| T.toLower p `elem` allowed = Just p | T.toLower p `elem` allowed = Just p
test _ = Nothing test _ = Nothing
unexpectedKeywordError :: Text -> Parser a
unexpectedKeywordError kw =
failure (Just $ Label (NE.fromList $ T.unpack $ "keyword " <> kw)) Set.empty
failOnKeyword :: Parser a
failOnKeyword = do
kws <- asks diKeywords
i <- lookAhead $ keywordTok kws
unexpectedKeywordError i
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- dialect -- dialect

228
expected-parse-errors/golden
View file

@ -634,8 +634,8 @@ from
1:1: 1:1:
| |
1 | from 1 | from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -646,8 +646,8 @@ select from
1:8: 1:8:
| |
1 | select from 1 | select from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -658,8 +658,8 @@ select from,
1:8: 1:8:
| |
1 | select from, 1 | select from,
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -670,8 +670,8 @@ select from from
1:8: 1:8:
| |
1 | select from from 1 | select from from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -682,8 +682,8 @@ from.a
1:1: 1:1:
| |
1 | from.a 1 | from.a
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -694,8 +694,8 @@ select from.a
1:8: 1:8:
| |
1 | select from.a 1 | select from.a
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -706,8 +706,8 @@ select from.a,
1:8: 1:8:
| |
1 | select from.a, 1 | select from.a,
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -718,8 +718,8 @@ select from.a from
1:8: 1:8:
| |
1 | select from.a from 1 | select from.a from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -730,8 +730,8 @@ a.from
1:3: 1:3:
| |
1 | a.from 1 | a.from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -742,8 +742,8 @@ select a.from
1:10: 1:10:
| |
1 | select a.from 1 | select a.from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -754,8 +754,8 @@ select a.from,
1:10: 1:10:
| |
1 | select a.from, 1 | select a.from,
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -766,8 +766,8 @@ select a.from from
1:10: 1:10:
| |
1 | select a.from from 1 | select a.from from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -814,8 +814,8 @@ select not from
1:12: 1:12:
| |
1 | select not from 1 | select not from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -862,8 +862,8 @@ select 4 + from
1:12: 1:12:
| |
1 | select 4 + from 1 | select 4 + from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -874,8 +874,8 @@ ansi2011
1:5: 1:5:
| |
1 | 4 + from 1 | 4 + from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -886,8 +886,8 @@ select 4 + from
1:12: 1:12:
| |
1 | select 4 + from 1 | select 4 + from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -898,8 +898,8 @@ select 4 + from,
1:12: 1:12:
| |
1 | select 4 + from, 1 | select 4 + from,
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -910,8 +910,8 @@ select 4 + from from
1:12: 1:12:
| |
1 | select 4 + from from 1 | select 4 + from from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1006,8 +1006,8 @@ select (5 + from
1:13: 1:13:
| |
1 | select (5 + from 1 | select (5 + from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1066,8 +1066,8 @@ ansi2011
1:6: 1:6:
| |
1 | (5 + from) 1 | (5 + from)
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1078,8 +1078,8 @@ select (5 + from)
1:13: 1:13:
| |
1 | select (5 + from) 1 | select (5 + from)
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1090,8 +1090,8 @@ select (5 + from),
1:13: 1:13:
| |
1 | select (5 + from), 1 | select (5 + from),
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1102,8 +1102,8 @@ select (5 + from) from
1:13: 1:13:
| |
1 | select (5 + from) from 1 | select (5 + from) from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1402,8 +1402,8 @@ case a when from then to end
1:13: 1:13:
| |
1 | case a when from then to end 1 | case a when from then to end
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1414,8 +1414,8 @@ select case a when from then to end
1:20: 1:20:
| |
1 | select case a when from then to end 1 | select case a when from then to end
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1426,8 +1426,8 @@ select case a when from then to end,
1:20: 1:20:
| |
1 | select case a when from then to end, 1 | select case a when from then to end,
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -1438,8 +1438,8 @@ select case a when from then to end from
1:20: 1:20:
| |
1 | select case a when from then to end from 1 | select case a when from then to end from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -3150,8 +3150,8 @@ select app( from
1:13: 1:13:
| |
1 | select app( from 1 | select app( from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting ) or expression expecting ) or expression
@ -3246,8 +3246,8 @@ select app(something, from
1:23: 1:23:
| |
1 | select app(something, from 1 | select app(something, from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression expecting expression
@ -3870,8 +3870,8 @@ select ( from
1:10: 1:10:
| |
1 | select ( from 1 | select ( from
| ^^^^ | ^
unexpected from unexpected keyword from
expecting expression or query expr expecting expression or query expr
@ -4397,7 +4397,7 @@ select a from t select
1 | select a from t select 1 | select a from t select
| ^^^^^^ | ^^^^^^
unexpected select unexpected select
expecting group by, having, order by, or where expecting alias, group by, having, order by, or where
queryExpr queryExpr
@ -4426,7 +4426,7 @@ select a from (t
1 | select a from (t 1 | select a from (t
| ^ | ^
unexpected end of input unexpected end of input
expecting ) expecting ) or alias
queryExpr queryExpr
@ -4438,7 +4438,7 @@ select a from (t having
1 | select a from (t having 1 | select a from (t having
| ^^^^^^ | ^^^^^^
unexpected having unexpected having
expecting ) expecting ) or alias
queryExpr queryExpr
@ -4462,7 +4462,7 @@ select a from t as
1 | select a from t as 1 | select a from t as
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting alias
queryExpr queryExpr
@ -4474,7 +4474,7 @@ select a from t as having
1 | select a from t as having 1 | select a from t as having
| ^^^^^^ | ^^^^^^
unexpected having unexpected having
expecting name expecting alias
queryExpr queryExpr
@ -4581,8 +4581,8 @@ select a from a join b on select
1:27: 1:27:
| |
1 | select a from a join b on select 1 | select a from a join b on select
| ^^^^^^ | ^
unexpected select unexpected keyword select
expecting expression expecting expression
@ -4619,7 +4619,7 @@ select a from a join b using(a,
1 | select a from a join b using(a, 1 | select a from a join b using(a,
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting column name
queryExpr queryExpr
@ -4631,7 +4631,7 @@ select a from a join b using(a,)
1 | select a from a join b using(a,) 1 | select a from a join b using(a,)
| ^ | ^
unexpected ) unexpected )
expecting name expecting column name
queryExpr queryExpr
@ -4643,7 +4643,7 @@ select a from a join b using(1234
1 | select a from a join b using(1234 1 | select a from a join b using(1234
| ^^^^ | ^^^^
unexpected 1234 unexpected 1234
expecting name expecting column name
queryExpr queryExpr
@ -4695,7 +4695,7 @@ select a as
1 | select a as 1 | select a as
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting alias
queryExpr queryExpr
@ -4707,7 +4707,7 @@ select a as from t
1 | select a as from t 1 | select a as from t
| ^^^^ | ^^^^
unexpected from unexpected from
expecting name expecting alias
queryExpr queryExpr
@ -4719,7 +4719,7 @@ select a as,
1 | select a as, 1 | select a as,
| ^ | ^
unexpected , unexpected ,
expecting name expecting alias
queryExpr queryExpr
@ -4741,8 +4741,8 @@ select a, from t
1:11: 1:11:
| |
1 | select a, from t 1 | select a, from t
| ^^^^ | ^
unexpected from unexpected keyword from
expecting select item expecting select item
@ -4755,7 +4755,7 @@ select a as from
1 | select a as from 1 | select a as from
| ^^^^ | ^^^^
unexpected from unexpected from
expecting name expecting alias
queryExpr queryExpr
@ -4767,7 +4767,7 @@ select a as from from
1 | select a as from from 1 | select a as from from
| ^^^^ | ^^^^
unexpected from unexpected from
expecting name expecting alias
queryExpr queryExpr
@ -4832,7 +4832,7 @@ select a from t as
1 | select a from t as 1 | select a from t as
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting alias
queryExpr queryExpr
@ -4868,7 +4868,7 @@ select a from t join group by a
1 | select a from t join group by a 1 | select a from t join group by a
| ^^^^^ | ^^^^^
unexpected group unexpected group
expecting name expecting table ref
queryExpr queryExpr
@ -4880,7 +4880,7 @@ select a from t join
1 | select a from t join 1 | select a from t join
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting table ref
queryExpr queryExpr
@ -4926,8 +4926,8 @@ select a from t left join u on group by a
1:32: 1:32:
| |
1 | select a from t left join u on group by a 1 | select a from t left join u on group by a
| ^^^^^ | ^
unexpected group unexpected keyword group
expecting expression expecting expression
@ -4952,7 +4952,7 @@ select a from t left join u using (
1 | select a from t left join u using ( 1 | select a from t left join u using (
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting column name
queryExpr queryExpr
@ -4976,7 +4976,7 @@ select a from t left join u using (a,
1 | select a from t left join u using (a, 1 | select a from t left join u using (a,
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting column name
queryExpr queryExpr
@ -5046,8 +5046,8 @@ select a from t where group by b
1:23: 1:23:
| |
1 | select a from t where group by b 1 | select a from t where group by b
| ^^^^^ | ^
unexpected group unexpected keyword group
expecting expression expecting expression
@ -5060,7 +5060,7 @@ select a from t group by
1 | select a from t group by 1 | select a from t group by
| ^ | ^
unexpected end of input unexpected end of input
expecting (, cube, expression, grouping sets, or rollup expecting grouping expression
queryExpr queryExpr
@ -5096,7 +5096,7 @@ select a from t group by a,
1 | select a from t group by a, 1 | select a from t group by a,
| ^ | ^
unexpected end of input unexpected end of input
expecting (, cube, expression, grouping sets, or rollup expecting grouping expression
queryExpr queryExpr
@ -5106,9 +5106,9 @@ select a from t group by order by
1:26: 1:26:
| |
1 | select a from t group by order by 1 | select a from t group by order by
| ^^^^^ | ^
unexpected order unexpected keyword order
expecting (, cube, expression, grouping sets, or rollup expecting grouping expression
queryExpr queryExpr
@ -5205,7 +5205,7 @@ select * from (select a
2 | from t 2 | from t
| ^ | ^
unexpected end of input unexpected end of input
expecting ), group by, having, order by, or where expecting ), alias, group by, having, order by, or where
queryExpr queryExpr
@ -5218,7 +5218,7 @@ select * from (select a(stuff)
2 | from t 2 | from t
| ^ | ^
unexpected end of input unexpected end of input
expecting ), group by, having, order by, or where expecting ), alias, group by, having, order by, or where
queryExpr queryExpr
@ -5311,7 +5311,7 @@ delete from where t
1 | delete from where t 1 | delete from where t
| ^^^^^ | ^^^^^
unexpected where unexpected where
expecting name expecting table name
statement statement
@ -5347,7 +5347,7 @@ truncate table from
1 | truncate table from 1 | truncate table from
| ^^^^ | ^^^^
unexpected from unexpected from
expecting name expecting table name
statement statement
@ -5359,7 +5359,7 @@ truncate table t u
1 | truncate table t u 1 | truncate table t u
| ^ | ^
unexpected u unexpected u
expecting ;, continue identity, or restart identity expecting ;
statement statement
@ -5383,7 +5383,7 @@ insert into t insert
1 | insert into t insert 1 | insert into t insert
| ^^^^^^ | ^^^^^^
unexpected insert unexpected insert
expecting default values, parens column names, or query expr expecting query expr or values
statement statement
@ -5395,7 +5395,7 @@ insert into t (1,2)
1 | insert into t (1,2) 1 | insert into t (1,2)
| ^ | ^
unexpected 1 unexpected 1
expecting name expecting column name
statement statement
@ -5407,7 +5407,7 @@ insert into t(
1 | insert into t( 1 | insert into t(
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting column name
statement statement
@ -5419,7 +5419,7 @@ insert into t(1
1 | insert into t(1 1 | insert into t(1
| ^ | ^
unexpected 1 unexpected 1
expecting name expecting column name
statement statement
@ -5443,7 +5443,7 @@ insert into t(a,
1 | insert into t(a, 1 | insert into t(a,
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting column name
statement statement
@ -5455,7 +5455,7 @@ insert into t(a,b)
1 | insert into t(a,b) 1 | insert into t(a,b)
| ^ | ^
unexpected end of input unexpected end of input
expecting default values or query expr expecting query expr or values
statement statement
@ -5524,7 +5524,7 @@ update set 1
1 | update set 1 1 | update set 1
| ^^^ | ^^^
unexpected set unexpected set
expecting name expecting table name
statement statement
@ -5584,7 +5584,7 @@ update t set a=1,
1 | update t set a=1, 1 | update t set a=1,
| ^ | ^
unexpected end of input unexpected end of input
expecting ( or name expecting set clause
statement statement
@ -5620,7 +5620,7 @@ create table
1 | create table 1 | create table
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting table name
statement statement
@ -5679,7 +5679,7 @@ create table t (
1 | create table t ( 1 | create table t (
| ^ | ^
unexpected end of input unexpected end of input
expecting ), check, constraint, foreign key, name, primary key, or unique expecting ), column name, or table constraint
statement statement
@ -5715,7 +5715,7 @@ truncate table t.
1 | truncate table t. 1 | truncate table t.
| ^ | ^
unexpected . unexpected .
expecting ;, continue identity, or restart identity expecting ;
statement statement
@ -5751,7 +5751,7 @@ delete from t. where
1 | delete from t. where 1 | delete from t. where
| ^ | ^
unexpected . unexpected .
expecting ;, as, name, or where expecting ;, alias, or where
statement statement
@ -5763,7 +5763,7 @@ insert into t. values
1 | insert into t. values 1 | insert into t. values
| ^ | ^
unexpected . unexpected .
expecting default values, parens column names, or query expr expecting query expr or values
statement statement
@ -5776,7 +5776,7 @@ select 1
2 | select 1 2 | select 1
| ^^^^^^ | ^^^^^^
unexpected select unexpected select
expecting ), group by, having, order by, or where expecting ), alias, group by, having, order by, or where
statement statement
@ -5788,7 +5788,7 @@ with a as (select * from t
1 | with a as (select * from t 1 | with a as (select * from t
| ^ | ^
unexpected end of input unexpected end of input
expecting ), group by, having, order by, or where expecting ), alias, group by, having, order by, or where
statement statement
@ -5812,7 +5812,7 @@ with a (
1 | with a ( 1 | with a (
| ^ | ^
unexpected end of input unexpected end of input
expecting name expecting column alias
statement statement
@ -5825,7 +5825,7 @@ select 1
1 | with as (select * from t) 1 | with as (select * from t)
| ^^ | ^^
unexpected as unexpected as
expecting name expecting alias
statement statement
@ -5838,6 +5838,6 @@ select 1
1 | with (select * from t) as a 1 | with (select * from t) as a
| ^ | ^
unexpected ( unexpected (
expecting name expecting alias