From: Michael Orlitzky Date: Mon, 20 Jan 2014 07:08:10 +0000 (-0500) Subject: Use the timestamp pickler in TSN.XML.News. X-Git-Tag: 0.0.1~36 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=bd75961380ef07c2ba0ab5412e4326a197fd40c5;p=dead%2Fhtsn-import.git Use the timestamp pickler in TSN.XML.News. Set ON DELETE CASCADE where possible in TSN.XML.News. --- diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs index 20b3a1c..4a59859 100644 --- a/src/TSN/XML/News.hs +++ b/src/TSN/XML/News.hs @@ -24,6 +24,7 @@ where -- System imports. import Data.Data ( Data, constrFields, dataTypeConstrs, dataTypeOf ) +import Data.Time.Clock ( UTCTime ) import Data.List.Utils ( join, split ) import Data.Tuple.Curry ( uncurryN ) import Data.Typeable ( Typeable ) @@ -55,6 +56,7 @@ import TSN.Codegen ( tsn_codegen_config, tsn_db_field_namer ) -- Used in a test import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) +import TSN.Picklers ( xp_time_stamp ) import TSN.XmlImport ( XmlImport(..) ) import Xml ( FromXml(..), pickle_unpickle, unpickleable ) @@ -150,7 +152,7 @@ data Message = xml_editor :: Maybe String, xml_text :: Maybe String, -- Text and continue seem to show up in pairs, xml_continue :: Maybe String, -- either both present or both missing. - xml_time_stamp :: String } + xml_time_stamp :: UTCTime } deriving (Eq, Show) @@ -166,7 +168,8 @@ data News = db_sms :: String, db_editor :: Maybe String, db_text :: Maybe String, - db_continue :: Maybe String } + db_continue :: Maybe String, + db_time_stamp :: UTCTime } deriving (Data, Eq, Show, Typeable) @@ -185,7 +188,8 @@ instance FromXml Message where db_sms = xml_sms, db_editor = xml_editor, db_text = xml_text, - db_continue = xml_continue } + db_continue = xml_continue, + db_time_stamp = xml_time_stamp } -- | This lets us call 'insert_xml' on a 'Message'. -- @@ -279,8 +283,12 @@ mkPersist tsn_codegen_config [groundhog| fields: - name: news_NewsTeam0 # Default created by mkNormalFieldName dbName: news_id + reference: + onDelete: cascade - name: news_NewsTeam1 # Default created by mkNormalFieldName dbName: news_teams_id + reference: + onDelete: cascade - entity: News_NewsLocation dbName: news__news_locations @@ -289,8 +297,12 @@ mkPersist tsn_codegen_config [groundhog| fields: - name: news_NewsLocation0 # Default created by mkNormalFieldName dbName: news_id + reference: + onDelete: cascade - name: news_NewsLocation1 # Default created by mkNormalFieldName dbName: news_locations_id + reference: + onDelete: cascade |] @@ -353,7 +365,7 @@ pickle_message = (xpOption (xpElem "Editor" xpText)) (xpOption (xpElem "text" xpText)) pickle_continue - (xpElem "time_stamp" xpText) + (xpElem "time_stamp" xp_time_stamp) where from_tuple = uncurryN Message to_tuple m = (xml_xml_file_id m, -- Verbose,