Skip to content

Commit be2242e

Browse files
findepisadboy
authored andcommitted
TMP: Disable qualified names uniqueness check in schema
1 parent 7909909 commit be2242e

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

datafusion/common/src/dfschema.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,11 @@ impl DFSchema {
233233
for (field, qualifier) in self.inner.fields().iter().zip(&self.field_qualifiers) {
234234
if let Some(qualifier) = qualifier {
235235
if !qualified_names.insert((qualifier, field.name())) {
236-
return _schema_err!(SchemaError::DuplicateQualifiedField {
237-
qualifier: Box::new(qualifier.clone()),
238-
name: field.name().to_string(),
239-
});
236+
// TODO properly revert or restore this error
237+
// return _schema_err!(SchemaError::DuplicateQualifiedField {
238+
// qualifier: Box::new(qualifier.clone()),
239+
// name: field.name().to_string(),
240+
// });
240241
}
241242
} else if !unqualified_names.insert(field.name()) {
242243
return _schema_err!(SchemaError::DuplicateUnqualifiedField {
@@ -1257,10 +1258,7 @@ mod tests {
12571258
let left = DFSchema::try_from_qualified_schema("t1", &test_schema_1())?;
12581259
let right = DFSchema::try_from_qualified_schema("t1", &test_schema_1())?;
12591260
let join = left.join(&right);
1260-
assert_eq!(
1261-
join.unwrap_err().strip_backtrace(),
1262-
"Schema error: Schema contains duplicate qualified field name t1.c0",
1263-
);
1261+
assert!(join.is_ok());
12641262
Ok(())
12651263
}
12661264

datafusion/sqllogictest/test_files/join.slt.part

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,14 +1237,18 @@ statement ok
12371237
create table t1(v1 int) as values(100);
12381238

12391239
## Query with Ambiguous column reference
1240-
query error DataFusion error: Schema error: Schema contains duplicate qualified field name t1\.v1
1240+
query I
12411241
select count(*)
12421242
from t1
12431243
right outer join t1
12441244
on t1.v1 > 0;
1245+
----
1246+
1
12451247

1246-
query error DataFusion error: Schema error: Schema contains duplicate qualified field name t1\.v1
1248+
query I
12471249
select t1.v1 from t1 join t1 using(v1) cross join (select struct('foo' as v1) as t1);
1250+
----
1251+
100
12481252

12491253
statement ok
12501254
drop table t1;

0 commit comments

Comments
 (0)