38d7ee0 · squeal · git.iko.soy

git.iko.soy/squeal

some things

commit38d7ee06a80bac5090568975d6b8069f27b5d572 authorEitan Chatav <eitan.chatav@gmail.com> dateFri 23 Jun 2017, 14:43 (9 years ago) parent83206a8

4 files changed+22−3

compare with dev

unifiedsplit

squeel-postgresql/squeel-postgresql.cabal+1 squeel-postgresql/src/Squeel/PostgreSQL.hs+11 squeel-postgresql/src/Squeel/PostgreSQL/Schema.hs+7 squeel-postgresql/src/Squeel/PostgreSQL/Statement.hs+3−3

squeel-postgresql/squeel-postgresql.cabal+1

@@ -13,6 +13,7 @@ cabal-version: >=1.10

1313library

1414 hs-source-dirs: src

1515 exposed-modules:

16+ Squeel.PostgreSQL

1617 Squeel.PostgreSQL.Binary

1718 Squeel.PostgreSQL.PQ

1819 Squeel.PostgreSQL.Statement

squeel-postgresql/src/Squeel/PostgreSQL.hsnew file+11

@@ -0,0 +1,11 @@

1+module Squeel.PostgreSQL

2+ ( module Squeel.PostgreSQL.Binary

3+ , module Squeel.PostgreSQL.PQ

4+ , module Squeel.PostgreSQL.Schema

5+ , module Squeel.PostgreSQL.Statement

6+ ) where

8+import Squeel.PostgreSQL.Binary

9+import Squeel.PostgreSQL.PQ

10+import Squeel.PostgreSQL.Schema

11+import Squeel.PostgreSQL.Statement

squeel-postgresql/src/Squeel/PostgreSQL/Schema.hs+7

@@ -68,6 +68,13 @@ data PGType

6868 | PGJsonb

6969

7070class ToOid pg where toOid :: Proxy# pg -> LibPQ.Oid

71+--staticTypeInfo

72+instance ToOid 'PGBool where toOid _ = LibPQ.Oid 16

73+instance ToOid 'PGBytea where toOid _ = LibPQ.Oid 17

74+instance ToOid 'PGInt8 where toOid _ = LibPQ.Oid 20

75+instance ToOid 'PGInt2 where toOid _ = LibPQ.Oid 21

76+instance ToOid 'PGInt4 where toOid _ = LibPQ.Oid 23

77+instance ToOid 'PGText where toOid _ = LibPQ.Oid 26

7178class ToOids pgs where toOids :: Proxy# pgs -> [LibPQ.Oid]

7279instance ToOids '[] where toOids _ = []

7380instance (ToOid pg, ToOids pgs) => ToOids (pg ': pgs) where

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

@@ -378,9 +378,9 @@ newtype Statement

378378 = UnsafeStatement { renderStatement :: ByteString }

379379

380380(.>>.)

381− :: Statement params schema0 schema1 '[]

382− -> Statement params schema1 schema2 results

383− -> Statement params schema0 schema2 results

381+ :: Statement '[] schema0 schema1 '[]

382+ -> Statement '[] schema1 schema2 results

383+ -> Statement '[] schema0 schema2 results

384384statement1 .>>. statement2 = UnsafeStatement $

385385 renderStatement statement1 <> " " <> renderStatement statement2

386386