Fix problem of mixing MetaString and MetaName in comparations.

Author: asfernandes

src/common/classes/QualifiedMetaString.h

@@ -31,6 +31,14 @@
 
 namespace Firebird {
 
+template <typename T>
+concept IsQualifiedName = requires(T t)
+{
+	{ t.schema };
+	{ t.object };
+	{ t.package };
+};
+
 template <typename T>
 class BaseQualifiedName
 {
@@ -277,26 +285,30 @@ class BaseQualifiedName
 	}
 
 public:
-	bool operator<(const BaseQualifiedName& m) const
+	template <IsQualifiedName U>
+	bool operator<(const U& m) const
 	{
 		return schema < m.schema ||
 			(schema == m.schema && object < m.object) ||
 			(schema == m.schema && object == m.object && package < m.package);
 	}
 
-	bool operator>(const BaseQualifiedName& m) const
+	template <IsQualifiedName U>
+	bool operator>(const U& m) const
 	{
 		return schema > m.schema ||
 			(schema == m.schema && object > m.object) ||
 			(schema == m.schema && object == m.object && package > m.package);
 	}
 
-	bool operator==(const BaseQualifiedName& m) const
+	template <IsQualifiedName U>
+	bool operator==(const U& m) const
 	{
 		return schema == m.schema && object == m.object && package == m.package;
 	}
 
-	bool operator!=(const BaseQualifiedName& m) const
+	template <IsQualifiedName U>
+	bool operator!=(const U& m) const
 	{
 		return !(*this == m);
 	}

src/jrd/MetaName.h

@@ -286,6 +286,11 @@ class MetaName
 		return compare(s.c_str(), s.length());
 	}
 
+	int compare(const Firebird::MetaString& s) const
+	{
+		return compare(s.c_str(), s.length());
+	}
+
 	int compare(const MetaName& m) const
 	{
 		if (word == m.word)
@@ -319,6 +324,16 @@ class MetaName
 		return compare(s) != 0;
 	}
 
+	bool operator==(const Firebird::MetaString& s) const
+	{
+		return compare(s) == 0;
+	}
+
+	bool operator!=(const Firebird::MetaString& s) const
+	{
+		return compare(s) != 0;
+	}
+
 	bool operator<=(const MetaName& m) const
 	{
 		return compare(m) <= 0;

src/jrd/jrd.cpp

@@ -2963,7 +2963,7 @@ JAttachment* JProvider::createDatabase(CheckStatusWrapper* user_status, const ch
 				{
 					// Superuser can create databases for anyone other
 					fb_utils::dpbItemUpper(options.dpb_owner);
-					if (userId.getUserName() != options.dpb_owner)
+					if (userId.getUserName() != MetaString(options.dpb_owner))
 					{
 						(Arg::Gds(isc_no_priv) << "IMPERSONATE USER" << "DATABASE" << filename).raise();
 					}

src/jrd/replication/Replicator.h

@@ -90,8 +90,7 @@ namespace Replication
 				buffer->add(ptr, sizeof(SINT64));
 			}
 
-			template <typename T>
-			ULONG defineAtom(const T& name)
+			ULONG defineAtom(const Firebird::string& name)
 			{
 				if (lastAtom < atoms.getCount() && atoms[lastAtom] == name)
 					return lastAtom;