Output specific array datatypes from GetDataTypeName

roji · roji · commit a27653a3f999 · 2015-09-17T10:51:03.000+02:00
Fixes npgsql#787
diff --git a/src/Npgsql/NpgsqlDataReader.cs b/src/Npgsql/NpgsqlDataReader.cs
@@ -1138,7 +1138,8 @@ public override int GetOrdinal(string name)
 
         /// <summary>
         /// Gets the data type information for the specified field.
-        /// This will be the Postgresql type name (e.g. int4), not the .NET type (<see cref="GetFieldType"/>)
+        /// This will be the PostgreSQL type name (e.g. int4) as in the pg_type table,
+        /// not the .NET type (see <see cref="GetFieldType"/> for that).
         /// </summary>
         /// <param name="ordinal"></param>
         /// <returns></returns>
diff --git a/src/Npgsql/TypeHandlerRegistry.cs b/src/Npgsql/TypeHandlerRegistry.cs
@@ -342,7 +342,7 @@ void RegisterArrayType(BackendType backendType)
                 arrayHandler = (TypeHandler)Activator.CreateInstance(arrayHandlerType, elementHandler);
             }
 
-            arrayHandler.PgName = "array";
+            arrayHandler.PgName = backendType.Name;
             arrayHandler.OID = backendType.OID;
             OIDIndex[backendType.OID] = arrayHandler;
 
diff --git a/test/Npgsql.Tests/ReaderTests.cs b/test/Npgsql.Tests/ReaderTests.cs
@@ -198,13 +198,21 @@ public void GetValueByName()
         }
 
         [Test]
+        [IssueLink("https://github.com/npgsql/npgsql/issues/787")]
         public void GetDataTypeName()
         {
-            var command = new NpgsqlCommand(@"SELECT 1::INT4 AS some_column", Conn);
-            var dr = command.ExecuteReader();
-            dr.Read();
-            Assert.That(dr.GetDataTypeName(0), Is.EqualTo("int4"));
-            command.Dispose();
+            using (var command = new NpgsqlCommand(@"SELECT 1::INT4 AS some_column", Conn))
+            using (var reader = command.ExecuteReader())
+            {
+                reader.Read();
+                Assert.That(reader.GetDataTypeName(0), Is.EqualTo("int4"));
+            }
+            using (var command = new NpgsqlCommand(@"SELECT '{1}'::INT4[] AS some_column", Conn))
+            using (var reader = command.ExecuteReader())
+            {
+                reader.Read();
+                Assert.That(reader.GetDataTypeName(0), Is.EqualTo("_int4"));
+            }
         }
 
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ void RegisterArrayType(BackendType backendType)`
`342`	`342`	`arrayHandler = (TypeHandler)Activator.CreateInstance(arrayHandlerType, elementHandler);`
`343`	`343`	`}`
`344`	`344`
`345`		`- arrayHandler.PgName = "array";`
	`345`	`+ arrayHandler.PgName = backendType.Name;`
`346`	`346`	`arrayHandler.OID = backendType.OID;`
`347`	`347`	`OIDIndex[backendType.OID] = arrayHandler;`
`348`	`348`