Proper escaping for tables and schema.

microsoft · May 15, 2024 · 4a34783 · 4a34783
1 parent 4f503e2
commit 4a34783
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/dotnet/src/Connectors/Connectors.Memory.SqlServer/SqlServerClient.cs b/dotnet/src/Connectors/Connectors.Memory.SqlServer/SqlServerClient.cs
@@ -29,7 +29,7 @@ public class SqlServerClient : ISqlServerClient
     public SqlServerClient(string connectionString, string schema)
     {
         this._connectionString = connectionString;
-        this._schema = schema;
+        this._schema = DelimitIdentifier(schema);
     }
 
     /// <inheritdoc/>
@@ -245,7 +245,7 @@ ORDER BY [cosine_similarity] DESC
         }
     }
 
-    private string GetFullTableName(string tableName) => $"{this._schema}.[{tableName}]";
+    private string GetFullTableName(string tableName) => $"{this._schema}.{DelimitIdentifier(tableName)}";
 
     private string SerializeEmbedding(ReadOnlyMemory<float> embedding) => JsonSerializer.Serialize(embedding);
     private ReadOnlyMemory<float> DeserializeEmbedding(string embedding) => JsonSerializer.Deserialize<ReadOnlyMemory<float>>(embedding);
@@ -262,4 +262,7 @@ private SqlServerMemoryEntry ReadEntry(SqlDataReader reader, bool hasEmbedding)
             : null;
         return new SqlServerMemoryEntry() { Key = key, MetadataString = metadata, Embedding = embedding, Timestamp = timestamp };
     }
+
+    private static string DelimitIdentifier(string identifier) => $"[{EscapeIdentifier(identifier)}]";
+    private static string EscapeIdentifier(string identifier) => identifier.Replace("]", "]]");
 }