Merge branch 'master' into matt/remove-class

README.md

@@ -158,7 +158,7 @@ However, you may want your results to include people who don't have any blog pos
 ```haskell
 select $
 from $ \(p `LeftOuterJoin`` mb) -> do
-on (just (p ^. PersonId) ==. mb ?. BlogPostAuthorId)
+on (p ^. PersonId ==. mb ?. BlogPostAuthorId)
 orderBy [asc (p ^. PersonName), asc (mb ?. BlogPostTitle)]
 return (p, mb)
 ```

changelog.md

@@ -1,3 +1,19 @@
+Unreleased
+========
+
+2.7.0
+=======
+
+- @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
+=======
+
+- @ChrisCoffey
+  - [#114](https://github.com/bitemyapp/esqueleto/pull/114): Fix Haddock by
+    working around an upstream bug.
+
 2.6.0
 ========
 - @bitemyapp

esqueleto.cabal

@@ -7,7 +7,7 @@ cabal-version: 1.12
 -- hash: 23efdc2ff821db986867d35578cf56e958a8cdc351813fe6c6cfdbd4a173a994
 
 name:           esqueleto
-version:        2.6.0
+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 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.
                 .
@@ -24,6 +24,9 @@ copyright:      (c) 2012-2016 Felipe Almeida Lessa
 license:        BSD3
 license-file:   LICENSE
 build-type:     Simple
+extra-source-files:
+    README.md
+    changelog.md
 
 source-repository head
   type: git

package.yaml

@@ -1,5 +1,5 @@
 name: esqueleto
-version: '2.6.0'
+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
@@ -41,6 +41,9 @@ copyright: (c) 2012-2016 Felipe Almeida Lessa
 license: BSD3
 homepage: https://github.com/bitemyapp/esqueleto
 git: git://github.com/bitemyapp/esqueleto.git
+extra-source-files:
+- README.md
+- changelog.md
 
 dependencies:
   - base >=4.8 && <5.0

src/Database/Esqueleto/Internal/PersistentImport.hs

@@ -1,7 +1,146 @@
 -- | Re-export "Database.Persist.Sql" without any clashes with
 -- @esqueleto@.
 module Database.Esqueleto.Internal.PersistentImport
-  ( module Database.Persist.Sql
+-- NOTE: switch back to a module export once https://gitlab.haskell.org/ghc/ghc/merge_requests/276
+-- has been merged. See https://github.com/bitemyapp/esqueleto/issues/110 for more details
+  ( toJsonText,
+  entityIdFromJSON,
+  entityIdToJSON,
+  entityValues,
+  fromPersistValueJSON,
+  keyValueEntityFromJSON,
+  keyValueEntityToJSON,
+  toPersistValueJSON,
+  selectKeys,
+  belongsTo,
+  belongsToJust,
+  getEntity,
+  getJust,
+  getJustEntity,
+  insertEntity,
+  insertRecord,
+  liftPersist,
+  checkUnique,
+  getByValue,
+  insertBy,
+  insertUniqueEntity,
+  onlyUnique,
+  replaceUnique,
+  transactionSave,
+  transactionUndo,
+  defaultAttribute,
+  mkColumns,
+  getMigration,
+  migrate,
+  parseMigration,
+  parseMigration',
+  printMigration,
+  runMigration,
+  runMigrationSilent,
+  runMigrationUnsafe,
+  showMigration,
+  decorateSQLWithLimitOffset,
+  fieldDBName,
+  fromSqlKey,
+  getFieldName,
+  getTableName,
+  tableDBName,
+  toSqlKey,
+  withRawQuery,
+  getStmtConn,
+  rawExecute,
+  rawExecuteCount,
+  rawQuery,
+  rawQueryRes,
+  rawSql,
+  askLogFunc,
+  close',
+  createSqlPool,
+  liftSqlPersistMPool,
+  runSqlConn,
+  runSqlPersistM,
+  runSqlPersistMPool,
+  runSqlPool,
+  withSqlConn,
+  withSqlPool,
+  readToUnknown,
+  readToWrite,
+  writeToUnknown,
+  entityKeyFields,
+  entityPrimary,
+  fromPersistValueText,
+  keyAndEntityFields,
+  toEmbedEntityDef,
+  PersistStore,
+  PersistUnique,
+  DeleteCascade(..),
+  PersistConfig(..),
+  BackendSpecificUpdate,
+  Entity(..),
+  PersistEntity(..),
+  PersistField(..),
+  SomePersistField(..),
+  PersistQueryRead(..),
+  PersistQueryWrite(..),
+  BackendCompatible(..),
+  BackendKey(..),
+  HasPersistBackend(..),
+  IsPersistBackend,
+  PersistCore(..),
+  PersistRecordBackend,
+  PersistStoreRead(..),
+  PersistStoreWrite(..),
+  ToBackendKey(..),
+  PersistUniqueRead(..),
+  PersistUniqueWrite(..),
+  PersistFieldSql(..),
+  RawSql(..),
+  CautiousMigration,
+  Column(..),
+  Connection,
+  ConnectionPool,
+  Migration,
+  PersistentSqlException(..),
+  Single(..),
+  Sql,
+  SqlPersist,
+  SqlPersistM,
+  SqlPersistT,
+  InsertSqlResult(..),
+  IsSqlBackend,
+  LogFunc,
+  SqlBackend(..),
+  SqlBackendCanRead,
+  SqlBackendCanWrite,
+  SqlReadBackend(..),
+  SqlReadT,
+  SqlWriteBackend(..),
+  SqlWriteT,
+  Statement(..),
+  Attr,
+  Checkmark(..),
+  CompositeDef(..),
+  DBName(..),
+  EmbedEntityDef(..),
+  EmbedFieldDef(..),
+  EntityDef(..),
+  ExtraLine,
+  FieldDef(..),
+  FieldType(..),
+  ForeignDef(..),
+  ForeignFieldDef,
+  HaskellName(..),
+  IsNullable(..),
+  OnlyUniqueException(..),
+  PersistException(..),
+  PersistFilter(..),
+  PersistUpdate(..),
+  PersistValue(..),
+  ReferenceDef(..),
+  SqlType(..),
+  UniqueDef(..),
+  UpdateException(..),
+  WhyNullable(..)
   ) where
 
 import Database.Persist.Sql hiding