a22febc · squeal · git.iko.soy

commita22febc750fa5c15b9db34ef6a605105b79bc44f authorEitan Chatav <eitan.chatav@gmail.com> dateTue 15 Aug 2017, 16:36 (9 years ago) parent03dd8d2

2 files changed+9−9

unifiedsplit

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

@@ -159,4 +159,4 @@ data Grouping

159159 | Grouped [(Symbol,Symbol)]

160160

161161class IsTableColumn table column expression where

162− (&.) :: Alias table -> Alias column -> expression

162+ (!) :: Alias table -> Alias column -> expression

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

@@ -181,9 +181,9 @@ spec = do

181181 let

182182 statement :: Query JoinTables '[] ValueColumns

183183 statement = select

184− ( (#orders &. #orderVal) `As` #orderVal

185− :* (#customers &. #customerVal) `As` #customerVal

186− :* (#shippers &. #shipperVal) `As` #shipperVal :* Nil)

184+ ( (#orders ! #orderVal) `As` #orderVal

185+ :* (#customers ! #customerVal) `As` #customerVal

186+ :* (#shippers ! #shipperVal) `As` #shipperVal :* Nil)

187187 ( from (Table (#orders `As` #orders)

188188 & CrossJoin (Table (#customers `As` #customers))

189189 & CrossJoin (Table (#shippers `As` #shippers))))

@@ -199,14 +199,14 @@ spec = do

199199 let

200200 statement :: Query JoinTables '[] ValueColumns

201201 statement = select

202− ( (#orders &. #orderVal) `As` #orderVal

203− :* (#customers &. #customerVal) `As` #customerVal

204− :* (#shippers &. #shipperVal) `As` #shipperVal :* Nil)

202+ ( (#orders ! #orderVal) `As` #orderVal

203+ :* (#customers ! #customerVal) `As` #customerVal

204+ :* (#shippers ! #shipperVal) `As` #shipperVal :* Nil)

205205 ( from (Table (#orders `As` #orders)

206206 & InnerJoin (Table (#customers `As` #customers))

207− ((#orders &. #customerID) ==* (#customers &. #customerID))

207+ ((#orders ! #customerID) ==* (#customers ! #customerID))

208208 & InnerJoin (Table (#shippers `As` #shippers))

209− ((#orders &. #shipperID) ==* (#shippers &. #shipperID))))

209+ ((#orders ! #shipperID) ==* (#shippers ! #shipperID))))

210210 statement `queryRenders`

211211 "SELECT\

212212 \ orders.orderVal AS orderVal,\