Fixed CORE-6250 - Signature mismatch when creating package body on id…

…entical packaged procedure header.
FirebirdSQL · Feb 19, 2020 · 7b21d3b · 7b21d3b
1 parent ed52c24
commit 7b21d3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/common/classes/Nullable.h b/src/common/classes/Nullable.h
@@ -60,6 +60,11 @@ template <typename T> class BaseNullable
 		return nullable;
 	}
 
+	T orElse(T elseValue) const
+	{
+		return specified ? value : elseValue;
+	}
+
 	bool operator ==(const BaseNullable<T>& o) const
 	{
 		return (!specified && !o.specified) || (specified == o.specified && value == o.value);

diff --git a/src/dsql/PackageNodes.epp b/src/dsql/PackageNodes.epp
@@ -127,7 +127,8 @@ namespace
 					(fb_utils::implicit_domain(fieldSource.c_str()) &&
 						fb_utils::implicit_domain(o.fieldSource.c_str()))) &&
 				fieldName == o.fieldName && relationName == o.relationName &&
-				collationId == o.collationId && nullFlag == o.nullFlag &&
+				collationId == o.collationId &&
+				nullFlag.orElse(FALSE) == o.nullFlag.orElse(FALSE) &&
 				mechanism == o.mechanism && fieldLength == o.fieldLength &&
 				fieldScale == o.fieldScale && fieldType == o.fieldType &&
 				fieldSubType == o.fieldSubType && fieldSegmentLength == o.fieldSegmentLength &&