Expand "Procedures" schema collection.

Return the same columns as Connector/NET, populated from the INFORMATION_SCHEMA.ROUTINES table.

Author: bgrainger

src/MySqlConnector/MySqlClient/SchemaProvider.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using MySql.Data.MySqlClient.Types;
 
 namespace MySql.Data.MySqlClient
@@ -129,10 +130,28 @@ private void FillDataTypes(DataTable dataTable)
 
 		private void FillProcedures(DataTable dataTable)
 		{
-			dataTable.Columns.AddRange(new[] {
-				new DataColumn("ROUTINE_TYPE"),
-				new DataColumn("ROUTINE_SCHEMA"),
-				new DataColumn("SPECIFIC_NAME")
+			dataTable.Columns.AddRange(new[]
+			{
+				new DataColumn("SPECIFIC_NAME", typeof(string)),
+				new DataColumn("ROUTINE_CATALOG", typeof(string)),
+				new DataColumn("ROUTINE_SCHEMA", typeof(string)),
+				new DataColumn("ROUTINE_NAME", typeof(string)),
+				new DataColumn("ROUTINE_TYPE", typeof(string)),
+				new DataColumn("DTD_IDENTIFIER", typeof(string)),
+				new DataColumn("ROUTINE_BODY", typeof(string)),
+				new DataColumn("ROUTINE_DEFINITION", typeof(string)),
+				new DataColumn("EXTERNAL_NAME", typeof(string)),
+				new DataColumn("EXTERNAL_LANGUAGE", typeof(string)),
+				new DataColumn("PARAMETER_STYLE", typeof(string)),
+				new DataColumn("IS_DETERMINISTIC", typeof(string)),
+				new DataColumn("SQL_DATA_ACCESS", typeof(string)),
+				new DataColumn("SQL_PATH", typeof(string)),
+				new DataColumn("SECURITY_TYPE", typeof(string)),
+				new DataColumn("CREATED", typeof(DateTime)),
+				new DataColumn("LAST_ALTERED", typeof(DateTime)),
+				new DataColumn("SQL_MODE", typeof(string)),
+				new DataColumn("ROUTINE_COMMENT", typeof(string)),
+				new DataColumn("DEFINER", typeof(string)),
 			});
 
 			Action close = null;
@@ -142,12 +161,18 @@ private void FillProcedures(DataTable dataTable)
 				close = m_connection.Close;
 			}
 
-			var procsQuery = "SELECT ROUTINE_TYPE, ROUTINE_SCHEMA, SPECIFIC_NAME FROM INFORMATION_SCHEMA.ROUTINES;";
-			using (var command = new MySqlCommand(procsQuery, m_connection))
-			using (var reader = command.ExecuteReader())
+			using (var command = m_connection.CreateCommand())
 			{
-				while (reader.Read())
-					dataTable.Rows.Add(reader.GetString(0), reader.GetString(1), reader.GetString(2));
+				command.CommandText = "SELECT " + string.Join(", ", dataTable.Columns.Cast<DataColumn>().Select(x => x.ColumnName)) + " FROM INFORMATION_SCHEMA.ROUTINES;";
+				using (var reader = command.ExecuteReader())
+				{
+					while (reader.Read())
+					{
+						var rowValues = new object[dataTable.Columns.Count];
+						reader.GetValues(rowValues);
+						dataTable.Rows.Add(rowValues);
+					}
+				}
 			}
 
 			close?.Invoke();

tests/SideBySide/StoredProcedureTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Linq;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
 using Xunit;
@@ -401,6 +402,43 @@ public async Task DottedName(bool useDatabaseName)
 			}
 		}
 
+#if !NETCOREAPP1_1_2
+		[Theory]
+		[InlineData("echof", "FUNCTION", "varchar(63)", "BEGIN RETURN name; END", "NO", "CONTAINS SQL")]
+		[InlineData("echop", "PROCEDURE", null, "BEGIN SELECT name; END", "NO", "CONTAINS SQL")]
+		[InlineData("failing_function", "FUNCTION", "int(11)", "BEGIN DECLARE v1 INT; SELECT c1 FROM table_that_does_not_exist INTO v1; RETURN v1; END", "NO", "CONTAINS SQL")]
+		public void ProceduresSchema(string procedureName, string procedureType, string dtdIdentifier, string routineDefinition, string isDeterministic, string dataAccess)
+		{
+			var dataTable = m_database.Connection.GetSchema("Procedures");
+			var schema = m_database.Connection.Database;
+			var row = dataTable.Rows.Cast<DataRow>().Single(x => schema.Equals(x["ROUTINE_SCHEMA"]) && procedureName.Equals(x["ROUTINE_NAME"]));
+
+			Assert.Equal(procedureName, row["SPECIFIC_NAME"]);
+			Assert.Equal(procedureType, row["ROUTINE_TYPE"]);
+			if (dtdIdentifier == null)
+				Assert.Equal(DBNull.Value, row["DTD_IDENTIFIER"]);
+			else
+				Assert.Equal(dtdIdentifier, ((string) row["DTD_IDENTIFIER"]).Split(' ')[0]);
+			Assert.Equal(routineDefinition, NormalizeSpaces((string) row["ROUTINE_DEFINITION"]));
+			Assert.Equal(isDeterministic, row["IS_DETERMINISTIC"]);
+			Assert.Equal(dataAccess, ((string) row["SQL_DATA_ACCESS"]).Replace('_', ' '));
+		}
+#endif
+
+		private static string NormalizeSpaces(string input)
+		{
+			input = input.Replace('\r', ' ');
+			input = input.Replace('\n', ' ');
+			input = input.Replace('\t', ' ');
+			int startingLength;
+			do
+			{
+				startingLength = input.Length;
+				input = input.Replace("  ", " ");
+			} while (input.Length != startingLength);
+			return input;
+		}
+
 		readonly DatabaseFixture m_database;
 	}
 }