Bring back sanity checks and reduce delay for output format

Author: aafemt

src/dsql/DsqlRequests.cpp

@@ -249,8 +249,9 @@ void DsqlDmlRequest::setDelayedFormat(thread_db* tdbb, IMessageMetadata* metadat
 			Arg::Gds(isc_req_sync));
 	}
 
+	MessageNode* msg = dsqlStatement->getStatement()->getMessage(dsqlStatement->getReceiveMsg()->msg_number);
+	metadataToFormat(metadata, msg);
 	needDelayedFormat = false;
-	delayedFormat = metadata;
 }
 
 // Fetch next record from a dynamic SQL cursor.
@@ -277,15 +278,14 @@ bool DsqlDmlRequest::fetch(thread_db* tdbb, UCHAR* msgBuffer)
 				  Arg::Gds(isc_unprepared_stmt));
 	}
 
-	const dsql_msg* message = dsqlStatement->getReceiveMsg();
-	MessageNode* msg = dsqlStatement->getStatement()->getMessage(message->msg_number);
-
-	if (delayedFormat && message)
+	// At this point we have to have output metadata from client
+	if (needDelayedFormat)
 	{
-		metadataToFormat(delayedFormat, msg);
-		delayedFormat = NULL;
+		ERRD_post(Arg::Gds(isc_dsql_sqlda_err) <<
+				  Arg::Gds(isc_dsql_no_output_sqlda));
 	}
 
+	MessageNode* msg = dsqlStatement->getStatement()->getMessage(dsqlStatement->getReceiveMsg()->msg_number);
 	const Format* fmt = msg->getFormat(request);
 
 	// Set up things for tracing this call
@@ -578,6 +578,12 @@ void DsqlDmlRequest::execute(thread_db* tdbb, jrd_tra** traHandle,
 	const dsql_msg* message = dsqlStatement->getSendMsg();
 	if (message)
 	{
+		if (!inMetadata)
+		{
+			ERRD_post(Arg::Gds(isc_dsql_sqlda_err) <<
+					  Arg::Gds(isc_dsql_no_input_sqlda));
+		}
+
 		// If this is not first call of execute(), metadata most likely is already converted to message
 		// but there is no easy way to check if they match so conversion is unconditional.
 		// Even if value of inMetadata is the same, other instance could be placed in the same memory.

src/dsql/DsqlRequests.h

@@ -196,7 +196,6 @@ class DsqlDmlRequest final : public DsqlRequest
 		bool singleton, bool exec, bool fetch);
 
 private:
-	Firebird::RefPtr<Firebird::IMessageMetadata> delayedFormat;
 	Request* request = nullptr;
 	bool needDelayedFormat = false;
 	bool firstRowFetched = false;