hasql-optparse-applicative 0.8.0.1 → 0.9

raw patch · 2 files changed

+35/−15 lines, 2 filesdep +textdep ~hasqldep ~hasql-poolPVP ok

version bump matches the API change (PVP)

Dependencies added: text

Dependency ranges changed: hasql, hasql-pool

API changes (from Hackage documentation)

Files

• hasql-optparse-applicative.cabal +4/−3
• library/Hasql/OptparseApplicative.hs +31/−12

@@ -1,6 +1,6 @@ cabal-version: 3.0 name: hasql-optparse-applicative-version: 0.8.0.1+version: 0.9 synopsis: "optparse-applicative" parsers for "hasql" category: Hasql, Database, PostgreSQL, Options homepage:@@ -69,7 +69,8 @@     attoparsec-time >=1.0.3 && <1.1,     base >=4.11 && <5,     bytestring >=0.10 && <1,-    hasql >=1.6 && <2,-    hasql-pool >=1.0.1 && <1.3,+    hasql >=1.9 && <1.10,+    hasql-pool >=1.3 && <1.4,     optparse-applicative >=0.18 && <1,+    text >=1.2 && <3,     time >=1.10 && <2,

@@ -7,7 +7,10 @@  import qualified Attoparsec.Time.Text as AttoparsecTime import qualified Data.Attoparsec.Text as Attoparsec-import qualified Hasql.Connection as Connection+import Data.Text (Text)+import qualified Hasql.Connection.Setting as Connection.Setting+import qualified Hasql.Connection.Setting.Connection as Connection.Setting.Connection+import qualified Hasql.Connection.Setting.Connection.Param as Connection.Setting.Connection.Param import Hasql.OptparseApplicative.Prelude import qualified Hasql.Pool.Config as Pool.Config import qualified Hasql.Pool.Config.Defaults as Pool.Config.Defaults@@ -95,16 +98,22 @@   -- You can use this function to prefix the name or you can just specify 'id',   -- if you don't want it changed.   (String -> String) ->-  Parser Connection.Settings+  Parser [Connection.Setting.Setting] connectionSettings modifyName =-  Connection.settings-    <$> host modifyName-    <*> port modifyName-    <*> user modifyName-    <*> password modifyName-    <*> database modifyName+  sequenceA+    [ Connection.Setting.connection+        . Connection.Setting.Connection.params+        <$> sequenceA+          [ Connection.Setting.Connection.Param.host <$> host modifyName,+            Connection.Setting.Connection.Param.port <$> port modifyName,+            Connection.Setting.Connection.Param.user <$> user modifyName,+            Connection.Setting.Connection.Param.password <$> password modifyName,+            Connection.Setting.Connection.Param.dbname <$> database modifyName+          ],+      Connection.Setting.usePreparedStatements <$> usePreparedStatements modifyName+    ] -host :: (String -> String) -> Parser ByteString+host :: (String -> String) -> Parser Text host modifyName =   fmap fromString     $ strOption@@ -125,7 +134,7 @@         help "Server port"       ] -user :: (String -> String) -> Parser ByteString+user :: (String -> String) -> Parser Text user modifyName =   fmap fromString     $ strOption@@ -136,7 +145,7 @@         help "Username"       ] -password :: (String -> String) -> Parser ByteString+password :: (String -> String) -> Parser Text password modifyName =   fmap fromString     $ strOption@@ -147,13 +156,23 @@         help "Password"       ] -database :: (String -> String) -> Parser ByteString+database :: (String -> String) -> Parser Text database modifyName =   fmap fromString     $ strOption     $ mconcat       [ long (modifyName "database"),         help "Database name"+      ]++usePreparedStatements :: (String -> String) -> Parser Bool+usePreparedStatements modifyName =+  fmap not+    $ switch+    $ mconcat+      [ long (modifyName "no-prepared-statements"),+        help "Avoid using prepared statements",+        showDefault       ]  -- * Helpers