From 094ae18cae1d2229a48854cb93eb9debd9dcea39 Mon Sep 17 00:00:00 2001 From: parsonsmatt Date: Tue, 5 Mar 2019 12:50:49 -0700 Subject: [PATCH 1/2] Remove QQ re-exports --- changelog.md | 6 ++++++ package.yaml | 2 +- src/Database/Esqueleto/Internal/PersistentImport.hs | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index b1d972d..5bb0279 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,12 @@ Unreleased ======== +2.6.2 +======= + +- @parsonsmatt + - [#117](https://github.com/bitemyapp/esqueleto/pull/117): Removed `sqlQQ` and `executeQQ` functions from export, fixing doc build and building with `persistent` >= 2.9 + 2.6.1 ======= diff --git a/package.yaml b/package.yaml index d3825be..7dc7317 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: esqueleto -version: 2.6.1 +version: 2.6.2 synopsis: Type-safe EDSL for SQL queries on persistent backends. description: ! '@esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends. Its diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs index b30875e..9cab41c 100644 --- a/src/Database/Esqueleto/Internal/PersistentImport.hs +++ b/src/Database/Esqueleto/Internal/PersistentImport.hs @@ -53,8 +53,6 @@ module Database.Esqueleto.Internal.PersistentImport rawQuery, rawQueryRes, rawSql, - executeQQ, - sqlQQ, askLogFunc, close', createSqlPool, From 7a84e836756fd301453a000be625aa696eb2cf50 Mon Sep 17 00:00:00 2001 From: parsonsmatt Date: Tue, 5 Mar 2019 13:57:35 -0700 Subject: [PATCH 2/2] Revise version number [skip ci] --- changelog.md | 2 +- esqueleto.cabal | 4 ++-- package.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 5bb0279..2140820 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,7 @@ Unreleased ======== -2.6.2 +2.7.0 ======= - @parsonsmatt diff --git a/esqueleto.cabal b/esqueleto.cabal index a6b7d88..234c0bb 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: c68a1e254e29c461cbf88a8a32c039563f3576cf439b9d947cb3d8dd3916e0e8 +-- hash: b9e04d2f75b2f0eaebcef3906057ae77f42a6455f7bd453c3f7ed399b1669e8e name: esqueleto -version: 2.6.1 +version: 2.6.2 synopsis: Type-safe EDSL for SQL queries on persistent backends. description: @esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends. Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend. Most kinds of errors committed when writing SQL are caught as compile-time errors---although it is possible to write type-checked @esqueleto@ queries that fail at runtime. . diff --git a/package.yaml b/package.yaml index 7dc7317..9e449a0 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: esqueleto -version: 2.6.2 +version: 2.7.0 synopsis: Type-safe EDSL for SQL queries on persistent backends. description: ! '@esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends. Its