@@ -93,4 +93,12 @@ data RestrictionPredicateExpr where
93 NotPredicate :: RestrictionPredicateExpr -> RestrictionPredicateExpr
93 NotPredicate :: RestrictionPredicateExpr -> RestrictionPredicateExpr
94 RelationalExprPredicate :: RelationalExpr -> RestrictionPredicateExpr --type must be same as true and false relations (no attributes)
94 RelationalExprPredicate :: RelationalExpr -> RestrictionPredicateExpr --type must be same as true and false relations (no attributes)
95 AttributeEqualityPredicate :: AttributeName -> Atom -> RestrictionPredicateExpr -- relationalexpr must result in relation with single tuple
95 AttributeEqualityPredicate :: AttributeName -> Atom -> RestrictionPredicateExpr -- relationalexpr must result in relation with single tuple
96− deriving (Show)
96+ deriving (Show)
98+-- child + parent links
99+-- the string represents the branch name and can be used to find the named HEADs
100+data Transaction = Transaction UUID String Transaction (S.Set Transaction) |
101+ MergeTransaction UUID Transaction Transaction |
102+ NullTransaction -- the first transaction has no parent, a current head has no children
104+--data NamedHeads = NamedHeads M.Map String Transaction