eecda76 · squeal · git.iko.soy

circle.yml+2

compare with dev

unifiedsplit

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

3 - "~/.stack"

4 - ".stack-work"

5 override:

6+ - stack upgrade

7+ - stack update

6 - stack setup

8 - stack setup

7 - stack test --no-run-tests

9 - stack test --no-run-tests

8test:

10test:

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

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

9 , PolyKinds

10 , RankNTypes

11 , ScopedTypeVariables

12+ , TypeApplications

12 , TypeFamilies

13 , TypeFamilies

13 , TypeOperators

14 , TypeOperators

14#-}

15#-}

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

43import Data.ByteString

44import Data.ByteString

44import Data.Monoid

45import Data.Monoid

45import Data.String

46import Data.String

46−import GHC.Exts

47import GHC.OverloadedLabels

48import GHC.TypeLits

49

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

91

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

93

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

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

95

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

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

97+renderAlias = fromString . symbolVal

98

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

100 fromLabel = Alias

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

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

111 -> Aliased expression aliased

112 -> ByteString

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

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

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

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

115

116data NullityType = Null PGType | NotNull PGType

117

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

159 | Grouped [(Symbol,Symbol)]

160

161class 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)

73

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

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

76− fromLabel = getColumn

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

77

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

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

80− table &. column = UnsafeExpression $

80+ table ! column = UnsafeExpression $

81 renderAlias table <> "." <> renderAlias column

82

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

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

460 , HasColumn column columns ty

461 , GroupedBy table column bys

462 ) => 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)

464

465

465instance

466instance

466 ( HasTable table tables columns

467 ( HasTable table tables columns

467 , HasColumn column columns ty

468 , HasColumn column columns ty

468 , GroupedBy table column bys

469 , GroupedBy table column bys

469 ) => IsTableColumn table column

470 ) => IsTableColumn table column

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

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

471

472

472unsafeAggregate

473unsafeAggregate

473 :: ByteString

474 :: ByteString

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

588

589

589instance HasTable table schema columns

590instance HasTable table schema columns

590 => IsLabel table (Table schema columns) where

591 => IsLabel table (Table schema columns) where

591− fromLabel = getTable

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

592

593

593data TableReference params schema tables where

594data TableReference params schema tables where

594 Table

595 Table

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

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

181 let

182 statement :: Query JoinTables '[] ValueColumns

183 statement = select

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

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

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

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

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

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

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

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

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

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

199 let

200 statement :: Query JoinTables '[] ValueColumns

201 statement = select

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

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

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

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

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

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

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

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

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

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

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

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

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

210 statement `queryRenders`

211 "SELECT\

212 \ orders.orderVal AS orderVal,\

stack.yaml+1−1

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

1−resolver: nightly-2017-06-26

1+resolver: nightly-2017-08-15

2packages:

3- squeal-postgresql