From f1ad3a9338113c6fb8619099c9a8989dd42cd3ec Mon Sep 17 00:00:00 2001 From: "Francisco Figueiredo Jr." Date: Fri, 21 Jan 2005 01:41:51 +0000 Subject: 2005-01-21 Francisco Figueiredo Jr. * NpgsqlTypes/NpgsqlDbType.cs, NpgsqlTypes/NpgsqlTypesHelper.cs: Added support for Varchar datatype. Removed Internal data type enum. It is not supported yet. * Npgsql/PGUtil.cs, Npgsql/PGUtil.resx: (WriteString) Added support for logging what string is being written to database server. * Npgsql/NpgsqlCommand.cs: Added SingleRow behavior support. gborg 1099. Added support for record return type functions. Thanks neri and Michel for heads up and tests. Fixed record function bug when function had many parameters. Thanks Neri (neri at gborg dot postgresql dot org) for heads up. * Npgsql/NpgsqlCommandBuilder.cs, NpgsqlDataAdapter.cs: Applied patch to fix gborg 1095. Thanks Eric van der Gutten (ericvdg at ananzi dot co dot za). * Npgsql/NpgsqlDataReader.cs: Removed type conversions for GetXXX() methods. svn path=/trunk/mcs/; revision=39297 --- mcs/class/Npgsql/NpgsqlTypes/NpgsqlDbType.cs | 4 ++-- mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.cs | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'mcs/class/Npgsql/NpgsqlTypes') diff --git a/mcs/class/Npgsql/NpgsqlTypes/NpgsqlDbType.cs b/mcs/class/Npgsql/NpgsqlTypes/NpgsqlDbType.cs index fd77761808d..56768b39c54 100644 --- a/mcs/class/Npgsql/NpgsqlTypes/NpgsqlDbType.cs +++ b/mcs/class/Npgsql/NpgsqlTypes/NpgsqlDbType.cs @@ -36,7 +36,6 @@ namespace NpgsqlTypes Date, Double, Integer, - Interval, Line, LSeg, Money, @@ -48,7 +47,8 @@ namespace NpgsqlTypes Smallint, Text, Time, - Timestamp + Timestamp, + Varchar } diff --git a/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.cs b/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.cs index b62ebb4a04f..bb84f0b0b27 100755 --- a/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.cs +++ b/mcs/class/Npgsql/NpgsqlTypes/NpgsqlTypesHelper.cs @@ -167,6 +167,8 @@ namespace NpgsqlTypes NativeTypeMapping.AddDbTypeAlias("text", DbType.AnsiStringFixedLength); NativeTypeMapping.AddTypeAlias("text", typeof(String)); + NativeTypeMapping.AddType("varchar", NpgsqlDbType.Varchar, DbType.String, true, null); + NativeTypeMapping.AddType("bytea", NpgsqlDbType.Bytea, DbType.Binary, true, new ConvertNativeToBackendHandler(BasicNativeToBackendTypeConverter.ToBinary)); @@ -220,13 +222,8 @@ namespace NpgsqlTypes NativeTypeMapping.AddType("timestamp", NpgsqlDbType.Timestamp, DbType.DateTime, true, new ConvertNativeToBackendHandler(BasicNativeToBackendTypeConverter.ToDateTime)); - - NativeTypeMapping.AddTypeAlias("timestamp", typeof(DateTime)); - - NativeTypeMapping.AddType("interval", NpgsqlDbType.Interval, DbType.DateTime, true, - new ConvertNativeToBackendHandler(BasicNativeToBackendTypeConverter.ToDateTime)); - //NativeTypeMapping.AddTypeAlias("interval", typeof(DateTime)); + NativeTypeMapping.AddTypeAlias("timestamp", typeof(DateTime)); NativeTypeMapping.AddType("point", NpgsqlDbType.Point, DbType.Object, true, new ConvertNativeToBackendHandler(ExtendedNativeToBackendTypeConverter.ToPoint)); @@ -299,7 +296,7 @@ namespace NpgsqlTypes new NpgsqlBackendTypeInfo(0, "bpchar", NpgsqlDbType.Text, DbType.String, typeof(String), null), - new NpgsqlBackendTypeInfo(0, "varchar", NpgsqlDbType.Text, DbType.String, typeof(String), + new NpgsqlBackendTypeInfo(0, "varchar", NpgsqlDbType.Varchar, DbType.String, typeof(String), null), new NpgsqlBackendTypeInfo(0, "text", NpgsqlDbType.Text, DbType.String, typeof(String), @@ -353,9 +350,6 @@ namespace NpgsqlTypes new NpgsqlBackendTypeInfo(0, "timestamp", NpgsqlDbType.Timestamp, DbType.DateTime, typeof(DateTime), new ConvertBackendToNativeHandler(BasicBackendToNativeTypeConverter.ToDateTime)), - - new NpgsqlBackendTypeInfo(0, "interval", NpgsqlDbType.Interval, DbType.DateTime, typeof(DateTime), - new ConvertBackendToNativeHandler(BasicBackendToNativeTypeConverter.ToDateTime)), new NpgsqlBackendTypeInfo(0, "timestamptz", NpgsqlDbType.Timestamp, DbType.DateTime, typeof(DateTime), new ConvertBackendToNativeHandler(BasicBackendToNativeTypeConverter.ToDateTime)), -- cgit v1.2.3