diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.6.3.1 + +- Moved to "postgresql-libpq-0.10" + # 1.6.3 - Added `unknownEnum` encoder diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ # Status -[![Build Status](https://travis-ci.org/nikita-volkov/hasql.svg?branch=master)](https://travis-ci.org/nikita-volkov/hasql) [![Hackage](https://img.shields.io/hackage/v/hasql.svg)](https://hackage.haskell.org/package/hasql) Hasql is production-ready, actively maintained and the API is pretty stable. It's used by many companies and most notably by the [Postgrest](https://postgrest.org/) project. @@ -30,11 +29,13 @@ * ["hasql-migration"](https://github.com/tvh/hasql-migration) - A port of postgresql-simple-migration for use with hasql. -* ["hasql-notifications"](https://github.com/diogob/hasql-notifications) - Support for PostgreSQL asynchronous notifications. +* ["hasql-listen-notify"](https://github.com/awkward-squad/hasql-listen-notify) / ["hasql-notifications"](https://github.com/diogob/hasql-notifications) - Support for PostgreSQL asynchronous notifications. * ["hasql-optparse-applicative"](https://github.com/sannsyn/hasql-optparse-applicative) - "optparse-applicative" parsers for Hasql. * ["hasql-implicits"](https://github.com/nikita-volkov/hasql-implicits) - implicit definitions, such as default codecs for standard types. + +* ["hasql-interpolate"](https://github.com/awkward-squad/hasql-interpolate) - a QuasiQuoter that supports interpolating Haskell expressions into Hasql queries. ### Benefits of being an ecosystem diff --git a/hasql.cabal b/hasql.cabal --- a/hasql.cabal +++ b/hasql.cabal @@ -1,150 +1,331 @@ -name: hasql -version: 1.6.3 -category: Hasql, Database, PostgreSQL -synopsis: An efficient PostgreSQL driver with a flexible mapping API +cabal-version: 3.0 +name: hasql +version: 1.6.3.1 +category: Hasql, Database, PostgreSQL +synopsis: An efficient PostgreSQL driver with a flexible mapping API description: Root of the \"hasql\" ecosystem. For details and tutorials see . . The API comes free from all kinds of exceptions. All error-reporting is explicit and is presented using the 'Either' type. -homepage: https://github.com/nikita-volkov/hasql -bug-reports: https://github.com/nikita-volkov/hasql/issues -author: Nikita Volkov -maintainer: Nikita Volkov -copyright: (c) 2014, Nikita Volkov -license: MIT -license-file: LICENSE -build-type: Simple -cabal-version: >=1.10 + +homepage: https://github.com/nikita-volkov/hasql +bug-reports: https://github.com/nikita-volkov/hasql/issues +author: Nikita Volkov +maintainer: Nikita Volkov +copyright: (c) 2014, Nikita Volkov +license: MIT +license-file: LICENSE extra-source-files: CHANGELOG.md README.md source-repository head - type: git + type: git location: git://github.com/nikita-volkov/hasql.git library - hs-source-dirs: library - default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, RoleAnnotations, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples - default-language: Haskell2010 + hs-source-dirs: library + default-extensions: + NoImplicitPrelude + NoMonomorphismRestriction + Arrows + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveTraversable + EmptyDataDecls + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + LambdaCase + LiberalTypeSynonyms + MagicHash + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + ParallelListComp + PatternGuards + QuasiQuotes + RankNTypes + RecordWildCards + RoleAnnotations + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + UnboxedTuples + + default-language: Haskell2010 exposed-modules: + Hasql.Connection Hasql.Decoders Hasql.Encoders - Hasql.Connection - Hasql.Statement Hasql.Session + Hasql.Statement + other-modules: - Hasql.Private.Prelude - Hasql.Private.Errors - Hasql.Private.PTI - Hasql.Private.IO - Hasql.Private.Session - Hasql.Private.Connection - Hasql.Private.PreparedStatementRegistry - Hasql.Private.Settings Hasql.Private.Commands + Hasql.Private.Connection Hasql.Private.Decoders Hasql.Private.Decoders.Array Hasql.Private.Decoders.Composite - Hasql.Private.Decoders.Value - Hasql.Private.Decoders.Row Hasql.Private.Decoders.Result Hasql.Private.Decoders.Results + Hasql.Private.Decoders.Row + Hasql.Private.Decoders.Value Hasql.Private.Encoders Hasql.Private.Encoders.Array - Hasql.Private.Encoders.Value Hasql.Private.Encoders.Params + Hasql.Private.Encoders.Value + Hasql.Private.Errors + Hasql.Private.IO + Hasql.Private.Prelude + Hasql.Private.PreparedStatementRegistry + Hasql.Private.PTI + Hasql.Private.Session + Hasql.Private.Settings + build-depends: - aeson >=2 && <3, - attoparsec >=0.10 && <0.15, - base >=4.12 && <5, - bytestring >=0.10 && <0.12, - bytestring-strict-builder >=0.4.5.1 && <0.5, - contravariant >=1.3 && <2, - dlist ==0.8.* || >=1 && <2, - hashable >=1.2 && <2, - hashtables >=1.1 && <2, - mtl >=2 && <3, - network-ip >=0.3.0.3 && <0.4, - postgresql-binary >=0.13.1 && <0.14, - postgresql-libpq ==0.9.*, - profunctors >=5.1 && <6, - scientific >=0.3 && <0.4, - text >=1 && <3, - text-builder >=0.6.7 && <0.7, - time >=1.9 && <2, - transformers >=0.3 && <0.7, - uuid >=1.3 && <2, - vector >=0.10 && <0.14 + , aeson >=2 && <3 + , attoparsec >=0.10 && <0.15 + , base >=4.12 && <5 + , bytestring >=0.10 && <0.12 + , bytestring-strict-builder >=0.4.5.1 && <0.5 + , contravariant >=1.3 && <2 + , dlist >=0.8 && <0.9 || >=1 && <2 + , hashable >=1.2 && <2 + , hashtables >=1.1 && <2 + , mtl >=2 && <3 + , network-ip >=0.3.0.3 && <0.4 + , postgresql-binary >=0.13.1 && <0.14 + , postgresql-libpq >=0.10 && <0.11 + , profunctors >=5.1 && <6 + , scientific >=0.3 && <0.4 + , text >=1 && <3 + , text-builder >=0.6.7 && <0.7 + , time >=1.9 && <2 + , transformers >=0.3 && <0.7 + , uuid >=1.3 && <2 + , vector >=0.10 && <0.14 test-suite tasty - type: exitcode-stdio-1.0 - hs-source-dirs: tasty - main-is: Main.hs - default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, RoleAnnotations, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples - default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: tasty + main-is: Main.hs + default-extensions: + NoImplicitPrelude + NoMonomorphismRestriction + Arrows + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveTraversable + EmptyDataDecls + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + LambdaCase + LiberalTypeSynonyms + MagicHash + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + ParallelListComp + PatternGuards + QuasiQuotes + RankNTypes + RecordWildCards + RoleAnnotations + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + UnboxedTuples + + default-language: Haskell2010 other-modules: - Main.DSL Main.Connection - Main.Statements + Main.DSL Main.Prelude + Main.Statements + build-depends: - contravariant-extras >=0.3.5.2 && <0.4, - hasql, - QuickCheck >=2.8.1 && <3, - quickcheck-instances >=0.3.11 && <0.4, - rerebase <2, - tasty >=0.12 && <2, - tasty-hunit >=0.9 && <0.11, - tasty-quickcheck >=0.9 && <0.11 + , contravariant-extras >=0.3.5.2 && <0.4 + , hasql + , QuickCheck >=2.8.1 && <3 + , quickcheck-instances >=0.3.11 && <0.4 + , rerebase <2 + , tasty >=0.12 && <2 + , tasty-hunit >=0.9 && <0.11 + , tasty-quickcheck >=0.9 && <0.11 test-suite threads-test - type: exitcode-stdio-1.0 - hs-source-dirs: threads-test - main-is: Main.hs + type: exitcode-stdio-1.0 + hs-source-dirs: threads-test + main-is: Main.hs default-extensions: - Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, RoleAnnotations, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples - default-language: - Haskell2010 - other-modules: - Main.Statements - ghc-options: - -O2 - -threaded - "-with-rtsopts=-N" + NoImplicitPrelude + NoMonomorphismRestriction + Arrows + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveTraversable + EmptyDataDecls + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + LambdaCase + LiberalTypeSynonyms + MagicHash + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + ParallelListComp + PatternGuards + QuasiQuotes + RankNTypes + RecordWildCards + RoleAnnotations + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + UnboxedTuples + + default-language: Haskell2010 + other-modules: Main.Statements + ghc-options: -O2 -threaded -with-rtsopts=-N build-depends: - hasql, - rerebase + , hasql + , rerebase benchmark benchmarks - type: exitcode-stdio-1.0 - hs-source-dirs: benchmarks - main-is: Main.hs - default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, RoleAnnotations, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples - default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: benchmarks + main-is: Main.hs + default-extensions: + NoImplicitPrelude + NoMonomorphismRestriction + Arrows + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveTraversable + EmptyDataDecls + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + LambdaCase + LiberalTypeSynonyms + MagicHash + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + ParallelListComp + PatternGuards + QuasiQuotes + RankNTypes + RecordWildCards + RoleAnnotations + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + UnboxedTuples + + default-language: Haskell2010 ghc-options: - -O2 - -threaded - "-with-rtsopts=-N" - -rtsopts - -funbox-strict-fields + -O2 -threaded -with-rtsopts=-N -rtsopts -funbox-strict-fields + build-depends: - gauge >=0.2.5 && <0.3, - hasql, - rerebase <2 + , gauge >=0.2.5 && <0.3 + , hasql + , rerebase <2 test-suite profiling - type: exitcode-stdio-1.0 - hs-source-dirs: profiling - main-is: Main.hs - default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, RoleAnnotations, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples - default-language: Haskell2010 - ghc-options: - -O2 - -threaded - -rtsopts + type: exitcode-stdio-1.0 + hs-source-dirs: profiling + main-is: Main.hs + default-extensions: + NoImplicitPrelude + NoMonomorphismRestriction + Arrows + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveTraversable + EmptyDataDecls + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + LambdaCase + LiberalTypeSynonyms + MagicHash + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + ParallelListComp + PatternGuards + QuasiQuotes + RankNTypes + RecordWildCards + RoleAnnotations + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + UnboxedTuples + + default-language: Haskell2010 + ghc-options: -O2 -threaded -rtsopts build-depends: - hasql, - rerebase ==1.* + , hasql + , rerebase >=1 && <2 diff --git a/library/Hasql/Private/Encoders.hs b/library/Hasql/Private/Encoders.hs --- a/library/Hasql/Private/Encoders.hs +++ b/library/Hasql/Private/Encoders.hs @@ -284,7 +284,7 @@ -- -- The value transimitted is any value encoded in the Postgres' Text data format. -- For reference, see the --- +-- -- section of the Postgres' documentation. -- -- __Warning:__ Do not use this as part of composite encoders like 'array' since