persistent-test 2.13.1.3 → 2.13.1.4

raw patch · 37 files changed

+167/−109 lines, 37 filesdep ~persistentPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: persistent

API changes (from Hackage documentation)

Files

• ChangeLog.md +4/−0
• persistent-test.cabal +101/−100
• src/CompositeTest.hs +1/−0
• src/CustomPersistFieldTest.hs +1/−0
• src/CustomPrimaryKeyReferenceTest.hs +1/−0
• src/DataTypeTest.hs +3/−2
• src/EmbedOrderTest.hs +1/−0
• src/EmbedTest.hs +1/−0
• src/EmptyEntityTest.hs +1/−0
• src/EntityEmbedTest.hs +1/−0
• src/EquivalentTypeTest.hs +1/−0
• src/ForeignKey.hs +1/−0
• src/GeneratedColumnTestSQL.hs +1/−0
• src/HtmlTest.hs +1/−0
• src/Init.hs +1/−0
• src/LargeNumberTest.hs +1/−0
• src/LongIdentifierTest.hs +1/−0
• src/MaxLenTest.hs +1/−0
• src/MaybeFieldDefsTest.hs +1/−0
• src/MigrationColumnLengthTest.hs +1/−0
• src/MigrationIdempotencyTest.hs +1/−0
• src/MigrationOnlyTest.hs +1/−1
• src/MigrationTest.hs +1/−0
• src/PersistUniqueTest.hs +13/−0
• src/PersistentTest.hs +2/−1
• src/PersistentTestModels.hs +3/−3
• src/PersistentTestModelsImports.hs +1/−0
• src/PrimaryTest.hs +1/−0
• src/RawSqlTest.hs +1/−0
• src/ReadWriteTest.hs +11/−0
• src/Recursive.hs +1/−0
• src/RenameTest.hs +1/−1
• src/SumTypeTest.hs +1/−0
• src/TransactionLevelTest.hs +1/−0
• src/TreeTest.hs +1/−1
• src/TypeLitFieldDefsTest.hs +1/−0
• src/UniqueTest.hs +1/−0

@@ -1,5 +1,9 @@ ## Unreleased changes +## 2.13.1.4++* Support `persistent-2.17`+ ## 2.13.1.3  * Support persistent-2.14 with `SafeToInsert` class

