duckdb 0.8.2-dev4871.0 → 0.8.2-dev5002.0

package/src/duckdb/src/include/duckdb/common/operator/comparison_operators.hpp

@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "duckdb/common/types/string_type.hpp"
+#include "duckdb/common/helper.hpp"
 #include "duckdb/common/types.hpp"
 #include "duckdb/common/types/hugeint.hpp"
 #include "duckdb/common/types/interval.hpp"
-#include "duckdb/common/helper.hpp"
+#include "duckdb/common/types/string_type.hpp"
 
 #include <cstring>
 
@@ -142,6 +142,42 @@ struct DistinctLessThanEquals {
 	}
 };
 
+//===--------------------------------------------------------------------===//
+// Comparison Operator Wrappers (so (Not)DistinctFrom have the same API)
+//===--------------------------------------------------------------------===//
+template <class OP>
+struct ComparisonOperationWrapper {
+	static constexpr const bool COMPARE_NULL = false;
+
+	template <class T>
+	static inline bool Operation(const T &left, const T &right, bool left_null, bool right_null) {
+		if (right_null || left_null) {
+			return false;
+		}
+		return OP::template Operation<T>(left, right);
+	}
+};
+
+template <>
+struct ComparisonOperationWrapper<DistinctFrom> {
+	static constexpr const bool COMPARE_NULL = true;
+
+	template <class T>
+	static inline bool Operation(const T &left, const T &right, bool left_null, bool right_null) {
+		return DistinctFrom::template Operation<T>(left, right, left_null, right_null);
+	}
+};
+
+template <>
+struct ComparisonOperationWrapper<NotDistinctFrom> {
+	static constexpr const bool COMPARE_NULL = true;
+
+	template <class T>
+	static inline bool Operation(const T &left, const T &right, bool left_null, bool right_null) {
+		return NotDistinctFrom::template Operation<T>(left, right, left_null, right_null);
+	}
+};
+
 //===--------------------------------------------------------------------===//
 // Specialized Boolean Comparison Operators
 //===--------------------------------------------------------------------===//

package/src/duckdb/src/include/duckdb/core_functions/scalar/bit_functions.hpp

