summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitsutoshiAoe <>2017-06-19 01:13:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-06-19 01:13:00 (GMT)
commitf71d62a35c1a3caef69339ef42c453fb5fa2346b (patch)
tree4d967090d682c6fb2f79a17b444a25b81b1f7b92
parent4c9ec24781eba709a17b1580fcc1cd613e62a182 (diff)
version 1.2.11.2.1
-rw-r--r--CHANGELOG.md4
-rw-r--r--influxdb.cabal4
-rw-r--r--src/Database/InfluxDB.hs10
-rw-r--r--src/Database/InfluxDB/Types.hs7
4 files changed, 18 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3258ce3..3be476f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.2.1 - 2017-06-19
+
+* Export `formatDatabase` and `formatKey` from `Database.InfluxDB` for convenience
+
## v1.2.0 - 2017-06-19
There are a lot of breaking changes in this release. The API has been cleaned up
diff --git a/influxdb.cabal b/influxdb.cabal
index ade5435..b6a244e 100644
--- a/influxdb.cabal
+++ b/influxdb.cabal
@@ -1,5 +1,5 @@
name: influxdb
-version: 1.2.0
+version: 1.2.1
synopsis: Haskell client library for InfluxDB
description:
@influxdb@ is a Haskell client library for InfluxDB.
@@ -142,5 +142,5 @@ source-repository head
source-repository this
type: git
- tag: v1.2.0
+ tag: v1.2.1
location: https://github.com/maoe/influxdb-haskell.git
diff --git a/src/Database/InfluxDB.hs b/src/Database/InfluxDB.hs
index 67b736b..1dd498c 100644
--- a/src/Database/InfluxDB.hs
+++ b/src/Database/InfluxDB.hs
@@ -38,8 +38,8 @@ module Database.InfluxDB
-- ** Query construction
-- $query-construction
- , formatQuery
- , (%)
+ , F.formatQuery
+ , (F.%)
-- ** Query parameters
, QueryParams
@@ -62,13 +62,15 @@ module Database.InfluxDB
-- * Common data types and classes
, Precision(..)
, Database
+ , F.formatDatabase
, Key
+ , F.formatKey
, Server
+ , defaultServer
, host
, port
, ssl
- , defaultServer
, Credentials
, credentials
@@ -84,13 +86,13 @@ module Database.InfluxDB
, HasManager(..)
) where
-import Database.InfluxDB.Format ((%), formatQuery)
import Database.InfluxDB.JSON
import Database.InfluxDB.Line
import Database.InfluxDB.Manage (manage)
import Database.InfluxDB.Query
import Database.InfluxDB.Types
import Database.InfluxDB.Write
+import qualified Database.InfluxDB.Format as F
{- $intro
= Getting started
diff --git a/src/Database/InfluxDB/Types.hs b/src/Database/InfluxDB/Types.hs
index 823432c..2990a11 100644
--- a/src/Database/InfluxDB/Types.hs
+++ b/src/Database/InfluxDB/Types.hs
@@ -109,10 +109,15 @@ user :: Lens' Credentials Text
-- | Password to access InfluxDB
password :: Lens' Credentials Text
--- | Database name
+-- | Database name.
+--
+-- 'Database.InfluxDB.formatDatabase' can be used to construct a
+-- 'Database'.
newtype Database = Database { databaseName :: Text } deriving (Eq, Ord)
-- | String type that is used for measurements, tag keys and field keys.
+--
+-- 'Database.InfluxDB.formatkey' can be used to construct a 'Key'.
newtype Key = Key Text deriving (Eq, Ord)
instance IsString Database where