Remove remove some list appends

tomjaguarpaw · Jul 2, 2019 · e9fd568 · e9fd568
1 parent d0615fe
commit e9fd568
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Opaleye/Internal/HaskellDB/Sql/Print.hs b/src/Opaleye/Internal/HaskellDB/Sql/Print.hs
@@ -30,7 +30,7 @@ import Data.List (intersperse)
 import qualified Data.List.NonEmpty as NEL
 import Data.Text.Prettyprint.Doc ((<+>), (<>), comma, dquotes,
                                   equals, hcat, hsep, parens, punctuate,
-                                  vcat, brackets, indent, Pretty(..))
+                                  vcat, brackets, indent, pretty, Pretty())
 import Data.Foldable (toList)
 import Data.Monoid ()
 
@@ -94,9 +94,9 @@ ppSqlDistinct :: Sql.SqlDistinct -> Doc
 ppSqlDistinct Sql.SqlDistinct = text "DISTINCT"
 ppSqlDistinct Sql.SqlNotDistinct = empty
 
-ppAs :: Maybe String -> Doc -> Doc
+ppAs :: Maybe Doc -> Doc -> Doc
 ppAs Nothing      expr = expr
-ppAs (Just alias) expr = expr <+> hsep [text "as", doubleQuotes (text alias)]
+ppAs (Just alias) expr = expr <+> hsep [text "as", doubleQuotes alias]
 
 
 ppUpdate :: SqlUpdate -> Doc

diff --git a/src/Opaleye/Internal/Print.hs b/src/Opaleye/Internal/Print.hs
@@ -22,7 +22,7 @@ import qualified Data.Text          as ST
 import Data.String ()
 import Data.Monoid ()
 
-type TableAlias = String
+type TableAlias = HSql.Doc
 type Doc = HSql.Doc
 
 -- convenience definitions/aliases
@@ -115,19 +115,19 @@ ppAttrs :: Sql.SelectAttrs -> Doc
 ppAttrs Sql.Star                 = text "*"
 ppAttrs (Sql.SelectAttrs xs)     = (HPrint.commaV nameAs . NEL.toList) xs
 ppAttrs (Sql.SelectAttrsStar xs) =
-  HPrint.commaV id ((map nameAs . NEL.toList) xs ++ [text "*"])
+  (HPrint.commaV id ((map nameAs . NEL.toList) xs)) <> text ",*"
 
 -- This is pretty much just nameAs from HaskellDB
 nameAs :: (HSql.SqlExpr, Maybe HSql.SqlColumn) -> Doc
 nameAs (expr, name) = HPrint.ppAs (fmap unColumn name) (HPrint.ppSqlExpr expr)
-  where unColumn (HSql.SqlColumn s) = s
+  where unColumn (HSql.SqlColumn s) = pretty s
 
 ppTables :: [Select] -> Doc
 ppTables [] = empty
 ppTables ts = text "FROM" <+> HPrint.commaV ppTable (zipWith tableAlias [1..] ts)
 
 tableAlias :: Int -> Select -> (TableAlias, Select)
-tableAlias i select = ("T" ++ show i, select)
+tableAlias i select = (text "T" <> pretty i, select)
 
 -- TODO: duplication with ppSql
 ppTable :: (TableAlias, Select) -> Doc
@@ -154,7 +154,7 @@ ppOffset Nothing = empty
 ppOffset (Just n) = text "OFFSET " ++ pretty n
 
 ppValues :: [[HSql.SqlExpr]] -> Doc
-ppValues v = HPrint.ppAs (Just "V") (parens (text "VALUES" $$ HPrint.commaV ppValuesRow v))
+ppValues v = HPrint.ppAs (Just (pretty "V")) (parens (text "VALUES" $$ HPrint.commaV ppValuesRow v))
 
 ppValuesRow :: [HSql.SqlExpr] -> Doc
 ppValuesRow = parens . HPrint.commaH HPrint.ppSqlExpr