dfmerge updated

mwsohn · Sep 20, 2018 · 4c041d8 · 4c041d8
1 parent d6c9176
commit 4c041d8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/DataFrame_tools.jl b/src/DataFrame_tools.jl
@@ -540,9 +540,9 @@ function dfmerge(df1::DataFrame,df2::DataFrame,linkers::Union{Symbol,Vector};kin
     df_merged = join(df1,df2,on = linkers,kind=kind)
     df_merged[:_merge] = zeros(Int8,size(df_merged,1))
     for i = 1:size(df_merged,1)
-        if isna(df_merged[i,:___mergeright___])
+        if ismissing(df_merged[i,:___mergeright___])
             df_merged[i,:_merge] = 1
-        elseif isna(df_merged[i,:___mergeleft___])
+        elseif ismissing(df_merged[i,:___mergeleft___])
             df_merged[i,:_merge] = 2
         elseif df_merged[i,:___mergeleft___] == 1 && df_merged[i,:___mergeright___] == 1
             df_merged[i,:_merge] = 3