Refactoring.

Author: cincuranet

src/FirebirdSql.Data.FirebirdClient/Common/PageSizeHelper.cs

@@ -15,6 +15,8 @@
 
 //$Authors = Jiri Cincura ([email protected])
 
+using System;
+
 namespace FirebirdSql.Data.Common;
 
 internal static class PageSizeHelper
@@ -28,4 +30,9 @@ public static bool IsValidPageSize(int value)
 			|| value == 16384
 			|| value == 32768;
 	}
+
+	public static Exception InvalidPageSizeException()
+	{
+		return new InvalidOperationException("Invalid page size.");
+	}
 }

src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs

@@ -124,6 +124,9 @@ public void CreateDatabase(int pageSize, bool forcedWrites, bool overwrite)
 		dpb.Append(IscCodes.isc_dpb_overwrite, (overwrite ? 1 : 0));
 		if (pageSize > 0)
 		{
+			if (!PageSizeHelper.IsValidPageSize(pageSize))
+				throw PageSizeHelper.InvalidPageSizeException();
+
 			dpb.Append(IscCodes.isc_dpb_page_size, pageSize);
 		}
 
@@ -169,6 +172,8 @@ public async Task CreateDatabaseAsync(int pageSize, bool forcedWrites, bool over
 		dpb.Append(IscCodes.isc_dpb_overwrite, (overwrite ? 1 : 0));
 		if (pageSize > 0)
 		{
+			if (!PageSizeHelper.IsValidPageSize(pageSize))
+				throw PageSizeHelper.InvalidPageSizeException();
 			dpb.Append(IscCodes.isc_dpb_page_size, pageSize);
 		}
 

src/FirebirdSql.Data.FirebirdClient/Services/FbRestore.cs

@@ -33,7 +33,7 @@ public int? PageSize
 		set
 		{
 			if (value is int v && !PageSizeHelper.IsValidPageSize(v))
-				throw new InvalidOperationException("Invalid page size.");
+				throw PageSizeHelper.InvalidPageSizeException();
 
 			_pageSize = value;
 		}

src/FirebirdSql.Data.FirebirdClient/Services/FbStreamingRestore.cs

@@ -37,7 +37,7 @@ public int? PageSize
 		set
 		{
 			if (value is int v && !PageSizeHelper.IsValidPageSize(v))
-				throw new InvalidOperationException("Invalid page size.");
+				throw PageSizeHelper.InvalidPageSizeException();
 
 			_pageSize = value;
 		}