Merge branch 'release/3.0.0' into production

Author: s9gf4ult

.gitignore

@@ -5,3 +5,4 @@ cabal.sandbox.config
 TAGS
 cabal.config
 .stack-work
+stack.yaml

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 3.0.0
+### Added
+* Ability to mask some sensitive query arguments in query logs. In case you dont
+  want someone can see your secret data in logs.
+  * Added interpolation syntax `#?{argumentExpression}` for masked parameters
+  * Added `pgQueryWithMasker` and `pgExecuteWithMasker` for custom log masker
+* `MonadPostgres` type synonim
+### Changed
+* Refactoring of `SqlBuilder` and `Entity` modules
+* Some low-level intefaces changed
 ## 2.3.0
 ### Added
 * `derivePgEnum` TH generator for enum fields

lts-2.9.yaml

@@ -0,0 +1,11 @@
+flags: {}
+extra-package-dbs: []
+packages:
+- '.'
+extra-deps:
+- hreader-1.0.2
+- hset-2.2.0
+- inflections-0.2.0.0
+- th-lift-instances-0.1.6
+- type-fun-0.1.0
+resolver: lts-2.9

stack.yaml renamed to lts-6.7.yaml

@@ -6,5 +6,5 @@ extra-deps:
 - hreader-1.0.2
 - hset-2.2.0
 - th-lift-instances-0.1.6
-- type-fun-0.0.1
-resolver: lts-3.20
+- type-fun-0.1.0
+resolver: lts-6.7

postgresql-query.cabal

@@ -1,5 +1,5 @@
 name:                postgresql-query
-version:             2.3.0
+version:             3.0.0
 
 synopsis: Sql interpolating quasiquote plus some kind of primitive ORM
           using it
@@ -25,9 +25,15 @@ library
 
   exposed-modules: Database.PostgreSQL.Query
                  , Database.PostgreSQL.Query.Entity
+                 , Database.PostgreSQL.Query.Entity.Class
+                 , Database.PostgreSQL.Query.Entity.Functions
+                 , Database.PostgreSQL.Query.Entity.Internal
                  , Database.PostgreSQL.Query.Functions
                  , Database.PostgreSQL.Query.Internal
                  , Database.PostgreSQL.Query.SqlBuilder
+                 , Database.PostgreSQL.Query.SqlBuilder.Builder
+                 , Database.PostgreSQL.Query.SqlBuilder.Class
+                 , Database.PostgreSQL.Query.SqlBuilder.Types
                  , Database.PostgreSQL.Query.TH
                  , Database.PostgreSQL.Query.TH.Common
                  , Database.PostgreSQL.Query.TH.Entity
@@ -36,18 +42,20 @@ library
                  , Database.PostgreSQL.Query.TH.SqlExp
                  , Database.PostgreSQL.Query.Types
 
-  default-extensions: CPP
+  default-extensions: AutoDeriveTypeable
+                    , CPP
+                    , ConstraintKinds
+                    , DataKinds
                     , DeriveDataTypeable
                     , DeriveGeneric
                     , EmptyDataDecls
                     , FlexibleContexts
                     , FlexibleInstances
+                    , FunctionalDependencies
                     , GADTs
                     , GeneralizedNewtypeDeriving
                     , LambdaCase
                     , MultiParamTypeClasses
-                    , NoImplicitPrelude
-                    , NoMonomorphismRestriction
                     , OverloadedStrings
                     , QuasiQuotes
                     , RecordWildCards
@@ -88,6 +96,7 @@ library
                , transformers
                , transformers-base
                , transformers-compat           >= 0.3
+               , type-fun                      >= 0.1.0
 
   ghc-options: -Wall
 
@@ -100,15 +109,21 @@ test-suite test
   ghc-options:     -Wall
   hs-source-dirs:  test
   main-is: Main.hs
+  other-modules: BuilderTest
+               , ParserTest
 
-  default-extensions: FlexibleInstances
+  default-extensions: CPP
+                    , FlexibleInstances
                     , OverloadedStrings
+                    , QuasiQuotes
                     , TemplateHaskell
 
   build-depends: QuickCheck
                , attoparsec
                , base                          >=4.6 && < 5
+               , derive
                , postgresql-query
+               , postgresql-simple
                , quickcheck-assertions
                , quickcheck-instances
                , tasty
