From 6382da85a7eb0e1550e385695d5afc4adbb74304 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 23 Jun 2021 23:31:26 +0200 Subject: [PATCH] fixup! fixup! feat: introduce a mergeStatus column when joining frames --- src/Frames/Joins.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Frames/Joins.hs b/src/Frames/Joins.hs index e4cac94..4329878 100644 --- a/src/Frames/Joins.hs +++ b/src/Frames/Joins.hs @@ -27,8 +27,8 @@ import Data.Vinyl.TypeLevel import Data.Vinyl import Data.Vinyl.Functor import Frames.ShowCSV -import Frames.Col ((:->)) --- ((:->)) +import Frames.Col +-- for ((:->)) and col data MergeStatus = MergeFromLeft | MergeFromRight | MergeBoth deriving (Show, ShowCSV) @@ -217,9 +217,9 @@ outerJoinStatus a b = proj2 = rcast @fs {-# INLINE mergeFun #-} -- <+> MergeBoth - mergeFun l r = justsFromRec $ mergeRecStatus @fs l r <+> (MergeFromRight &: RNil) + mergeFun l r = justsFromRec $ mergeRecStatus @fs l r <+> (Col MergeFromRight &: RNil) {-# INLINE mergeLeftEmpty #-} - mergeLeftEmpty l = justsFromRec l <+> mkNothingsRec @rs2' <+> justsFromRec (MergeFromRight &: RNil) + mergeLeftEmpty l = justsFromRec l <+> mkNothingsRec @rs2' <+> justsFromRec (Col MergeFromRight &: RNil) {-# INLINE mergeRightEmpty #-} -- <+> MergeFromLeft mergeRightEmpty r = rcast @ors (mkNothingsRec @rs' <+> justsFromRec (r <+> MergeFromLeft &: RNil))