Backport fix for #8675 - fbclient incompatible to older ods

Author: asfernandes

src/yvalve/YObjects.h

@@ -519,6 +519,7 @@ class YAttachment final :
 	void destroy(unsigned dstrFlags);
 	void shutdown();
 	isc_db_handle& getHandle();
+	void getOdsVersion(USHORT* majorVersion, USHORT* minorVersion);
 
 	// IAttachment implementation
 	void getInfo(Firebird::CheckStatusWrapper* status, unsigned int itemsLength,
@@ -596,6 +597,10 @@ class YAttachment final :
 	HandleArray<YTransaction> childTransactions;
 	Firebird::Array<CleanupCallback*> cleanupHandlers;
 	Firebird::StatusHolder savedStatus;	// Do not use raise() method of this class in yValve.
+
+private:
+	USHORT cachedOdsMajorVersion = 0;
+	USHORT cachedOdsMinorVersion = 0;
 };
 
 class YService final :

src/yvalve/blob.cpp

@@ -141,6 +141,10 @@ void iscBlobLookupDescImpl(Why::YAttachment* attachment, Why::YTransaction* tran
 		(FB_INTEGER, characterSetId)
 	) outputMessage(&statusWrapper, MasterInterfacePtr());
 
+	USHORT majorOdsVersion = 0;
+	USHORT minorOdsVersion = 0;
+	attachment->getOdsVersion(&majorOdsVersion, &minorOdsVersion);
+
 	{	// scope
 		constexpr auto sql = R"""(
 			select f.rdb$field_sub_type,
@@ -184,7 +188,7 @@ void iscBlobLookupDescImpl(Why::YAttachment* attachment, Why::YTransaction* tran
 
 	if (!flag)
 	{
-		constexpr auto sql = R"""(
+		constexpr auto sqlPackages = R"""(
 			select f.rdb$field_sub_type,
 			       f.rdb$segment_length,
 			       f.rdb$character_set_id
@@ -196,6 +200,19 @@ void iscBlobLookupDescImpl(Why::YAttachment* attachment, Why::YTransaction* tran
 			          pp.rdb$package_name is null
 		)""";
 
+		constexpr auto sqlNoPackages = R"""(
+			select f.rdb$field_sub_type,
+			       f.rdb$segment_length,
+			       f.rdb$character_set_id
+			    from rdb$procedure_parameters pp
+			    join rdb$fields f
+			      on f.rdb$field_name = pp.rdb$field_source
+			    where pp.rdb$procedure_name = ? and
+			          pp.rdb$parameter_name = ?
+		)""";
+
+		const auto sql = majorOdsVersion >= ODS_VERSION12 ? sqlPackages : sqlNoPackages;
+
 		FB_MESSAGE(InputMessage, CheckStatusWrapper,
 			(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), procedureName)
 			(FB_VARCHAR(MAX_SQL_IDENTIFIER_LEN), fieldName)

src/yvalve/utl.cpp

@@ -117,7 +117,6 @@ const int BSTR_input	= 0;
 const int BSTR_output	= 1;
 const int BSTR_alloc	= 2;
 
-static void get_ods_version(CheckStatusWrapper*, IAttachment*, USHORT*, USHORT*);
 static void isc_expand_dpb_internal(const UCHAR** dpb, SSHORT* dpb_size, ...);
 
 
@@ -556,7 +555,7 @@ void UtilInterface::getFbVersion(CheckStatusWrapper* status, IAttachment* att,
 		}
 
 		USHORT ods_version, ods_minor_version;
-		get_ods_version(status, att, &ods_version, &ods_minor_version);
+		UTL_get_ods_version(status, att, &ods_version, &ods_minor_version);
 		if (status->getState() & Firebird::IStatus::STATE_ERRORS)
 			return;
 
@@ -2947,7 +2946,7 @@ int API_ROUTINE gds__thread_start(FPTR_INT_VOID_PTR* entrypoint,
 #endif
 
 
-static void get_ods_version(CheckStatusWrapper* status, IAttachment* att,
+void UTL_get_ods_version(CheckStatusWrapper* status, IAttachment* att,
 	USHORT* ods_version, USHORT* ods_minor_version)
 {
 /**************************************

src/yvalve/utl_proto.h

@@ -84,6 +84,9 @@ void setLogin(Firebird::ClumpletWriter& dpb, bool spbFlag);
 // Put status vector strings into strings circular buffer
 void makePermanentVector(ISC_STATUS* v) throw();
 
+void UTL_get_ods_version(Firebird::CheckStatusWrapper* status, Firebird::IAttachment* att,
+	USHORT* ods_version, USHORT* ods_minor_version);
+
 namespace Why
 {
 	void threadCleanup();

src/yvalve/why.cpp

@@ -5580,6 +5580,22 @@ isc_db_handle& YAttachment::getHandle()
 	return handle;
 }
 
+void YAttachment::getOdsVersion(USHORT* majorVersion, USHORT* minorVersion)
+{
+	if (cachedOdsMajorVersion == 0)
+	{
+		FbLocalStatus status;
+		return UTL_get_ods_version(&status, this, &cachedOdsMajorVersion, &cachedOdsMinorVersion);
+		status.check();
+	}
+
+	if (majorVersion)
+		*majorVersion = cachedOdsMajorVersion;
+
+	if (minorVersion)
+		*minorVersion = cachedOdsMinorVersion;
+}
+
 YAttachment::~YAttachment()
 {
 	if (handle)