Merge remote-tracking branch 'origin/master'

Language/SQL/SimpleSQL/Parser.lhs

@@ -601,6 +601,7 @@ tref
 >                                          *> nonJoinTref)
 >                          ,try (TRFunction <$> name
 >                                           <*> parens (commaSep valueExpr))
+>                          ,try (TRQualified <$> name <*> (char '.' >> name))
 >                          ,TRSimple <$> name]
 >                   >>= optionSuffix aliasSuffix
 >     aliasSuffix j = option j (TRAlias j <$> alias)

Language/SQL/SimpleSQL/Pretty.lhs

@@ -229,6 +229,7 @@ which have been changed to try to improve the layout of the output.
 >         ,nest 5 $ vcat $ punctuate comma $ map tr ts]
 >   where
 >     tr (TRSimple t) = name t
+>     tr (TRQualified s t) = name s <> text "." <> name t
 >     tr (TRLateral t) = text "lateral" <+> tr t
 >     tr (TRFunction f as) =
 >         name f <> parens (commaSep $ map valueExpr as)

Language/SQL/SimpleSQL/Syntax.lhs

@@ -282,6 +282,8 @@ I'm not sure if this is valid syntax or not.
 > -- | Represents a entry in the csv of tables in the from clause.
 > data TableRef = -- | from t
 >                 TRSimple Name
+>                 -- | from s.t
+>               | TRQualified Name Name
 >                 -- | from a join b
 >               | TRJoin TableRef JoinType TableRef (Maybe JoinCondition)
 >                 -- | from (a)

TODO

@@ -13,6 +13,7 @@ haddock review
 spell check
 update changelog
 update website text
+regenerate the examples on the index.txt
 
 = Later general tasks:
 
@@ -30,6 +31,8 @@ testing
 
 review tests to copy from hssqlppp
 
+add lots more tests using SQL from the xb2 manual
+
 much more table reference tests, for joins and aliases etc.?
 
 review internal sql collection for more syntax/tests
@@ -166,3 +169,9 @@ db2?
 maybe later: other dml
   insert, update, delete, truncate, merge + set, show?
   copy, execute?, explain?, begin/end/rollback?
+
+big feature summary:
+1. dialects
+2. position annotation
+3. dml
+4. quasiquotes

tools/Language/SQL/SimpleSQL/TableRefs.lhs

@@ -20,6 +20,9 @@ expression
 >     ,("select a from t,u"
 >      ,ms [TRSimple "t", TRSimple "u"])
 
+>     ,("select a from s.t"
+>      ,ms [TRQualified "s" "t"])
+
 these lateral queries make no sense but the syntax is valid
 
 >     ,("select a from lateral a"