@@ -18,7 +18,7 @@ namespace duckdb {
 struct GetBitFun {
 	static constexpr const char *Name = "get_bit";
 	static constexpr const char *Parameters = "bitstring,index";
-	static constexpr const char *Description = "Extracts the nth bit from bitstring; the first (leftmost) bit is indexed 0.";
+	static constexpr const char *Description = "Extracts the nth bit from bitstring; the first (leftmost) bit is indexed 0";
 	static constexpr const char *Example = "get_bit('0110010'::BIT, 2)";
 
 	static ScalarFunction GetFunction();
@@ -27,7 +27,7 @@ struct GetBitFun {
 struct SetBitFun {
 	static constexpr const char *Name = "set_bit";
 	static constexpr const char *Parameters = "bitstring,index,new_value";
-	static constexpr const char *Description = "Sets the nth bit in bitstring to newvalue; the first (leftmost) bit is indexed 0. Returns a new bitstring.";
+	static constexpr const char *Description = "Sets the nth bit in bitstring to newvalue; the first (leftmost) bit is indexed 0. Returns a new bitstring";
 	static constexpr const char *Example = "set_bit('0110010'::BIT, 2, 0)";
 
 	static ScalarFunction GetFunction();
@@ -36,7 +36,7 @@ struct SetBitFun {
 struct BitPositionFun {
 	static constexpr const char *Name = "bit_position";
 	static constexpr const char *Parameters = "substring,bitstring";
-	static constexpr const char *Description = "Returns first starting index of the specified substring within bits, or zero if it’s not present. The first (leftmost) bit is indexed 1";
+	static constexpr const char *Description = "Returns first starting index of the specified substring within bits, or zero if it is not present. The first (leftmost) bit is indexed 1";
 	static constexpr const char *Example = "bit_position('010'::BIT, '1110101'::BIT)";
 
 	static ScalarFunction GetFunction();
@@ -45,7 +45,7 @@ struct BitPositionFun {
 struct BitStringFun {
 	static constexpr const char *Name = "bitstring";
 	static constexpr const char *Parameters = "bitstring,length";
-	static constexpr const char *Description = "Pads the bitstring until the specified length.";
+	static constexpr const char *Description = "Pads the bitstring until the specified length";
 	static constexpr const char *Example = "bitstring('1010'::BIT, 7)";
 
 	static ScalarFunction GetFunction();

package/src/duckdb/src/include/duckdb/core_functions/scalar/blob_functions.hpp

@@ -18,7 +18,7 @@ namespace duckdb {
 struct DecodeFun {
 	static constexpr const char *Name = "decode";
 	static constexpr const char *Parameters = "blob";
-	static constexpr const char *Description = "Convert blob to varchar. Fails if blob is not valid utf-8.";
+	static constexpr const char *Description = "Convert blob to varchar. Fails if blob is not valid utf-8";
 	static constexpr const char *Example = "decode('\\xC3\\xBC'::BLOB)";
 
 	static ScalarFunction GetFunction();
@@ -27,7 +27,7 @@ struct DecodeFun {
 struct EncodeFun {
 	static constexpr const char *Name = "encode";
 	static constexpr const char *Parameters = "string";
-	static constexpr const char *Description = "Convert varchar to blob. Converts utf-8 characters into literal encoding.";
+	static constexpr const char *Description = "Convert varchar to blob. Converts utf-8 characters into literal encoding";
 	static constexpr const char *Example = "encode('my_string_with_ü')";
 
 	static ScalarFunction GetFunction();
@@ -36,7 +36,7 @@ struct EncodeFun {
 struct FromBase64Fun {
 	static constexpr const char *Name = "from_base64";
 	static constexpr const char *Parameters = "string";
-	static constexpr const char *Description = "Convert a base64 encoded string to a character string.";
+	static constexpr const char *Description = "Convert a base64 encoded string to a character string";
 	static constexpr const char *Example = "from_base64('QQ==')";
 
 	static ScalarFunction GetFunction();
@@ -45,7 +45,7 @@ struct FromBase64Fun {
 struct ToBase64Fun {
 	static constexpr const char *Name = "to_base64";
 	static constexpr const char *Parameters = "blob";
-	static constexpr const char *Description = "Convert a blob to a base64 encoded string.";
+	static constexpr const char *Description = "Convert a blob to a base64 encoded string";
 	static constexpr const char *Example = "base64('A'::blob)";
 
 	static ScalarFunction GetFunction();

package/src/duckdb/src/include/duckdb/core_functions/scalar/date_functions.hpp

@@ -120,7 +120,7 @@ struct DayFun {
 struct DayNameFun {
 	static constexpr const char *Name = "dayname";
 	static constexpr const char *Parameters = "ts";
-	static constexpr const char *Description = "The (English) name of the weekday.";
+	static constexpr const char *Description = "The (English) name of the weekday";
 	static constexpr const char *Example = "dayname(TIMESTAMP '1992-03-22')";
 
 	static ScalarFunctionSet GetFunctions();
@@ -357,7 +357,7 @@ struct MonthFun {
 struct MonthNameFun {
 	static constexpr const char *Name = "monthname";
 	static constexpr const char *Parameters = "ts";
-	static constexpr const char *Description = "The (English) name of the month.";
+	static constexpr const char *Description = "The (English) name of the month";
 	static constexpr const char *Example = "monthname(TIMESTAMP '1992-09-20')";
 
 	static ScalarFunctionSet GetFunctions();
@@ -393,7 +393,7 @@ struct StrfTimeFun {
 struct StrpTimeFun {
 	static constexpr const char *Name = "strptime";
 	static constexpr const char *Parameters = "text,format";
-	static constexpr const char *Description = "Converts string to timestamp with time zone according to the format string if %Z is specified.";
+	static constexpr const char *Description = "Converts string to timestamp with time zone according to the format string if %Z is specified";
 	static constexpr const char *Example = "strptime('Wed, 1 January 1992 - 08:38:40 PST', '%a, %-d %B %Y - %H:%M:%S %Z')";
 
 	static ScalarFunctionSet GetFunctions();
@@ -402,7 +402,7 @@ struct StrpTimeFun {
 struct TimeBucketFun {
 	static constexpr const char *Name = "time_bucket";
 	static constexpr const char *Parameters = "bucket_width,timestamp,origin";
-	static constexpr const char *Description = "Truncate timestamptz by the specified interval bucket_width. Buckets are aligned relative to origin timestamptz. origin defaults to 2000-01-03 00:00:00+00 for buckets that don’t include a month or year interval, and to 2000-01-01 00:00:00+00 for month and year buckets.";
+	static constexpr const char *Description = "Truncate TIMESTAMPTZ by the specified interval bucket_width. Buckets are aligned relative to origin TIMESTAMPTZ. The origin defaults to 2000-01-03 00:00:00+00 for buckets that do not include a month or year interval, and to 2000-01-01 00:00:00+00 for month and year buckets";
 	static constexpr const char *Example = "time_bucket(INTERVAL '2 weeks', TIMESTAMP '1992-04-20 15:26:00-07', TIMESTAMP '1992-04-01 00:00:00-07')";
 
 	static ScalarFunctionSet GetFunctions();
@@ -519,7 +519,7 @@ struct ToYearsFun {
 struct TryStrpTimeFun {
 	static constexpr const char *Name = "try_strptime";
 	static constexpr const char *Parameters = "text,format";
-	static constexpr const char *Description = "Converts string to timestamp using the format string (timestamp with time zone if %Z is specified). Returns NULL on failure.";
+	static constexpr const char *Description = "Converts string to timestamp using the format string (timestamp with time zone if %Z is specified). Returns NULL on failure";
 	static constexpr const char *Example = "try_strptime('Wed, 1 January 1992 - 08:38:40 PM', '%a, %-d %B %Y - %I:%M:%S %p')";
 
 	static ScalarFunctionSet GetFunctions();

package/src/duckdb/src/include/duckdb/core_functions/scalar/enum_functions.hpp

@@ -18,8 +18,8 @@ namespace duckdb {
 struct EnumFirstFun {
 	static constexpr const char *Name = "enum_first";
 	static constexpr const char *Parameters = "enum";
-	static constexpr const char *Description = "Returns the first value of the input enum type.";
-	static constexpr const char *Example = "enum_first(null::mood)";
+	static constexpr const char *Description = "Returns the first value of the input enum type";
+	static constexpr const char *Example = "enum_first(NULL::mood)";
 
 	static ScalarFunction GetFunction();
 };
@@ -27,8 +27,8 @@ struct EnumFirstFun {
 struct EnumLastFun {
 	static constexpr const char *Name = "enum_last";
 	static constexpr const char *Parameters = "enum";
-	static constexpr const char *Description = "Returns the last value of the input enum type.";
-	static constexpr const char *Example = "enum_last(null::mood)";
+	static constexpr const char *Description = "Returns the last value of the input enum type";
+	static constexpr const char *Example = "enum_last(NULL::mood)";
 
 	static ScalarFunction GetFunction();
 };
@@ -45,8 +45,8 @@ struct EnumCodeFun {
 struct EnumRangeFun {
 	static constexpr const char *Name = "enum_range";
 	static constexpr const char *Parameters = "enum";
-	static constexpr const char *Description = "Returns all values of the input enum type as an array.";
-	static constexpr const char *Example = "enum_range(null::mood)";
+	static constexpr const char *Description = "Returns all values of the input enum type as an array";
+	static constexpr const char *Example = "enum_range(NULL::mood)";
 
 	static ScalarFunction GetFunction();
 };
@@ -54,7 +54,7 @@ struct EnumRangeFun {
 struct EnumRangeBoundaryFun {
 	static constexpr const char *Name = "enum_range_boundary";
 	static constexpr const char *Parameters = "start,end";
-	static constexpr const char *Description = "Returns the range between the two given enum values as an array. The values must be of the same enum type. When the first parameter is NULL, the result starts with the first value of the enum type. When the second parameter is NULL, the result ends with the last value of the enum type.";
+	static constexpr const char *Description = "Returns the range between the two given enum values as an array. The values must be of the same enum type. When the first parameter is NULL, the result starts with the first value of the enum type. When the second parameter is NULL, the result ends with the last value of the enum type";
 	static constexpr const char *Example = "enum_range_boundary(NULL, 'happy'::mood)";
 
 	static ScalarFunction GetFunction();

package/src/duckdb/src/include/duckdb/core_functions/scalar/generic_functions.hpp

@@ -27,7 +27,7 @@ struct AliasFun {
 struct CurrentSettingFun {
 	static constexpr const char *Name = "current_setting";
 	static constexpr const char *Parameters = "setting_name";
-	static constexpr const char *Description = "Return the current value of the configuration setting";
+	static constexpr const char *Description = "Returns the current value of the configuration setting";
 	static constexpr const char *Example = "current_setting('access_mode')";
 
 	static ScalarFunction GetFunction();
@@ -45,7 +45,7 @@ struct ErrorFun {
 struct HashFun {
 	static constexpr const char *Name = "hash";
 	static constexpr const char *Parameters = "param";
-	static constexpr const char *Description = "Returns an integer with the hash of the value. Note that this is not a cryptographic hash.";
+	static constexpr const char *Description = "Returns an integer with the hash of the value. Note that this is not a cryptographic hash";
 	static constexpr const char *Example = "hash('🦆')";
 
 	static ScalarFunction GetFunction();
@@ -54,7 +54,7 @@ struct HashFun {
 struct LeastFun {
 	static constexpr const char *Name = "least";
 	static constexpr const char *Parameters = "arg1, arg2, ...";
-	static constexpr const char *Description = "Returns the lowest value of the set of input parameters.";
+	static constexpr const char *Description = "Returns the lowest value of the set of input parameters";
 	static constexpr const char *Example = "least(42, 84)";
 
 	static ScalarFunctionSet GetFunctions();
@@ -63,7 +63,7 @@ struct LeastFun {
 struct GreatestFun {
 	static constexpr const char *Name = "greatest";
 	static constexpr const char *Parameters = "arg1, arg2, ...";
-	static constexpr const char *Description = "Returns the highest value of the set of input parameters.";
+	static constexpr const char *Description = "Returns the highest value of the set of input parameters";
 	static constexpr const char *Example = "greatest(42, 84)";
 
 	static ScalarFunctionSet GetFunctions();
@@ -72,7 +72,7 @@ struct GreatestFun {
 struct StatsFun {
 	static constexpr const char *Name = "stats";
 	static constexpr const char *Parameters = "expression";
-	static constexpr const char *Description = "Returns a string with statistics about the expression. Expression can be a column, constant, or SQL expression.";
+	static constexpr const char *Description = "Returns a string with statistics about the expression. Expression can be a column, constant, or SQL expression";
 	static constexpr const char *Example = "stats(5)";
 
 	static ScalarFunction GetFunction();
@@ -81,7 +81,7 @@ struct StatsFun {
 struct TypeOfFun {
 	static constexpr const char *Name = "typeof";
 	static constexpr const char *Parameters = "expression";
-	static constexpr const char *Description = "Returns the name of the data type of the result of the expression.";
+	static constexpr const char *Description = "Returns the name of the data type of the result of the expression";
 	static constexpr const char *Example = "typeof('abc')";
 
 	static ScalarFunction GetFunction();
@@ -99,7 +99,7 @@ struct CurrentQueryFun {
 struct CurrentSchemaFun {
 	static constexpr const char *Name = "current_schema";
 	static constexpr const char *Parameters = "";
-	static constexpr const char *Description = "Return the name of the currently active schema. Default is main.";
+	static constexpr const char *Description = "Returns the name of the currently active schema. Default is main";
 	static constexpr const char *Example = "current_schema()";
 
 	static ScalarFunction GetFunction();
@@ -108,7 +108,7 @@ struct CurrentSchemaFun {
 struct CurrentSchemasFun {
 	static constexpr const char *Name = "current_schemas";
 	static constexpr const char *Parameters = "include_implicit";
-	static constexpr const char *Description = "Return list of schemas. Pass a parameter of True to include implicit schemas.";
+	static constexpr const char *Description = "Returns list of schemas. Pass a parameter of True to include implicit schemas";
 	static constexpr const char *Example = "current_schemas(true)";
 
 	static ScalarFunction GetFunction();
@@ -117,7 +117,7 @@ struct CurrentSchemasFun {
 struct CurrentDatabaseFun {
 	static constexpr const char *Name = "current_database";
 	static constexpr const char *Parameters = "";
-	static constexpr const char *Description = "Return the name of the currently active database.";
+	static constexpr const char *Description = "Returns the name of the currently active database";
 	static constexpr const char *Example = "current_database()";
 
 	static ScalarFunction GetFunction();
@@ -126,7 +126,7 @@ struct CurrentDatabaseFun {
 struct InSearchPathFun {
 	static constexpr const char *Name = "in_search_path";
 	static constexpr const char *Parameters = "database_name,schema_name";
-	static constexpr const char *Description = "Returns whether or not the database/schema are in the search path.";
+	static constexpr const char *Description = "Returns whether or not the database/schema are in the search path";
 	static constexpr const char *Example = "in_search_path('memory', 'main')";
 
 	static ScalarFunction GetFunction();
@@ -135,7 +135,7 @@ struct InSearchPathFun {
 struct CurrentTransactionIdFun {
 	static constexpr const char *Name = "txid_current";
 	static constexpr const char *Parameters = "";
-	static constexpr const char *Description = "Returns the current transaction’s ID (a BIGINT). It will assign a new one if the current transaction does not have one already.";
+	static constexpr const char *Description = "Returns the current transaction’s ID (a BIGINT). It will assign a new one if the current transaction does not have one already";
 	static constexpr const char *Example = "txid_current()";
 
 	static ScalarFunction GetFunction();
@@ -144,7 +144,7 @@ struct CurrentTransactionIdFun {
 struct VersionFun {
 	static constexpr const char *Name = "version";
 	static constexpr const char *Parameters = "";
-	static constexpr const char *Description = "Return the currently active version of DuckDB in this format: v0.3.2	";
+	static constexpr const char *Description = "Returns the currently active version of DuckDB in this format: v0.3.2	";
 	static constexpr const char *Example = "version()";
 
 	static ScalarFunction GetFunction();

package/src/duckdb/src/include/duckdb/core_functions/scalar/list_functions.hpp

@@ -27,7 +27,7 @@ struct ListFlattenFun {
 struct ListAggregateFun {
 	static constexpr const char *Name = "list_aggregate";
 	static constexpr const char *Parameters = "list,name";
-	static constexpr const char *Description = "Executes the aggregate function name on the elements of list.";
+	static constexpr const char *Description = "Executes the aggregate function name on the elements of list";
 	static constexpr const char *Example = "list_aggregate([1, 2, NULL], 'min')";
 
 	static ScalarFunction GetFunction();
@@ -60,7 +60,7 @@ struct AggregateFun {
 struct ListDistinctFun {
 	static constexpr const char *Name = "list_distinct";
 	static constexpr const char *Parameters = "list";
-	static constexpr const char *Description = "Removes all duplicates and NULLs from a list. Does not preserve the original order.";
+	static constexpr const char *Description = "Removes all duplicates and NULLs from a list. Does not preserve the original order";
 	static constexpr const char *Example = "list_distinct([1, 1, NULL, -3, 1, 5])";
 
 	static ScalarFunction GetFunction();
@@ -75,7 +75,7 @@ struct ArrayDistinctFun {
 struct ListUniqueFun {
 	static constexpr const char *Name = "list_unique";
 	static constexpr const char *Parameters = "list";
-	static constexpr const char *Description = "Counts the unique elements of a list.";
+	static constexpr const char *Description = "Counts the unique elements of a list";
 	static constexpr const char *Example = "list_unique([1, 1, NULL, -3, 1, 5])";
 
 	static ScalarFunction GetFunction();
@@ -90,7 +90,7 @@ struct ArrayUniqueFun {
 struct ListValueFun {
 	static constexpr const char *Name = "list_value";
 	static constexpr const char *Parameters = "any,...";
-	static constexpr const char *Description = "Create a LIST containing the argument values.";
+	static constexpr const char *Description = "Create a LIST containing the argument values";
 	static constexpr const char *Example = "list_value(4, 5, 6)";
 
 	static ScalarFunction GetFunction();
@@ -105,7 +105,7 @@ struct ListPackFun {
 struct ListSliceFun {
 	static constexpr const char *Name = "list_slice";
 	static constexpr const char *Parameters = "list,begin,end[,step]";
-	static constexpr const char *Description = "Extract a sublist using slice conventions. Negative values are accepted.";
+	static constexpr const char *Description = "Extract a sublist using slice conventions. Negative values are accepted";
 	static constexpr const char *Example = "list_slice(l, 2, 4)";
 
 	static ScalarFunctionSet GetFunctions();
@@ -120,7 +120,7 @@ struct ArraySliceFun {
 struct ListSortFun {
 	static constexpr const char *Name = "list_sort";
 	static constexpr const char *Parameters = "list";
-	static constexpr const char *Description = "Sorts the elements of the list.";
+	static constexpr const char *Description = "Sorts the elements of the list";
 	static constexpr const char *Example = "list_sort([3, 6, 1, 2])";
 
 	static ScalarFunctionSet GetFunctions();
@@ -135,7 +135,7 @@ struct ArraySortFun {
 struct ListReverseSortFun {
 	static constexpr const char *Name = "list_reverse_sort";
 	static constexpr const char *Parameters = "list";
-	static constexpr const char *Description = "Sorts the elements of the list in reverse order.";
+	static constexpr const char *Description = "Sorts the elements of the list in reverse order";
 	static constexpr const char *Example = "list_reverse_sort([3, 6, 1, 2])";
 
 	static ScalarFunctionSet GetFunctions();
@@ -150,7 +150,7 @@ struct ArrayReverseSortFun {
 struct ListTransformFun {
 	static constexpr const char *Name = "list_transform";
 	static constexpr const char *Parameters = "list,lambda";
-	static constexpr const char *Description = "Returns a list that is the result of applying the lambda function to each element of the input list. See the Lambda Functions section for more details.";
+	static constexpr const char *Description = "Returns a list that is the result of applying the lambda function to each element of the input list. See the Lambda Functions section for more details";
 	static constexpr const char *Example = "list_transform([1, 2, 3], x -> x + 1)";
 
 	static ScalarFunction GetFunction();
@@ -183,7 +183,7 @@ struct ApplyFun {
 struct ListFilterFun {
 	static constexpr const char *Name = "list_filter";
 	static constexpr const char *Parameters = "list,lambda";
-	static constexpr const char *Description = "Constructs a list from those elements of the input list for which the lambda function returns true.";
+	static constexpr const char *Description = "Constructs a list from those elements of the input list for which the lambda function returns true";
 	static constexpr const char *Example = "list_filter([3, 4, 5], x -> x > 4)";
 
 	static ScalarFunction GetFunction();
@@ -222,7 +222,7 @@ struct ListRangeFun {
 struct ListCosineSimilarityFun {
 	static constexpr const char *Name = "list_cosine_similarity";
 	static constexpr const char *Parameters = "list1,list2";
-	static constexpr const char *Description = "Compute the cosine similarity between two lists.";
+	static constexpr const char *Description = "Compute the cosine similarity between two lists";
 	static constexpr const char *Example = "list_cosine_similarity([1, 2, 3], [1, 2, 3])";
 
 	static ScalarFunctionSet GetFunctions();
@@ -237,7 +237,7 @@ struct ListCosineSimilarityFunAlias {
 struct ListDistanceFun {
 	static constexpr const char *Name = "list_distance";
 	static constexpr const char *Parameters = "list1,list2";
-	static constexpr const char *Description = "Compute the distance between two lists.";
+	static constexpr const char *Description = "Compute the distance between two lists";
 	static constexpr const char *Example = "list_distance([1, 2, 3], [1, 2, 3])";
 
 	static ScalarFunctionSet GetFunctions();
@@ -252,7 +252,7 @@ struct ListDistanceFunAlias {
 struct ListInnerProductFun {
 	static constexpr const char *Name = "list_inner_product";
 	static constexpr const char *Parameters = "list1,list2";
-	static constexpr const char *Description = "Compute the inner product between two lists.";
+	static constexpr const char *Description = "Compute the inner product between two lists";
 	static constexpr const char *Example = "list_inner_product([1, 2, 3], [1, 2, 3])";
 
 	static ScalarFunctionSet GetFunctions();

package/src/duckdb/src/include/duckdb/core_functions/scalar/map_functions.hpp

@@ -18,7 +18,7 @@ namespace duckdb {
 struct CardinalityFun {
 	static constexpr const char *Name = "cardinality";
 	static constexpr const char *Parameters = "map";
-	static constexpr const char *Description = "Return the size of the map (or the number of entries in the map).";
+	static constexpr const char *Description = "Returns the size of the map (or the number of entries in the map)";
 	static constexpr const char *Example = "cardinality( map([4, 2], ['a', 'b']) );";
 
 	static ScalarFunction GetFunction();
@@ -27,7 +27,7 @@ struct CardinalityFun {
 struct MapFun {
 	static constexpr const char *Name = "map";
 	static constexpr const char *Parameters = "keys,values";
-	static constexpr const char *Description = "Creates a map from a set of keys and values.";
+	static constexpr const char *Description = "Creates a map from a set of keys and values";
 	static constexpr const char *Example = "map(['key1', 'key2'], ['val1', 'val2'])";
 
 	static ScalarFunction GetFunction();
@@ -45,7 +45,7 @@ struct MapEntriesFun {
 struct MapExtractFun {
 	static constexpr const char *Name = "map_extract";
 	static constexpr const char *Parameters = "map,key";
-	static constexpr const char *Description = "Return a list containing the value for a given key or an empty list if the key is not contained in the map. The type of the key provided in the second parameter must match the type of the map’s keys else an error is returned.";
+	static constexpr const char *Description = "Returns a list containing the value for a given key or an empty list if the key is not contained in the map. The type of the key provided in the second parameter must match the type of the map’s keys else an error is returned";
 	static constexpr const char *Example = "map_extract(map(['key'], ['val']), 'key')";
 
 	static ScalarFunction GetFunction();