2779820 · squeal · git.iko.soy

git.iko.soy/squeal

parenthesize

commit2779820c3b7263d66726d3628413631beb82b126 authorEitan Chatav <eitan.chatav@gmail.com> dateThu 10 Aug 2017, 14:14 (9 years ago) parentf920afb

2 files changed+8−4

compare with dev

unifiedsplit

squeel-postgresql/src/Squeel/PostgreSQL/Statement.hs+2−2 squeel-postgresql/test/Squeel/PostgreSQL/StatementSpec.hs+6−2

squeel-postgresql/src/Squeel/PostgreSQL/Statement.hs+2−2

@@ -897,7 +897,7 @@ check

897897 :: Condition '[] '[table ::: columns] 'Ungrouped

898898 -> TableConstraint schema columns

899899check condition = UnsafeTableConstraint $

900− "CHECK" <+> renderExpression condition

900+ "CHECK" <+> parenthesized (renderExpression condition)

901901

902902data Column

903903 (columns :: [(Symbol,ColumnType)])

@@ -916,7 +916,7 @@ unique

916916 => NP (Column columns) subcolumns

917917 -> TableConstraint schema columns

918918unique columns = UnsafeTableConstraint $

919− "UNIQUE" <+> renderCommaSeparated renderColumn columns

919+ "UNIQUE" <+> parenthesized (renderCommaSeparated renderColumn columns)

920920

921921primaryKey

922922 :: (SListI subcolumns, NotNullTypes subcolumns)

squeel-postgresql/test/Squeel/PostgreSQL/StatementSpec.hs+6−2

@@ -243,7 +243,7 @@ spec = do

243243 \ (col1 serial,\

244244 \ col2 text,\

245245 \ col3 int8 NOT NULL DEFAULT 8,\

246− \ CHECK (col3 > 0));"

246+ \ CHECK ((col3 > 0)));"

247247 let

248248 statement :: Definition '[]

249249 '[ "users" :::

@@ -267,6 +267,8 @@ spec = do

267267 (text & notNull) `As` #email :* Nil )

268268 [ primaryKey (Column #id :* Nil)

269269 , foreignKey (Column #userid :* Nil) #users (Column #id :* Nil)

270+ , unique (Column #email :* Nil)

271+ , check (#email /=* "")

270272 ]

271273 statement `definitionRenders`

272274 "CREATE TABLE users\

@@ -278,7 +280,9 @@ spec = do

278280 \ userid integer NOT NULL,\

279281 \ email text NOT NULL,\

280282 \ PRIMARY KEY (id),\

281− \ FOREIGN KEY (userid) REFERENCES users (id));"

283+ \ FOREIGN KEY (userid) REFERENCES users (id),\

284+ \ UNIQUE (email),\

285+ \ CHECK ((email <> E'')));"

282286 it "should render DROP TABLE statements" $ do

283287 let

284288 statement :: Definition Tables '[]