Support for fb_info_next_attachment (#938).

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient.Tests/FbDatabaseInfoTests.cs

@@ -42,7 +42,7 @@ public void CompleteDatabaseInfoTest()
 				.Where(x => !x.IsSpecialName)
 				.Where(x => x.Name.EndsWith("Async")))
 			{
-				if (ServerVersion < new Version(4, 0, 0, 0) && new[] { "GetWireCryptAsync", "GetCryptPluginAsync" }.Contains(m.Name))
+				if (ServerVersion < new Version(4, 0, 0, 0) && new[] { "GetWireCryptAsync", "GetCryptPluginAsync", "GetNextAttachmentAsync" }.Contains(m.Name))
 					continue;
 
 				Assert.DoesNotThrowAsync(() => (Task)m.Invoke(dbInfo, new object[] { CancellationToken.None }), m.Name);

Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscHelper.cs

@@ -71,6 +71,7 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 					case IscCodes.isc_info_next_transaction:
 					case IscCodes.isc_info_active_transactions:
 					case IscCodes.isc_info_active_tran_count:
+					case IscCodes.fb_info_next_attachment:
 						info.Add(VaxInteger(buffer, pos, length));
 						break;
 
@@ -94,16 +95,18 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 						break;
 
 					case IscCodes.isc_info_db_id:
-						var dbFile = Encoding2.Default.GetString(buffer, pos + 2, buffer[pos + 1]);
-						var sitePos = pos + 2 + buffer[pos + 1];
-						int siteLength = buffer[sitePos];
-						var siteName = Encoding2.Default.GetString(buffer, sitePos + 1, siteLength);
+						{
+							var dbFile = Encoding2.Default.GetString(buffer, pos + 2, buffer[pos + 1]);
+							var sitePos = pos + 2 + buffer[pos + 1];
+							int siteLength = buffer[sitePos];
+							var siteName = Encoding2.Default.GetString(buffer, sitePos + 1, siteLength);
 
-						sitePos += siteLength + 1;
-						siteLength = buffer[sitePos];
-						siteName += "." + Encoding2.Default.GetString(buffer, sitePos + 1, siteLength);
+							sitePos += siteLength + 1;
+							siteLength = buffer[sitePos];
+							siteName += "." + Encoding2.Default.GetString(buffer, sitePos + 1, siteLength);
 
-						info.Add(siteName + ":" + dbFile);
+							info.Add(siteName + ":" + dbFile);
+						}
 						break;
 
 					case IscCodes.isc_info_implementation:
@@ -112,32 +115,38 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 
 					case IscCodes.isc_info_isc_version:
 					case IscCodes.isc_info_firebird_version:
-						var messagePosition = pos;
-						var count = buffer[messagePosition];
-						for (var i = 0; i < count; i++)
 						{
-							var messageLength = buffer[messagePosition + 1];
-							info.Add(Encoding2.Default.GetString(buffer, messagePosition + 2, messageLength));
-							messagePosition += 1 + messageLength;
+							var messagePosition = pos;
+							var count = buffer[messagePosition];
+							for (var i = 0; i < count; i++)
+							{
+								var messageLength = buffer[messagePosition + 1];
+								info.Add(Encoding2.Default.GetString(buffer, messagePosition + 2, messageLength));
+								messagePosition += 1 + messageLength;
+							}
 						}
 						break;
 
 					case IscCodes.isc_info_db_class:
-						var serverClass = VaxInteger(buffer, pos, length);
-						if (serverClass == IscCodes.isc_info_db_class_classic_access)
-						{
-							info.Add("CLASSIC SERVER");
-						}
-						else
 						{
-							info.Add("SUPER SERVER");
+							var serverClass = VaxInteger(buffer, pos, length);
+							if (serverClass == IscCodes.isc_info_db_class_classic_access)
+							{
+								info.Add("CLASSIC SERVER");
+							}
+							else
+							{
+								info.Add("SUPER SERVER");
+							}
 						}
 						break;
 
 					case IscCodes.isc_info_creation_date:
-						var date = TypeDecoder.DecodeDate((int)VaxInteger(buffer, pos, 4));
-						var time = TypeDecoder.DecodeTime((int)VaxInteger(buffer, pos + 4, 4));
-						info.Add(date.Add(time));
+						{
+							var date = TypeDecoder.DecodeDate((int)VaxInteger(buffer, pos, 4));
+							var time = TypeDecoder.DecodeTime((int)VaxInteger(buffer, pos + 4, 4));
+							info.Add(date.Add(time));
+						}
 						break;
 
 					default:

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDatabaseInfo.cs

@@ -395,6 +395,15 @@ public Task<DateTime> GetCreationDateAsync(CancellationToken cancellationToken =
 			return GetValueAsync<DateTime>(IscCodes.isc_info_creation_date, cancellationToken);
 		}
 
+		public long GetNextAttachment()
+		{
+			return GetValue<long>(IscCodes.fb_info_next_attachment);
+		}
+		public Task<long> GetNextAttachmentAsync(CancellationToken cancellationToken = default)
+		{
+			return GetValueAsync<long>(IscCodes.fb_info_next_attachment, cancellationToken);
+		}
+
 		#endregion
 
 		#region Constructors