Fixed CreateArrayHandler in ArrayHandler

npgsql · May 17, 2018 · bcee056 · bcee056
1 parent 148003e
commit bcee056
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/Npgsql/TypeHandlers/ArrayHandler.cs b/src/Npgsql/TypeHandlers/ArrayHandler.cs
@@ -21,7 +21,6 @@
 // TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #endregion
 
-using JetBrains.Annotations;
 using Npgsql.BackendMessages;
 using Npgsql.PostgresTypes;
 using Npgsql.TypeHandling;
@@ -41,6 +40,12 @@ internal static class IsArrayOf<TArray, TElement>
         {
             public static readonly bool Value = typeof(TArray).IsArray && typeof(TArray).GetElementType() == typeof(TElement);
         }
+
+        protected internal override ArrayHandler CreateArrayHandler(PostgresType arrayBackendType)
+            => throw new NotSupportedException();
+
+        internal override NpgsqlTypeHandler CreateRangeHandler(PostgresType rangeBackendType)
+            => throw new NotSupportedException();
     }
 
     /// <summary>
@@ -364,16 +369,6 @@ async Task WriteNonGeneric(ICollection value, NpgsqlWriteBuffer buf, NpgsqlLengt
         }
 
         #endregion
-
-        #region Misc
-
-        protected internal override ArrayHandler CreateArrayHandler(PostgresType arrayBackendType)
-            => new ArrayHandler<short>(this) { PostgresType = arrayBackendType };
-
-        internal override NpgsqlTypeHandler CreateRangeHandler(PostgresType rangeBackendType)
-            => throw new NotSupportedException();
-
-        #endregion
     }
 
     /// <remarks>

diff --git a/src/Npgsql/TypeHandlers/BitStringHandler.cs b/src/Npgsql/TypeHandlers/BitStringHandler.cs
@@ -55,8 +55,8 @@ internal override Type GetProviderSpecificFieldType(FieldDescription fieldDescri
             => GetFieldType(fieldDescription);
 
         // BitString requires a special array handler which returns bool or BitArray
-        protected internal override ArrayHandler CreateArrayHandler(PostgresType backendType) =>
-            new BitStringArrayHandler(this) { PostgresType = backendType };
+        protected internal override ArrayHandler CreateArrayHandler(PostgresType backendType)
+            => new BitStringArrayHandler(this) { PostgresType = backendType };
 
         #region Read