559334b · squeal · git.iko.soy

git.iko.soy/squeal

Start on Array refactor

commit559334bf6ff3fb4e2d8b09af32d2a4293e84f35f authorEitan Chatav <eitan.chatav@gmail.com> dateWed 16 Jan 2019, 09:39 (8 years ago) parentfb99bd2

4 files changed+85−52

compare with dev

unifiedsplit

squeal-postgresql/src/Squeal/PostgreSQL/Binary.hs+78−2 squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+1 squeal-postgresql/src/Squeal/PostgreSQL/Render.hs+6−2 squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs−48

squeal-postgresql/src/Squeal/PostgreSQL/Binary.hs+78−2

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

1+{-# LANGUAGE

2+ TypeFamilies

3+#-}

15{-|

26Module: Squeal.PostgreSQL.Binary

37Description: Binary encoding and decoding

@@ -200,8 +204,13 @@ True

200204#-}

201205

202206module Squeal.PostgreSQL.Binary

203− ( -- * Encoding

204− ToParam (..)

207+ ( Json (..)

208+ , Jsonb (..)

209+ , Composite (..)

210+ , Enumerated (..)

211+ , VarArray (..)

212+ -- * Encoding

213+ , ToParam (..)

205214 , ToParams (..)

206215 -- * Decoding

207216 , FromValue (..)

@@ -660,3 +669,70 @@ replicateMN

660669 => m x -> m (NP I xs)

661670replicateMN mx = hsequence' $

662671 hcpure (Proxy :: Proxy ((~) x)) (Comp (I <$> mx))

672+

673+{- | The `Json` newtype is an indication that the Haskell

674+type it's applied to should be stored as a `PGjson`.

675+-}

676+newtype Json hask = Json {getJson :: hask}

677+ deriving (Eq, Ord, Show, Read, GHC.Generic)

678+type instance PG (Json hask) = 'PGjson

679+

680+{- | The `Jsonb` newtype is an indication that the Haskell

681+type it's applied to should be stored as a `PGjsonb`.

682+-}

683+newtype Jsonb hask = Jsonb {getJsonb :: hask}

684+ deriving (Eq, Ord, Show, Read, GHC.Generic)

685+type instance PG (Jsonb hask) = 'PGjsonb

686+

687+{- | The `Composite` newtype is an indication that the Haskell

688+type it's applied to should be stored as a `PGcomposite`.

689+-}

690+newtype Composite record = Composite {getComposite :: record}

691+ deriving (Eq, Ord, Show, Read, GHC.Generic)

692+type instance PG (Composite hask) = 'PGcomposite (RowPG hask)

693+

694+{- | The `Enumerated` newtype is an indication that the Haskell

695+type it's applied to should be stored as a `PGenum`.

696+-}

697+newtype Enumerated enum = Enumerated {getEnumerated :: enum}

698+ deriving (Eq, Ord, Show, Read, GHC.Generic)

699+type instance PG (Enumerated hask) = 'PGenum (LabelsPG hask)

700+

701+{- | The `VarArray` newtype is an indication that the Haskell

702+type it's applied to should be stored as a `PGvararray`.

703+-}

704+newtype VarArray arr = VarArray {getVarArray :: arr}

705+ deriving (Eq, Ord, Show, Read, GHC.Generic)

706+type instance PG (VarArray (Vector hask)) = 'PGvararray (NullPG hask)

707+

708+{- | The `FixArray` newtype is an indication that the Haskell

709+type it's applied to should be stored as a `PGfixarray`.

710+-}

711+newtype FixArray arr = FixArray {getFixArray :: arr}

712+ deriving (Eq, Ord, Show, Read, GHC.Generic)

713+-- type instance PG (FixArray x) = 'PGfixarray (DimPG x) (FixPG x)

714+

715+type family DimPG (hask :: Type) :: [Nat] where

716+ DimPG (x,x) = 2 ': DimPG x

717+ DimPG (x,x,x) = 3 ': DimPG x

718+ DimPG (x,x,x,x) = 4 ': DimPG x

719+ DimPG (x,x,x,x,x) = 5 ': DimPG x

720+ DimPG (x,x,x,x,x,x) = 6 ': DimPG x

721+ DimPG (x,x,x,x,x,x,x) = 7 ': DimPG x

722+ DimPG (x,x,x,x,x,x,x,x) = 8 ': DimPG x

723+ DimPG (x,x,x,x,x,x,x,x,x) = 9 ': DimPG x

724+ DimPG (x,x,x,x,x,x,x,x,x,x) = 10 ': DimPG x

725+ DimPG x = '[]

726+

727+type family FixPG (hask :: Type) :: NullityType where

728+ FixPG (x,x) = FixPG x

729+ FixPG (x,x,x) = FixPG x

730+ FixPG (x,x,x,x) = FixPG x

731+ FixPG (x,x,x,x,x) = FixPG x

732+ FixPG (x,x,x,x,x,x) = FixPG x

733+ FixPG (x,x,x,x,x,x,x) = FixPG x

734+ FixPG (x,x,x,x,x,x,x,x) = FixPG x

735+ FixPG (x,x,x,x,x,x,x,x,x) = FixPG x

736+ FixPG (x,x,x,x,x,x,x,x,x,x) = FixPG x

737+ FixPG (x,x,x,x,x,x,x,x,x,x,x) = FixPG x

738+ FixPG x = NullPG x

squeal-postgresql/src/Squeal/PostgreSQL/Definition.hs+1

@@ -95,6 +95,7 @@ import Prelude hiding ((.), id)

9595import qualified Generics.SOP as SOP

9696import qualified GHC.Generics as GHC

9797

98+import Squeal.PostgreSQL.Binary

9899import Squeal.PostgreSQL.Expression

99100import Squeal.PostgreSQL.Query

100101import Squeal.PostgreSQL.Render

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

@@ -29,6 +29,7 @@ module Squeal.PostgreSQL.Render

2929 , renderCommaSeparated

3030 , renderCommaSeparatedMaybe

3131 , renderNat

32+ , renderNats

3233 , renderSymbol

3334 , RenderSQL (..)

3435 , printSQL

@@ -98,13 +99,16 @@ renderCommaSeparatedMaybe render

9899renderNat :: forall n. KnownNat n => ByteString

99100renderNat = fromString (show (natVal' (proxy# :: Proxy# n)))

100101

102+-- | Render a promoted list of `Nat`s.

103+renderNats :: forall ns. All KnownNat ns => ByteString

104+renderNats = undefined

105+

101106-- | Render a promoted `Symbol`.

102107renderSymbol :: forall s. KnownSymbol s => ByteString

103108renderSymbol = fromString (symbolVal' (proxy# :: Proxy# s))

104109

105110-- | A class for rendering SQL

106−class RenderSQL sql where

107− renderSQL :: sql -> ByteString

111+class RenderSQL sql where renderSQL :: sql -> ByteString

108112

109113-- | Print SQL.

110114printSQL :: (RenderSQL sql, MonadBase IO io) => sql -> io ()

squeal-postgresql/src/Squeal/PostgreSQL/Schema.hs−48

@@ -44,10 +44,6 @@ module Squeal.PostgreSQL.Schema

4444 , NullPG

4545 , TuplePG

4646 , RowPG

47− , Json (..)

48− , Jsonb (..)

49− , Composite (..)

50− , Enumerated (..)

5147 -- * Schema Types

5248 , ColumnType

5349 , ColumnsType

@@ -137,7 +133,6 @@ import Data.Time

137133import Data.Word (Word16, Word32, Word64)

138134import Data.Type.Bool

139135import Data.UUID.Types (UUID)

140−import Data.Vector (Vector)

141136import Generics.SOP

142137import Generics.SOP.Record

143138import GHC.OverloadedLabels

@@ -755,49 +750,6 @@ type instance PG DiffTime = 'PGinterval

755750type instance PG UUID = 'PGuuid

756751type instance PG (NetAddr IP) = 'PGinet

757752type instance PG Value = 'PGjson

758−type instance PG (Json hask) = 'PGjson

759−type instance PG (Jsonb hask) = 'PGjsonb

760−type instance PG (Vector hask) = 'PGvararray (NullPG hask)

761−type instance PG (hask, hask) = 'PGfixarray 2 (NullPG hask)

762−type instance PG (hask, hask, hask) = 'PGfixarray 3 (NullPG hask)

763−type instance PG (hask, hask, hask, hask) = 'PGfixarray 4 (NullPG hask)

764−type instance PG (hask, hask, hask, hask, hask) = 'PGfixarray 5 (NullPG hask)

765−type instance PG (hask, hask, hask, hask, hask, hask)

766− = 'PGfixarray 6 (NullPG hask)

767−type instance PG (hask, hask, hask, hask, hask, hask, hask)

768− = 'PGfixarray 7 (NullPG hask)

769−type instance PG (hask, hask, hask, hask, hask, hask, hask, hask)

770− = 'PGfixarray 8 (NullPG hask)

771−type instance PG (hask, hask, hask, hask, hask, hask, hask, hask, hask)

772− = 'PGfixarray 9 (NullPG hask)

773−type instance PG (hask, hask, hask, hask, hask, hask, hask, hask, hask, hask)

774− = 'PGfixarray 10 (NullPG hask)

775−type instance PG (Composite hask) = 'PGcomposite (RowPG hask)

776−type instance PG (Enumerated hask) = 'PGenum (LabelsPG hask)

777−

778−{- | The `Json` newtype is an indication that the Haskell

779−type it's applied to should be stored as `PGjson`.

780−-}

781−newtype Json hask = Json {getJson :: hask}

782− deriving (Eq, Ord, Show, Read, GHC.Generic)

783−

784−{- | The `Jsonb` newtype is an indication that the Haskell

785−type it's applied to should be stored as `PGjsonb`.

786−-}

787−newtype Jsonb hask = Jsonb {getJsonb :: hask}

788− deriving (Eq, Ord, Show, Read, GHC.Generic)

789−

790−{- | The `Composite` newtype is an indication that the Haskell

791−type it's applied to should be stored as a `PGcomposite`.

792−-}

793−newtype Composite record = Composite {getComposite :: record}

794− deriving (Eq, Ord, Show, Read, GHC.Generic)

795−

796−{- | The `Enumerated` newtype is an indication that the Haskell

797−type it's applied to should be stored as `PGenum`.

798−-}

799−newtype Enumerated enum = Enumerated {getEnumerated :: enum}

800− deriving (Eq, Ord, Show, Read, GHC.Generic)

801753

802754{-| The `LabelsPG` type family calculates the constructors of a

803755Haskell enum type.