From 5d887bab4403a192ca63a5d62fac9b2acecbddb9 Mon Sep 17 00:00:00 2001 From: Han Wang Date: Sun, 2 Oct 2022 21:08:54 -0700 Subject: [PATCH] Prepare for 0.7.3 release (#367) * Add release note * update --- RELEASE.md | 2 ++ fugue/dataframe/utils.py | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 059284cf..1697dd0a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,6 +5,8 @@ - [362](https://github.com/fugue-project/fugue/issues/362) Remove Python 3.6 Support - [363](https://github.com/fugue-project/fugue/issues/363) Create IbisDataFrame and IbisExecutionEngine - [364](https://github.com/fugue-project/fugue/issues/364) Enable Map type support +- [365](https://github.com/fugue-project/fugue/issues/365) Support column names starting with numbers +- [361](https://github.com/fugue-project/fugue/issues/361) Better error message for cross join ## 0.7.2 diff --git a/fugue/dataframe/utils.py b/fugue/dataframe/utils.py index 9165a22d..bc1de98a 100644 --- a/fugue/dataframe/utils.py +++ b/fugue/dataframe/utils.py @@ -490,10 +490,11 @@ def get_join_schemas( ) cm = df1.schema.intersect(on) if how == "cross": + cs = df1.schema.intersect(schema2) aot( - len(df1.schema.intersect(schema2)) == 0, - SchemaError("can't specify on for cross join"), + len(cs) == 0, + SchemaError(f"invalid cross join, two dataframes have common columns {cs}"), ) else: - aot(len(on) > 0, SchemaError("on must be specified")) + aot(len(on) > 0, SchemaError("join on columns must be specified")) return cm, (df1.schema.union(schema2))