eecda76 · squeal · git.iko.soy

git.iko.soy/squeal

Merge pull request #40 from echatav/ghc-8.2.1

ghc-8.2.1

commiteecda768e49c71872a09ce866fd4696df1cbd609 authorEitan Chatav <eitan.chatav@gmail.com> dateTue 15 Aug 2017, 17:49 (9 years ago) parent5750982 a22febc

5 files changed+23−20

compare with dev

unifiedsplit

circle.yml+2 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs+6−6 squeal-postgresql/src/Squeal/PostgreSQL/Statement.hs+6−5 squeal-postgresql/test/Squeal/PostgreSQL/StatementSpec.hs+8−8 stack.yaml+1−1

circle.yml+2

@@ -3,6 +3,8 @@ dependencies:

33 - "~/.stack"

44 - ".stack-work"

55 override:

6+ - stack upgrade

7+ - stack update

68 - stack setup

79 - stack test --no-run-tests

810test:

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

@@ -9,6 +9,7 @@

99 , PolyKinds

1010 , RankNTypes

1111 , ScopedTypeVariables

12+ , TypeApplications

1213 , TypeFamilies

1314 , TypeOperators

1415#-}

@@ -43,7 +44,6 @@ module Squeal.PostgreSQL.Schema

4344import Data.ByteString

4445import Data.Monoid

4546import Data.String

46−import GHC.Exts

4747import GHC.OverloadedLabels

4848import GHC.TypeLits

4949

@@ -91,10 +91,10 @@ instance PGFloating 'PGfloat8

9191

9292type (:::) (alias :: Symbol) (ty :: polykind) = '(alias,ty)

9393

94−data Alias (alias :: Symbol) = Alias (Proxy# alias)

94+data Alias (alias :: Symbol) = Alias

9595

9696renderAlias :: KnownSymbol alias => Alias alias -> ByteString

97−renderAlias (Alias alias) = fromString (symbolVal' alias)

97+renderAlias = fromString . symbolVal

9898

9999instance alias1 ~ alias2 => IsLabel alias1 (Alias alias2) where

100100 fromLabel = Alias

@@ -110,8 +110,8 @@ renderAliased

110110 :: (forall ty. expression ty -> ByteString)

111111 -> Aliased expression aliased

112112 -> ByteString

113−renderAliased render (expression `As` Alias alias) =

114− render expression <> " AS " <> fromString (symbolVal' alias)

113+renderAliased render (expression `As` alias) =

114+ render expression <> " AS " <> renderAlias alias

115115

116116data NullityType = Null PGType | NotNull PGType

117117

@@ -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/src/Squeal/PostgreSQL/Statement.hs+6−5

@@ -73,11 +73,11 @@ instance {-# OVERLAPPABLE #-} (KnownSymbol column, HasColumn column table ty)

7373

7474instance (HasColumn column columns ty, tables ~ '[table ::: columns])

7575 => IsLabel column (Expression params tables 'Ungrouped ty) where

76− fromLabel = getColumn

76+ fromLabel = getColumn (proxy# @Symbol @column)

7777

7878instance (HasTable table tables columns, HasColumn column columns ty)

7979 => IsTableColumn table column (Expression params tables 'Ungrouped ty) where

80− table &. column = UnsafeExpression $

80+ table ! column = UnsafeExpression $

8181 renderAlias table <> "." <> renderAlias column

8282

8383def :: Expression params '[] grouping ('Optional (nullity ty))

@@ -460,14 +460,15 @@ instance

460460 , HasColumn column columns ty

461461 , GroupedBy table column bys

462462 ) => IsLabel column

463− (Expression params tables ('Grouped bys) ty) where fromLabel = getGroup1

463+ (Expression params tables ('Grouped bys) ty) where

464+ fromLabel = getGroup1 (proxy# @Symbol @column)

464465

465466instance

466467 ( HasTable table tables columns

467468 , HasColumn column columns ty

468469 , GroupedBy table column bys

469470 ) => IsTableColumn table column

470− (Expression params tables ('Grouped bys) ty) where (&.) = getGroup2

471+ (Expression params tables ('Grouped bys) ty) where (!) = getGroup2

471472

472473unsafeAggregate

473474 :: ByteString

@@ -588,7 +589,7 @@ instance {-# OVERLAPPABLE #-}

588589

589590instance HasTable table schema columns

590591 => IsLabel table (Table schema columns) where

591− fromLabel = getTable

592+ fromLabel = getTable (proxy# @Symbol @table)

592593

593594data TableReference params schema tables where

594595 Table

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,\

stack.yaml+1−1

@@ -1,3 +1,3 @@

1−resolver: nightly-2017-06-26

1+resolver: nightly-2017-08-15

22packages:

33- squeal-postgresql