Add COLUMN_NAME as fifth restriction for IndexColumns schema.

mysql-net · Dec 19, 2023 · d3ad6d1 · d3ad6d1
1 parent 65a73fc
commit d3ad6d1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/docs/content/overview/schema/indexcolumns.md b/docs/content/overview/schema/indexcolumns.md
@@ -1,6 +1,6 @@
 ---
 date: 2022-07-10
-lastmod: 2023-12-16
+lastmod: 2023-12-19
 title: IndexColumns Schema
 ---
 
@@ -26,4 +26,5 @@ Catalog | TABLE_CATALOG | 1
 Schema | TABLE_SCHEMA | 2
 Table | TABLE_NAME | 3
 Name | INDEX_NAME | 4
+Column | COLUMN_NAME | 5
 
diff --git a/src/MySqlConnector/Core/SchemaProvider.cs b/src/MySqlConnector/Core/SchemaProvider.cs
@@ -532,5 +532,10 @@ FROM INFORMATION_SCHEMA.STATISTICS
 				command.CommandText += " AND INDEX_NAME LIKE @index";
 				command.Parameters.AddWithValue("@index", index);
 			}
+			if (restrictionValues is [_, _, _, _, { Length: > 0 } column, ..])
+			{
+				command.CommandText += " AND COLUMN_NAME LIKE @column";
+				command.Parameters.AddWithValue("@column", column);
+			}
 		}, cancellationToken);
 }
diff --git a/src/MySqlConnector/Core/SchemaProvider.g.cs b/src/MySqlConnector/Core/SchemaProvider.g.cs
@@ -131,7 +131,7 @@ private Task FillMetaDataCollectionsAsync(IOBehavior ioBehavior, DataTable dataT
 		dataTable.Rows.Add("Views", 0, 3);
 		dataTable.Rows.Add("Foreign Keys", 4, 0);
 		dataTable.Rows.Add("Indexes", 4, 0);
-		dataTable.Rows.Add("IndexColumns", 4, 0);
+		dataTable.Rows.Add("IndexColumns", 5, 0);
 
 		return Task.CompletedTask;
 	}
@@ -649,6 +649,7 @@ private Task FillRestrictionsAsync(IOBehavior ioBehavior, DataTable dataTable, s
 		dataTable.Rows.Add("IndexColumns", "Schema", "TABLE_SCHEMA", 2);
 		dataTable.Rows.Add("IndexColumns", "Table", "TABLE_NAME", 3);
 		dataTable.Rows.Add("IndexColumns", "Name", "INDEX_NAME", 4);
+		dataTable.Rows.Add("IndexColumns", "Column", "COLUMN_NAME", 5);
 
 		return Task.CompletedTask;
 	}
@@ -901,8 +902,8 @@ private async Task FillIndexesAsync(IOBehavior ioBehavior, DataTable dataTable,
 
 	private async Task FillIndexColumnsAsync(IOBehavior ioBehavior, DataTable dataTable, string tableName, string?[]? restrictionValues, CancellationToken cancellationToken)
 	{
-		if (restrictionValues is { Length: > 4 })
-			throw new ArgumentException("More than 4 restrictionValues are not supported for schema 'IndexColumns'.", nameof(restrictionValues));
+		if (restrictionValues is { Length: > 5 })
+			throw new ArgumentException("More than 5 restrictionValues are not supported for schema 'IndexColumns'.", nameof(restrictionValues));
 
 		dataTable.TableName = tableName;
 		dataTable.Columns.AddRange(

diff --git a/tests/IntegrationTests/SchemaProviderTests.cs b/tests/IntegrationTests/SchemaProviderTests.cs
@@ -242,5 +242,22 @@ public void IndexColumns()
 		Assert.Equal(expected, actual);
 	}
 
+	[Fact]
+	public void IndexColumnsWithColumnName()
+	{
+		var schemaName = m_database.Connection.Database;
+		var table = m_database.Connection.GetSchema("IndexColumns", new[] { null, schemaName, "pk_test", "pk_test_uq", "d" });
+		var actual = table.Rows
+			.Cast<DataRow>()
+			.OrderBy(x => (string) x["INDEX_NAME"])
+			.ThenBy(x => (int) x["ORDINAL_POSITION"])
+			.Select(x => ((string) x["INDEX_SCHEMA"], (string) x["INDEX_NAME"], (string) x["TABLE_NAME"], (string) x["COLUMN_NAME"], (int) x["ORDINAL_POSITION"]));
+		var expected = new[]
+		{
+			(schemaName, "pk_test_uq", "pk_test", "d", 2),
+		};
+		Assert.Equal(expected, actual);
+	}
+
 	readonly DatabaseFixture m_database;
 }
diff --git a/tools/SchemaCollectionGenerator/SchemaCollections.yaml b/tools/SchemaCollectionGenerator/SchemaCollections.yaml
@@ -840,6 +840,8 @@
     default: TABLE_NAME
   - name: Name
     default: INDEX_NAME
+  - name: Column
+    default: COLUMN_NAME
   columns:
   - name: INDEX_CATALOG
     type: string