Skip to content

Commit

Permalink
Handle another deprecaetd use of join.
Browse files Browse the repository at this point in the history
  • Loading branch information
chenwilliam77 committed Jul 31, 2020
1 parent 7bed1da commit adbbef2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/data/load_data.jl
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,11 @@ function load_data_levels(m::AbstractDSGEModel; verbose::Symbol=:low)
rows = start_date .<= addl_data[!,:date] .<= end_date

addl_data = addl_data[rows, cols]
df = join(df, addl_data, on=:date, kind=:outer)
if isdefined(DataFrames, :outerjoin)
df = outerjoin(df, addl_data, on=:date)
else
df = join(df, addl_data, on=:date, kind = :outer)
end
else
# If series not found, use all missings
addl_data = DataFrame(fill(missing, (size(df,1), length(mnemonics))))
Expand Down

2 comments on commit adbbef2

@chenwilliam77
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/18765

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.1.6 -m "<description of version>" adbbef26853659a77c5fc207cee158a180aabd2d
git push origin v1.1.6

Please sign in to comment.