Handle 0-list maps (erroring out) and add test-case

Fixes #10035 With @taniabogatsch
duckdb · Jan 10, 2024 · 631158c · 631158c
1 parent db09b50
commit 631158c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/core_functions/scalar/map/map.cpp b/src/core_functions/scalar/map/map.cpp
@@ -32,12 +32,13 @@ static void AlignVectorToReference(const Vector &original, const Vector &referen
 
 	Vector expanded_const(ListType::GetChildType(original.GetType()), new_length);
 
-	auto expansion_factor = new_length / original_length;
-	if (expansion_factor != tuple_count) {
+	if (new_length != tuple_count * original_length) {
 		throw InvalidInputException("Error in MAP creation: key list and value list do not align. i.e. different "
 		                            "size or incompatible structure");
 	}
+	auto expansion_factor = original_length ? new_length / original_length : original_length;
 	CreateExpandedVector(original, expanded_const, expansion_factor);
+
 	result.Reference(expanded_const);
 }
 

diff --git a/test/sql/types/map/map_empty.test b/test/sql/types/map/map_empty.test
@@ -0,0 +1,7 @@
+# name: test/sql/types/map/map_empty.test
+# description: Test empty map
+# group: [map]
+
+statement error
+SELECT DISTINCT MAP { * : ? IN ( SELECT TRUE ) } ;
+----