@@ -1,109 +1,110 @@-name:            persistent-test-version:         2.13.1.3-license:         MIT-license-file:    LICENSE-author:          Michael Snoyman <michael@snoyman.com>-maintainer:      Michael Snoyman <michael@snoyman.com>-synopsis:        Tests for Persistent-description:     Tests for Persistent. This is only for use in developing libraries that should conform to the persistent interface, not for users of the persistent suite of database libraries.-category:        Database, Yesod-stability:       Stable-cabal-version:   >= 1.10-build-type:      Simple-homepage:        http://www.yesodweb.com/book/persistent-bug-reports:     https://github.com/yesodweb/persistent/issues+name:               persistent-test+version:            2.13.1.4+license:            MIT+license-file:       LICENSE+author:             Michael Snoyman <michael@snoyman.com>+maintainer:         Michael Snoyman <michael@snoyman.com>+synopsis:           Tests for Persistent+description:+  Tests for Persistent. This is only for use in developing libraries that should conform to the persistent interface, not for users of the persistent suite of database libraries.++category:           Database, Yesod+stability:          Stable+cabal-version:      >=1.10+build-type:         Simple+homepage:           http://www.yesodweb.com/book/persistent+bug-reports:        https://github.com/yesodweb/persistent/issues extra-source-files: ChangeLog.md  library-    exposed-modules: -        CompositeTest-        CustomPersistField-        CustomPersistFieldTest-        CustomPrimaryKeyReferenceTest-        DataTypeTest-        EmbedTest-        EmbedOrderTest-        EmptyEntityTest-        EntityEmbedTest-        EquivalentTypeTest-        ForeignKey-        HtmlTest-        Init-        LargeNumberTest-        MaxLenTest-        MaybeFieldDefsTest-        MigrationColumnLengthTest-        MigrationIdempotencyTest-        MigrationOnlyTest-        MigrationTest-        MpsNoPrefixTest-        MpsCustomPrefixTest-        PersistentTest-        PersistentTestModels-        PersistentTestModelsImports-        GeneratedColumnTestSQL-        PersistTestPetType-        PersistTestPetCollarType-        PersistUniqueTest-        PrimaryTest-        RawSqlTest-        ReadWriteTest-        RenameTest-        Recursive-        SumTypeTest-        TransactionLevelTest-        TreeTest-        TypeLitFieldDefsTest-        UniqueTest-        UpsertTest-        LongIdentifierTest--    hs-source-dirs: src+  exposed-modules:+    CompositeTest+    CustomPersistField+    CustomPersistFieldTest+    CustomPrimaryKeyReferenceTest+    DataTypeTest+    EmbedOrderTest+    EmbedTest+    EmptyEntityTest+    EntityEmbedTest+    EquivalentTypeTest+    ForeignKey+    GeneratedColumnTestSQL+    HtmlTest+    Init+    LargeNumberTest+    LongIdentifierTest+    MaxLenTest+    MaybeFieldDefsTest+    MigrationColumnLengthTest+    MigrationIdempotencyTest+    MigrationOnlyTest+    MigrationTest+    MpsCustomPrefixTest+    MpsNoPrefixTest+    PersistentTest+    PersistentTestModels+    PersistentTestModelsImports+    PersistTestPetCollarType+    PersistTestPetType+    PersistUniqueTest+    PrimaryTest+    RawSqlTest+    ReadWriteTest+    Recursive+    RenameTest+    SumTypeTest+    TransactionLevelTest+    TreeTest+    TypeLitFieldDefsTest+    UniqueTest+    UpsertTest -    build-depends: -        base                     >= 4.9       && < 5-      , aeson                    >= 1.0-      , blaze-html               >= 0.9-      , bytestring               >= 0.10-      , conduit                  >= 1.2.12-      , containers               >= 0.5-      , exceptions               >= 0.8-      , hspec                    >= 2.4-      , hspec-expectations-      , http-api-data-      , HUnit-      , monad-control-      , monad-logger             >= 0.3.25-      , mtl-      , path-pieces              >= 0.2-      , persistent               >= 2.14        && < 2.15-      , QuickCheck               >= 2.9-      , quickcheck-instances     >= 0.3-      , random                   >= 1.1-      , resourcet                >= 1.1-      , text                     >= 1.2-      , time                     >= 1.6-      , transformers             >= 0.5-      , transformers-base-      , unliftio-      , unliftio-core-      , unordered-containers+  hs-source-dirs:     src+  build-depends:+      aeson                 >=1.0+    , base                  >=4.9    && <5+    , blaze-html            >=0.9+    , bytestring            >=0.10+    , conduit               >=1.2.12+    , containers            >=0.5+    , exceptions            >=0.8+    , hspec                 >=2.4+    , hspec-expectations+    , http-api-data+    , HUnit+    , monad-control+    , monad-logger          >=0.3.25+    , mtl+    , path-pieces           >=0.2+    , persistent            >=2.14   && <2.18+    , QuickCheck            >=2.9+    , quickcheck-instances  >=0.3+    , random                >=1.1+    , resourcet             >=1.1+    , text                  >=1.2+    , time                  >=1.6+    , transformers          >=0.5+    , transformers-base+    , unliftio+    , unliftio-core+    , unordered-containers -  default-language: Haskell2010+  default-language:   Haskell2010   default-extensions:-      ExistentialQuantification-      FlexibleContexts-      FlexibleInstances-      MultiParamTypeClasses-      OverloadedStrings-      QuasiQuotes-      TemplateHaskell-      TypeFamilies-      StandaloneDeriving-      DerivingStrategies-      GeneralizedNewtypeDeriving-      DataKinds+    DataKinds+    DerivingStrategies+    ExistentialQuantification+    FlexibleContexts+    FlexibleInstances+    GeneralizedNewtypeDeriving+    MultiParamTypeClasses+    OverloadedStrings+    QuasiQuotes+    StandaloneDeriving+    TemplateHaskell+    TypeFamilies  source-repository head   type:     git-  location: git://github.com/yesodweb/persistent.git+  location: https://github.com/yesodweb/persistent.git

@@ -1,5 +1,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -- FIXME {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} module CompositeTest where

