From: Michael Orlitzky Date: Thu, 23 Jan 2014 00:45:41 +0000 (-0500) Subject: Update TODO and add a cascading delete test for newsxml. X-Git-Tag: 0.0.2~2 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=b8d151d034a338242ee1193638ff077614d10580;p=dead%2Fhtsn-import.git Update TODO and add a cascading delete test for newsxml. --- diff --git a/doc/TODO b/doc/TODO index 7876771..42f3b2c 100644 --- a/doc/TODO +++ b/doc/TODO @@ -4,5 +4,6 @@ 2. Write a test for test/xml/Odds_XML-long-import.xml once it no longer takes 10 minutes to import (Postgres only?). -3. Write a test for the ON DELETE CASCADE behavior (newsxml, Odds_XML, - weatherxml). +3. Write a test for the ON DELETE CASCADE behavior (Odds_XML, weatherxml). + +4. Add support the the second type of weatherxml (see man page). diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs index 2031634..2cc9698 100644 --- a/src/TSN/XML/News.hs +++ b/src/TSN/XML/News.hs @@ -29,9 +29,15 @@ import Data.List.Utils ( join, split ) import Data.Tuple.Curry ( uncurryN ) import Data.Typeable ( Typeable ) import Database.Groundhog ( + countAll, + executeRaw, insert_, - migrate ) + migrate, + runMigration, + silentMigrationLogger ) import Database.Groundhog.Core ( DefaultKey ) +import Database.Groundhog.Generic ( runDbConn ) +import Database.Groundhog.Sqlite ( withSqliteConn ) import Database.Groundhog.TH ( defaultCodegenConfig, groundhog, @@ -59,7 +65,12 @@ import TSN.Database ( insert_or_select ) import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) import TSN.Picklers ( xp_time_stamp ) import TSN.XmlImport ( XmlImport(..) ) -import Xml ( FromXml(..), ToDb(..), pickle_unpickle, unpickleable ) +import Xml ( + FromXml(..), + ToDb(..), + pickle_unpickle, + unpickleable, + unsafe_unpickle ) -- @@ -420,6 +431,7 @@ news_tests = testGroup "News tests" [ test_news_fields_have_correct_names, + test_on_delete_cascade, test_pickle_of_unpickle_is_identity, test_unpickle_succeeds ] @@ -485,3 +497,39 @@ test_unpickle_succeeds = testGroup "unpickle tests" actual <- unpickleable path pickle_message let expected = True actual @?= expected + + +-- | Make sure everything gets deleted when we delete the top-level +-- record. +-- +test_on_delete_cascade :: TestTree +test_on_delete_cascade = testGroup "cascading delete tests" + [ check "deleting news deletes its children" + "test/xml/newsxml.xml" ] + where + check desc path = testCase desc $ do + news <- unsafe_unpickle path pickle_message + let a = undefined :: News + let b = undefined :: NewsTeam + let c = undefined :: News_NewsTeam + let d = undefined :: NewsLocation + let e = undefined :: News_NewsLocation + actual <- withSqliteConn ":memory:" $ runDbConn $ do + runMigration silentMigrationLogger $ do + migrate a + migrate b + migrate c + migrate d + migrate e + _ <- dbimport news + -- No idea how 'delete' works, so do this instead. + executeRaw False "DELETE FROM news;" [] + count_a <- countAll a + count_b <- countAll b + count_c <- countAll c + count_d <- countAll d + count_e <- countAll e + return $ count_a + count_b + count_c + count_d + count_e + -- There are 2 news_teams and 2 news_locations that should remain. + let expected = 4 + actual @?= expected