Skip to content

Commit efe069a

Browse files
committed
Fix python test.
1 parent 8ff97ed commit efe069a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

python/pyspark/sql/dataframe.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,11 @@ def join(self, other, on=None, how=None):
567567
if on is None or len(on) == 0:
568568
jdf = self._jdf.join(other._jdf)
569569
elif isinstance(on[0], basestring):
570-
jdf = self._jdf.join(other._jdf, self._jseq(on))
570+
if how is None:
571+
jdf = self._jdf.join(other._jdf, self._jseq(on), "inner")
572+
else:
573+
assert isinstance(how, basestring), "how should be basestring"
574+
jdf = self._jdf.join(other._jdf, self._jseq(on), how)
571575
else:
572576
assert isinstance(on[0], Column), "on should be Column or list of Column"
573577
if len(on) > 1:

0 commit comments

Comments
 (0)