@@ -1,4 +1,5 @@ {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module CustomPersistFieldTest (specsWith, customFieldMigrate) where 

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -- This test is based on this issue: https://github.com/yesodweb/persistent/issues/421 -- The primary thing this is testing is the migration, thus the test code itself being mostly negligible.

@@ -1,5 +1,6 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module DataTypeTest     ( specsWith@@ -116,10 +117,10 @@             key <- insert x             Just y <- get key             liftIO $ do-                let check :: (Eq a, Show a) => String -> (entity -> a) -> IO ()+                let check :: (Eq a, Show a, HasCallStack) => String -> (entity -> a) -> IO ()                     check s f = (s, f x) @=? (s, f y)                 -- Check floating-point near equality-                let check' :: (Fractional p, Show p, Real p) => String -> (entity -> p) -> IO ()+                let check' :: (Fractional p, Show p, Real p, HasCallStack) => String -> (entity -> p) -> IO ()                     check' s f                         | abs (f x - f y) < 0.000001 = return ()                         | otherwise = (s, f x) @=? (s, f y)

@@ -1,3 +1,4 @@+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module EmbedOrderTest (specsWith, embedOrderMigrate, cleanDB) where

@@ -1,4 +1,5 @@ {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-orphans -O0 #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module EmbedTest (specsWith, cleanDB, embedMigrate) where

@@ -1,4 +1,5 @@ {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module EmptyEntityTest (specsWith, migration, cleanDB) where 

@@ -1,4 +1,5 @@ {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} module EntityEmbedTest where  -- because we are using a type alias we need to declare in a separate module

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} 

@@ -1,6 +1,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE AllowAmbiguousTypes, GeneralizedNewtypeDeriving #-} {-# LANGUAGE ScopedTypeVariables, TypeApplications, UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-}  module ForeignKey where 

@@ -1,4 +1,5 @@ {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module GeneratedColumnTestSQL (specsWith) where

@@ -1,4 +1,5 @@ {-# LANGUAGE DataKinds, UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module HtmlTest (specsWith, cleanDB, htmlMigrate) where 

@@ -3,6 +3,7 @@ {-# LANGUAGE GADTs #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE TypeApplications #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-orphans #-} 

@@ -1,3 +1,4 @@+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module LargeNumberTest where 

@@ -9,6 +9,7 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module LongIdentifierTest where 

@@ -1,4 +1,5 @@ {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-}  module MaxLenTest (specsWith, maxlenMigrate) where

@@ -1,4 +1,5 @@ {-# LANGUAGE DeriveAnyClass #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} 

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module MigrationColumnLengthTest where 

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module MigrationIdempotencyTest where 

@@ -1,4 +1,4 @@-{-# LANGUAGE TypeApplications, UndecidableInstances #-}+{-# LANGUAGE TypeApplications, TypeOperators, UndecidableInstances #-}  {-# OPTIONS_GHC -Wno-unused-top-binds #-} 

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module MigrationTest where 

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module PersistUniqueTest where @@ -50,6 +51,18 @@             Just vk <- get k             Just vu <- getBy (UniqueBar b)             vu @== Entity k vk++    describe "existsBy" $ do+        it "works to query the existence of a record in the database" $ runDb $ do+            let b = 5+            k <- insert Fo { foFoo = 3, foBar = b }+            result <- existsBy $ UniqueBar b+            result @== True++        it "returns false for nonexistent records" $ runDb $ do+            insert_ Fo { foFoo = 3, foBar = 5 }+            result <- existsBy $ UniqueBar 17+            result @== False      describe "insertUniqueEntity" $ do         it "inserts a value if no conflicts are present" $ runDb $ do

@@ -1,4 +1,5 @@ {-# LANGUAGE ScopedTypeVariables #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE RecordWildCards, UndecidableInstances #-}  module PersistentTest@@ -650,7 +651,7 @@     it "provides comments on entity def" $ do       getEntityComments edef         `shouldBe`-          Just "This is a doc comment for a relationship.\nYou need to put the pipe character for each line of documentation.\nBut you can resume the doc comments afterwards.\n"+          Just "This is a doc comment for a relationship.\nOnly the first line requires a pipe.\nPipes are optional on subsequent lines.\n"     it "provides comments on the field" $ do       let [nameField, _] = getEntityFields edef       fieldComments nameField

@@ -1,6 +1,7 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE DeriveGeneric #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -- FIXME  {-# OPTIONS_GHC -ddump-splices #-}@@ -109,9 +110,8 @@     deriving Eq Show    -- | This is a doc comment for a relationship.-  -- | You need to put the pipe character for each line of documentation.-  -- Lines without a pipe are omitted.-  -- | But you can resume the doc comments afterwards.+  -- Only the first line requires a pipe.+  -- | Pipes are optional on subsequent lines.   Relationship       -- | Fields should be documentable.       name String

@@ -1,3 +1,4 @@+{-# LANGUAGE TypeOperators #-} {-# language UndecidableInstances #-}  -- | this just needs to compile

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE DeriveGeneric #-} 

@@ -1,4 +1,5 @@ {-# language ScopedTypeVariables, DataKinds #-}+{-# LANGUAGE TypeOperators #-}  module RawSqlTest where 

@@ -53,3 +53,14 @@                 mkey1 @== Nothing                 mperson <- selectFirst [PersonName ==. name_] []                 fmap entityVal mperson @== Just person++                let nameLuke = "Luke Seale New"+                    personLuke = Person nameLuke 31 Nothing+                mkey2 <- insertUnique_ personLuke+                mkey3 <- insertUnique_ personLuke+                mkey3 @== Nothing+                mpersonLuke <- selectFirst [PersonName ==. nameLuke] []+                fmap entityVal mpersonLuke @== Just personLuke+++

@@ -1,4 +1,5 @@ {-# LANGUAGE UndecidableInstances #-}+{-# LANGUAGE TypeOperators #-}  {-# OPTIONS_GHC -Wno-unused-top-binds #-} 

@@ -1,4 +1,4 @@-{-# LANGUAGE TypeApplications, UndecidableInstances #-}+{-# LANGUAGE TypeApplications, TypeOperators, UndecidableInstances #-}  module RenameTest where 

@@ -1,4 +1,5 @@ {-# LANGUAGE StandaloneDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} module SumTypeTest (specsWith, sumTypeMigrate) where

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-}  module TransactionLevelTest where

@@ -1,5 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}-{-# LANGUAGE RecordWildCards, UndecidableInstances #-}+{-# LANGUAGE RecordWildCards, TypeOperators, UndecidableInstances #-}  module TreeTest where 

@@ -1,5 +1,6 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveAnyClass #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-} 

@@ -1,4 +1,5 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module UniqueTest where