Fix sql syntax and reader open errors (#1145)

* Fix add column sql server syntax * Fix There is already an open DataReader error --------- Co-authored-by: Kristian Kadlec <[email protected]>
jstedfast · Feb 24, 2025 · be0a83e · be0a83e
1 parent 52e947a
commit be0a83e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MimeKit/Cryptography/SQLServerCertificateDatabase.cs b/MimeKit/Cryptography/SQLServerCertificateDatabase.cs
@@ -99,7 +99,7 @@ protected override void AddTableColumn (DbConnection connection, DataTable table
 			int primaryKeys = table.PrimaryKey?.Length ?? 0;
 
 			statement.Append (table.TableName);
-			statement.Append (" ADD COLUMN ");
+			statement.Append (" ADD ");
 			Build (statement, table, column, ref primaryKeys);
 
 			using (var command = CreateCommand ()) {

diff --git a/MimeKit/Cryptography/SqlCertificateDatabase.cs b/MimeKit/Cryptography/SqlCertificateDatabase.cs
@@ -42,6 +42,7 @@
 using Org.BouncyCastle.X509.Store;
 using Org.BouncyCastle.Security;
 using Org.BouncyCastle.Utilities.Collections;
+using System.Linq;
 
 namespace MimeKit.Cryptography {
 	/// <summary>
@@ -288,7 +289,7 @@ void CreateCertificatesTable (DbConnection connection, DataTable table)
 					column = table.Columns[table.Columns.IndexOf (CertificateColumnNames.SubjectDnsNames)];
 					AddTableColumn (connection, table, column);
 
-					foreach (var record in Find (null, false, X509CertificateRecordFields.Id | X509CertificateRecordFields.Certificate)) {
+					foreach (var record in Find (null, false, X509CertificateRecordFields.Id | X509CertificateRecordFields.Certificate).ToArray()) {
 						var statement = $"UPDATE {CertificatesTableName} SET {CertificateColumnNames.Anchor} = @ANCHOR, {CertificateColumnNames.SubjectName} = @SUBJECTNAME, {CertificateColumnNames.SubjectKeyIdentifier} = @SUBJECTKEYIDENTIFIER, {CertificateColumnNames.SubjectEmail} = @SUBJECTEMAIL, {CertificateColumnNames.SubjectDnsNames} = @SUBJECTDNSNAMES WHERE {CertificateColumnNames.Id} = @ID";
 
 						using (var command = CreateCommand ()) {
@@ -318,7 +319,7 @@ void CreateCertificatesTable (DbConnection connection, DataTable table)
 					var column = table.Columns[table.Columns.IndexOf (CertificateColumnNames.SubjectDnsNames)];
 					AddTableColumn (connection, table, column);
 
-					foreach (var record in Find (null, false, X509CertificateRecordFields.Id | X509CertificateRecordFields.Certificate)) {
+					foreach (var record in Find (null, false, X509CertificateRecordFields.Id | X509CertificateRecordFields.Certificate).ToArray()) {
 						var statement = $"UPDATE {CertificatesTableName} SET {CertificateColumnNames.SubjectEmail} = @SUBJECTEMAIL, {CertificateColumnNames.SubjectDnsNames} = @SUBJECTDNSNAMES WHERE {CertificateColumnNames.Id} = @ID";
 
 						using (var command = CreateCommand ()) {