2a737b6 · squeal · git.iko.soy

parenthesize subqueries

commit2a737b662c1cb0eecc86014d5899a41ee757dfce authorEitan Chatav <eitan.chatav@gmail.com> dateThu 17 Aug 2017, 06:42 (9 years ago) parentb6df2af

2 files changed+3−3

unifiedsplit

squeal-postgresql/src/Squeal/PostgreSQL/Statement.hs+1−1

@@ -724,7 +724,7 @@ data FromClause params schema tables where

724724renderFromClause :: FromClause params schema tables -> ByteString

725725renderFromClause = \case

726726 Table table -> renderAliased renderTable table

727− Subquery selection -> renderAliased renderQuery selection

727+ Subquery selection -> renderAliased (parenthesized . renderQuery) selection

728728 CrossJoin right left ->

729729 renderFromClause left <+> "CROSS JOIN" <+> renderFromClause right

730730 InnerJoin right on left -> renderJoin "INNER JOIN" right on left

squeal-postgresql/test/Squeal/PostgreSQL/StatementSpec.hs+2−2

@@ -52,8 +52,8 @@ spec = do

5252 (from (Table (#table1 `As` #table1))) `As` #sub)))

5353 statement `queryRenders`

5454 "SELECT * FROM\

55− \ SELECT (col1 + col2) AS sum, col1 AS col1\

56− \ FROM table1 AS table1 AS sub;"

55+ \ (SELECT (col1 + col2) AS sum, col1 AS col1\

56+ \ FROM table1 AS table1) AS sub;"

5757 it "does LIMIT clauses" $ do

5858 let

5959 statement :: Query Tables '[] Columns