manage schema scoped tables in describe table

Author: sabbadino-ca

.gitignore

@@ -19,3 +19,4 @@ AzureSQLPromptFlowSamples/src/sql-promptflow-demo/deployment/model.yaml
 AzureSQLPromptFlowSamples/src/sql-promptflow-demo/promptflow_v2/flow.dag.yaml
 AzureSQLPromptFlowSamples/src/sql-promptflow-demo/promptflow_v2/.promptflow/
 AzureSQLPromptFlowSamples/src/sql-promptflow-demo/promptflow_v2/__pycache__/
+.vs/

MssqlMcp/dotnet/MssqlMcp/Tools/DescribeTable.cs

@@ -19,20 +19,31 @@ public partial class Tools
     public async Task<DbOperationResult> DescribeTable(
         [Description("Name of table")] string name)
     {
+        string schema = null;
+        if (name.Contains('.'))
+        {
+            // If the table name contains a schema, split it into schema and table name
+            var parts = name.Split('.');
+            if (parts.Length > 1)
+            {
+                name = parts[1]; // Use only the table name part
+                schema = parts[0]; // Use the first part as schema  
+            }
+        }
         // Query for table metadata
         const string TableInfoQuery = @"SELECT t.object_id AS id, t.name, s.name AS [schema], p.value AS description, t.type, u.name AS owner
             FROM sys.tables t
             INNER JOIN sys.schemas s ON t.schema_id = s.schema_id
             LEFT JOIN sys.extended_properties p ON p.major_id = t.object_id AND p.minor_id = 0 AND p.name = 'MS_Description'
             LEFT JOIN sys.sysusers u ON t.principal_id = u.uid
-            WHERE t.name = @TableName";
+            WHERE t.name = @TableName and (s.name = @TableSchema or @TableSchema IS NULL) ";
 
         // Query for columns
         const string ColumnsQuery = @"SELECT c.name, ty.name AS type, c.max_length AS length, c.precision, c.is_nullable AS nullable, p.value AS description
             FROM sys.columns c
             INNER JOIN sys.types ty ON c.user_type_id = ty.user_type_id
             LEFT JOIN sys.extended_properties p ON p.major_id = c.object_id AND p.minor_id = c.column_id AND p.name = 'MS_Description'
-            WHERE c.object_id = (SELECT object_id FROM sys.tables WHERE name = @TableName)";
+            WHERE c.object_id = (SELECT object_id FROM sys.tables t INNER JOIN sys.schemas s ON t.schema_id = s.schema_id WHERE t.name = @TableName and (s.name = @TableSchema or @TableSchema IS NULL ) )";
 
         // Query for indexes
         const string IndexesQuery = @"SELECT i.name, i.type_desc AS type, p.value AS description,
@@ -41,15 +52,15 @@ FROM sys.columns c
                 WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id ORDER BY ic.key_ordinal FOR XML PATH('')), 1, 1, '') AS keys
             FROM sys.indexes i
             LEFT JOIN sys.extended_properties p ON p.major_id = i.object_id AND p.minor_id = i.index_id AND p.name = 'MS_Description'
-            WHERE i.object_id = (SELECT object_id FROM sys.tables WHERE name = @TableName) AND i.is_primary_key = 0 AND i.is_unique_constraint = 0";
+            WHERE i.object_id = ( SELECT object_id FROM sys.tables t INNER JOIN sys.schemas s ON t.schema_id = s.schema_id WHERE t.name = @TableName and (s.name = @TableSchema or @TableSchema IS NULL )  ) AND i.is_primary_key = 0 AND i.is_unique_constraint = 0";
 
         // Query for constraints
         const string ConstraintsQuery = @"SELECT kc.name, kc.type_desc AS type,
             STUFF((SELECT ',' + c.name FROM sys.index_columns ic
                 INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
                 WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id ORDER BY ic.key_ordinal FOR XML PATH('')), 1, 1, '') AS keys
             FROM sys.key_constraints kc
-            WHERE kc.parent_object_id = (SELECT object_id FROM sys.tables WHERE name = @TableName)";
+            WHERE kc.parent_object_id = (SELECT object_id FROM sys.tables t INNER JOIN sys.schemas s ON t.schema_id = s.schema_id WHERE t.name = @TableName and (s.name = @TableSchema or @TableSchema IS NULL )  )";
 
         var conn = await _connectionFactory.GetOpenConnectionAsync();
         try
@@ -61,6 +72,7 @@ FROM sys.key_constraints kc
                 using (var cmd = new SqlCommand(TableInfoQuery, conn))
                 {
                     var _ = cmd.Parameters.AddWithValue("@TableName", name);
+                    _ = cmd.Parameters.AddWithValue("@TableSchema", schema == null ? DBNull.Value : schema);
                     using var reader = await cmd.ExecuteReaderAsync();
                     if (await reader.ReadAsync())
                     {
@@ -83,6 +95,7 @@ FROM sys.key_constraints kc
                 using (var cmd = new SqlCommand(ColumnsQuery, conn))
                 {
                     var _ = cmd.Parameters.AddWithValue("@TableName", name);
+                    _ = cmd.Parameters.AddWithValue("@TableSchema", schema == null ? DBNull.Value : schema);
                     using var reader = await cmd.ExecuteReaderAsync();
                     var columns = new List<object>();
                     while (await reader.ReadAsync())
@@ -103,6 +116,7 @@ FROM sys.key_constraints kc
                 using (var cmd = new SqlCommand(IndexesQuery, conn))
                 {
                     var _ = cmd.Parameters.AddWithValue("@TableName", name);
+                    _ = cmd.Parameters.AddWithValue("@TableSchema", schema == null ? DBNull.Value : schema);
                     using var reader = await cmd.ExecuteReaderAsync();
                     var indexes = new List<object>();
                     while (await reader.ReadAsync())
@@ -121,6 +135,7 @@ FROM sys.key_constraints kc
                 using (var cmd = new SqlCommand(ConstraintsQuery, conn))
                 {
                     var _ = cmd.Parameters.AddWithValue("@TableName", name);
+                    _ = cmd.Parameters.AddWithValue("@TableSchema", schema == null ? DBNull.Value : schema);
                     using var reader = await cmd.ExecuteReaderAsync();
                     var constraints = new List<object>();
                     while (await reader.ReadAsync())