From a5e968bb8d4c608c33463160ea2b583a3e34b8fc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 Sep 2017 13:57:25 -0400 Subject: add ExportTree table to export db New table needed to look up what filenames are used in the currently exported tree, for reasons explained in export.mdwn. Also, added smart constructors for ExportLocation and ExportDirectory to make sure they contain filepaths with the right direction slashes. And some code refactoring. This commit was sponsored by Francois Marier on Patreon. --- Database/Types.hs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'Database/Types.hs') diff --git a/Database/Types.hs b/Database/Types.hs index a4b5fbcb1..49a63f067 100644 --- a/Database/Types.hs +++ b/Database/Types.hs @@ -1,6 +1,6 @@ {- types for SQL databases - - - Copyright 2015-2016 Joey Hess + - Copyright 2015-2017 Joey Hess - - Licensed under the GNU GPL version 3 or higher. -} @@ -16,6 +16,7 @@ import Data.Char import Utility.PartialPrelude import Key import Utility.InodeCache +import Git.Types (Ref(..)) -- A serialized Key newtype SKey = SKey String @@ -93,3 +94,21 @@ fromSFilePath (SFilePath s) = s derivePersistField "SFilePath" +-- A serialized Ref +newtype SRef = SRef Ref + +-- Note that Read instance does not work when used in any kind of complex +-- data structure. +instance Read SRef where + readsPrec _ s = [(SRef (Ref s), "")] + +instance Show SRef where + show (SRef (Ref s)) = s + +derivePersistField "SRef" + +toSRef :: Ref -> SRef +toSRef = SRef + +fromSRef :: SRef -> Ref +fromSRef (SRef r) = r -- cgit v1.2.3