X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FNews.hs;h=77dc74a7f880e4d84e7602a91a4a05d2716f8d06;hb=928a90109375caaa888ae4413151b560838948b7;hp=38288008e459f9e4a2452479cb91354afd76cb9d;hpb=0565f201345151c25b241587115a0d400da7d54f;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs index 3828800..77dc74a 100644 --- a/src/TSN/XML/News.hs +++ b/src/TSN/XML/News.hs @@ -33,11 +33,9 @@ import Database.Groundhog ( countAll, deleteAll, insert_, - migrate, - runMigration, - silentMigrationLogger ) + migrate ) import Database.Groundhog.Core ( DefaultKey ) -import Database.Groundhog.Generic ( runDbConn ) +import Database.Groundhog.Generic ( runDbConn, runMigrationSilent ) import Database.Groundhog.Sqlite ( withSqliteConn ) import Database.Groundhog.TH ( groundhog, @@ -82,7 +80,7 @@ import Xml ( ToDb(..), pickle_unpickle, unpickleable, - unsafe_read_document, + unsafe_read_invalid_document, unsafe_unpickle ) @@ -545,7 +543,7 @@ test_on_delete_cascade = testGroup "cascading delete tests" let d = undefined :: News_Team let e = undefined :: News_Location actual <- withSqliteConn ":memory:" $ runDbConn $ do - runMigration silentMigrationLogger $ do + runMigrationSilent $ do migrate a migrate b migrate c @@ -576,6 +574,6 @@ test_sms_detected_correctly = False ] where check path desc expected = testCase desc $ do - xmltree <- unsafe_read_document path + xmltree <- unsafe_read_invalid_document path let actual = has_only_single_sms xmltree actual @?= expected