X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FAutoRacingResults.hs;h=e51fff852aabac0cb6c25ebc6c4e524bd5b0c310;hb=32147474ba5c91452eeb532381f63e88c257a982;hp=e2bb7e7af1edb1278410029480a5baa2352c5b3b;hpb=f2c9d5fe3dcbc43309c0561d55442cf26b67889a;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/AutoRacingResults.hs b/src/TSN/XML/AutoRacingResults.hs
index e2bb7e7..e51fff8 100644
--- a/src/TSN/XML/AutoRacingResults.hs
+++ b/src/TSN/XML/AutoRacingResults.hs
@@ -1,4 +1,3 @@
-
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleInstances #-}
@@ -30,14 +29,13 @@ import Data.Maybe ( fromMaybe )
 import Data.Time ( UTCTime(..) )
 import Data.Tuple.Curry ( uncurryN )
 import Data.Typeable ( Typeable )
+import qualified Data.Vector.HFixed as H ( HVector, cons, convert )
 import Database.Groundhog (
   countAll,
   deleteAll,
-  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,
@@ -62,7 +60,6 @@ import Text.XML.HXT.Core (
   xpWrap )
 
 -- Local imports.
-import Generics ( Generic(..), prepend, to_tuple )
 import TSN.Codegen ( tsn_codegen_config )
 import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate )
 import TSN.Picklers (
@@ -134,9 +131,9 @@ data Message =
     xml_time_stamp :: UTCTime }
   deriving (Eq, GHC.Generic, Show)
 
--- | For 'Generics.to_tuple'.
+-- | For 'H.convert'.
 --
-instance Generic Message
+instance H.HVector Message
 
 
 instance ToDb Message where
@@ -197,9 +194,9 @@ data AutoRacingResultsListing =
     _db_earnings :: Maybe Int }
   deriving ( GHC.Generic )
 
--- | For 'Generics.prepend'.
+-- | For 'H.convert' and 'H.cons'.
 --
-instance Generic AutoRacingResultsListing
+instance H.HVector AutoRacingResultsListing
 
 -- | XML representation of a \<Listing\> contained within a
 --   \<message\>. The leading underscores prevent unused field
@@ -222,9 +219,9 @@ data AutoRacingResultsListingXml =
     _xml_earnings :: Maybe Int }
   deriving (Eq, GHC.Generic, Show)
 
--- | For 'Generics.to_tuple'.
+-- | For 'H.convert'.
 --
-instance Generic AutoRacingResultsListingXml
+instance H.HVector AutoRacingResultsListingXml
 
 instance ToDb AutoRacingResultsListingXml where
   -- | The database analogue of an 'AutoRacingResultsListingXml' is
@@ -245,7 +242,7 @@ instance FromXmlFk AutoRacingResultsListingXml where
   --   'AutoRacingResultsListing', we add the foreign key and copy
   --   everything else verbatim.
   --
-  from_xml_fk = prepend
+  from_xml_fk = H.cons
 
 
 -- | This allows us to insert the XML representation
@@ -460,7 +457,7 @@ mkPersist tsn_codegen_config [groundhog|
 pickle_listing :: PU AutoRacingResultsListingXml
 pickle_listing =
   xpElem "Listing" $
-    xpWrap (from_tuple, to_tuple) $
+    xpWrap (from_tuple, H.convert) $
     xp13Tuple (xpElem "FinishPosition" xpInt)
               (xpElem "StartingPosition" xpInt)
               (xpElem "CarNumber" xpInt)
@@ -483,7 +480,7 @@ pickle_listing =
 pickle_message :: PU Message
 pickle_message =
   xpElem "message" $
-    xpWrap (from_tuple, to_tuple) $
+    xpWrap (from_tuple, H.convert) $
     xp13Tuple (xpElem "XML_File_ID" xpInt)
               (xpElem "heading" xpText)
               (xpElem "category" xpText)
@@ -665,7 +662,7 @@ test_on_delete_cascade = testGroup "cascading delete tests"
       let c = undefined :: AutoRacingResultsRaceInformation
 
       actual <- withSqliteConn ":memory:" $ runDbConn $ do
-                  runMigration silentMigrationLogger $ do
+                  runMigrationSilent $ do
                     migrate a
                     migrate b
                     migrate c