@@ -124,7 +139,8 @@ test-suite example
   hs-source-dirs:  example
   main-is: Main.hs
 
-  default-extensions: FlexibleInstances
+  default-extensions: AutoDeriveTypeable
+                    , FlexibleInstances
                     , OverloadedStrings
                     , TemplateHaskell
 

src/Database/PostgreSQL/Query.hs

@@ -12,7 +12,7 @@ module Database.PostgreSQL.Query
        , FromRow(..), Query(..), Only(..), In(..), Oid(..), Values(..)
        , (:.)(..), PGArray(..), HStoreList(..), HStoreMap(..)
        , ToHStore(..), HStoreBuilder , hstore, parseHStoreList
-       , ToHStoreText(..), HStoreText , sqlQQ
+       , ToHStoreText(..), HStoreText
        ) where
 
 
@@ -23,19 +23,12 @@ import Database.PostgreSQL.Simple.FromField ( FromField(..) )
 import Database.PostgreSQL.Simple.FromRow ( FromRow(..) )
 import Database.PostgreSQL.Simple.HStore hiding
     ( toBuilder, toLazyByteString ) -- to prevent conflicts
-import Database.PostgreSQL.Simple.SqlQQ
 import Database.PostgreSQL.Simple.ToField ( ToField(..) )
 import Database.PostgreSQL.Simple.ToRow ( ToRow(..) )
 import Database.PostgreSQL.Simple.Types
-import Language.Haskell.TH.Quote ( QuasiQuoter )
 
 import Database.PostgreSQL.Query.Entity
 import Database.PostgreSQL.Query.Functions
 import Database.PostgreSQL.Query.SqlBuilder
 import Database.PostgreSQL.Query.TH
 import Database.PostgreSQL.Query.Types
-
-sqlQQ :: QuasiQuoter
-sqlQQ = sql
-
-{-# DEPRECATED sqlQQ "Use 'sqlExp' instead" #-}

src/Database/PostgreSQL/Query/Entity.hs

@@ -1,26 +1,9 @@
 module Database.PostgreSQL.Query.Entity
-       ( Entity(..)
-       , Ent
-       ) where
-
-import Data.Proxy
-import Data.Text ( Text )
-import Data.Typeable ( Typeable )
-import Database.PostgreSQL.Query.Types
-
--- | Auxiliary typeclass for data types which can map to rows of some
--- table. This typeclass is used inside functions like 'pgSelectEntities' to
--- generate queries.
-class Entity a where
-    -- | Id type for this entity
-    data EntityId a :: *
-    -- | Table name of this entity
-    tableName :: Proxy a -> FN
-    -- | Field names without 'id' and 'created'. The order of field names must match
-    -- with order of fields in 'ToRow' and 'FromRow' instances of this type.
-    fieldNames :: Proxy a -> [FN]
-
-deriving instance Typeable EntityId
-
--- | Entity with it's id
-type Ent a = (EntityId a, a)
+  ( module Database.PostgreSQL.Query.Entity.Class
+  , module Database.PostgreSQL.Query.Entity.Functions
+  , module Database.PostgreSQL.Query.Entity.Internal
+  ) where
+
+import Database.PostgreSQL.Query.Entity.Class
+import Database.PostgreSQL.Query.Entity.Functions
+import Database.PostgreSQL.Query.Entity.Internal

src/Database/PostgreSQL/Query/Entity/Class.hs

@@ -0,0 +1,25 @@
+module Database.PostgreSQL.Query.Entity.Class
+       ( Entity(..)
+       , Ent
+       ) where
+
+import Data.Proxy
+import Data.Typeable ( Typeable )
+import Database.PostgreSQL.Query.Types
+
+-- | Auxiliary typeclass for data types which can map to rows of some
+-- table. This typeclass is used inside functions like 'pgSelectEntities' to
+-- generate queries.
+class Entity a where
+    -- | Id type for this entity
+    data EntityId a :: *
+    -- | Table name of this entity
+    tableName :: Proxy a -> FN
+    -- | Field names without 'id' and 'created'. The order of field names must match
+    -- with order of fields in 'ToRow' and 'FromRow' instances of this type.
+    fieldNames :: Proxy a -> [FN]
+
+deriving instance Typeable EntityId
+
+-- | Entity with it's id
+type Ent a = (EntityId a, a)