fix some bugs when throwing ArgumentOutOfRangeException

ChenHuajun · roji · commit f7a79410317c · 2013-12-10T22:00:25.000+02:00
Some fixups by roji

Conflicts:

	src/Npgsql/NpgsqlCommand.cs
diff --git a/Npgsql/Npgsql/NpgsqlCommand.cs b/Npgsql/Npgsql/NpgsqlCommand.cs
@@ -241,7 +241,7 @@ public override Int32 CommandTimeout
             {
                 if (value < 0)
                 {
-                    throw new ArgumentOutOfRangeException(resman.GetString("Exception_CommandTimeoutLessZero"));
+                    throw new ArgumentOutOfRangeException("value", resman.GetString("Exception_CommandTimeoutLessZero"));
                 }
 
                 timeout = value;
diff --git a/Npgsql/Npgsql/NpgsqlConnection.cs b/Npgsql/Npgsql/NpgsqlConnection.cs
@@ -672,7 +672,7 @@ public override void ChangeDatabase(String dbName)
 
             if (string.IsNullOrEmpty(dbName))
             {
-                throw new ArgumentOutOfRangeException(String.Format(resman.GetString("Exception_InvalidDbName"), dbName), "dbName");
+                throw new ArgumentOutOfRangeException("dbName", dbName, String.Format(resman.GetString("Exception_InvalidDbName")));
             }
 
             String oldDatabaseName = Database;
@@ -1189,7 +1189,7 @@ public override DataTable GetSchema(string collectionName, string[] restrictions
                     case "ForeignKeys":
                         return NpgsqlSchema.GetForeignKeys(tempConn, restrictions);
                     default:
-                        throw new ArgumentOutOfRangeException("collectionName", collectionName);
+                        throw new ArgumentOutOfRangeException("collectionName", collectionName, "Invalid collection name");
                 }
             }
         }
diff --git a/Npgsql/Npgsql/NpgsqlParameter.cs b/Npgsql/Npgsql/NpgsqlParameter.cs
@@ -381,7 +381,7 @@ public NpgsqlDbType NpgsqlDbType
                 bound = false;
                 if (value == NpgsqlDbType.Array)
                 {
-                    throw new ArgumentOutOfRangeException(resman.GetString("Exception_ParameterTypeIsOnlyArray"));
+                    throw new ArgumentOutOfRangeException("value", resman.GetString("Exception_ParameterTypeIsOnlyArray"));
                 }
                 if (!NpgsqlTypesHelper.TryGetNativeTypeInfo(value, out type_info))
                 {
diff --git a/Npgsql/NpgsqlTypes/DateDatatypes.cs b/Npgsql/NpgsqlTypes/DateDatatypes.cs
@@ -2880,13 +2880,13 @@ public NpgsqlInterval Subtract(NpgsqlTimeStamp timestamp)
             {
                 case TimeType.Infinity:
                 case TimeType.MinusInfinity:
-                    throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");
+                    throw new ArgumentOutOfRangeException("this", "You cannot subtract infinity timestamps");
             }
             switch (timestamp._type)
             {
                 case TimeType.Infinity:
                 case TimeType.MinusInfinity:
-                    throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");
+                    throw new ArgumentOutOfRangeException("timestamp", "You cannot subtract infinity timestamps");
             }
             return new NpgsqlInterval(0, _date.DaysSinceEra - timestamp._date.DaysSinceEra, _time.Ticks - timestamp._time.Ticks);
         }
@@ -3364,13 +3364,13 @@ public NpgsqlInterval Subtract(NpgsqlTimeStampTZ timestamp)
             {
                 case TimeType.Infinity:
                 case TimeType.MinusInfinity:
-                    throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");
+                    throw new ArgumentOutOfRangeException("this", "You cannot subtract infinity timestamps");
             }
             switch (timestamp._type)
             {
                 case TimeType.Infinity:
                 case TimeType.MinusInfinity:
-                    throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");
+                    throw new ArgumentOutOfRangeException("timestamp", "You cannot subtract infinity timestamps");
             }
             return new NpgsqlInterval(0, _date.DaysSinceEra - timestamp._date.DaysSinceEra, (_time - timestamp._time).Ticks);
         }

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ public override Int32 CommandTimeout`
`241`	`241`	`{`
`242`	`242`	`if (value < 0)`
`243`	`243`	`{`
`244`		`- throw new ArgumentOutOfRangeException(resman.GetString("Exception_CommandTimeoutLessZero"));`
	`244`	`+ throw new ArgumentOutOfRangeException("value", resman.GetString("Exception_CommandTimeoutLessZero"));`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`timeout = value;`
Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ public override void ChangeDatabase(String dbName)`
`672`	`672`
`673`	`673`	`if (string.IsNullOrEmpty(dbName))`
`674`	`674`	`{`
`675`		`- throw new ArgumentOutOfRangeException(String.Format(resman.GetString("Exception_InvalidDbName"), dbName), "dbName");`
	`675`	`+ throw new ArgumentOutOfRangeException("dbName", dbName, String.Format(resman.GetString("Exception_InvalidDbName")));`
`676`	`676`	`}`
`677`	`677`
`678`	`678`	`String oldDatabaseName = Database;`
`@@ -1189,7 +1189,7 @@ public override DataTable GetSchema(string collectionName, string[] restrictions`
`1189`	`1189`	`case "ForeignKeys":`
`1190`	`1190`	`return NpgsqlSchema.GetForeignKeys(tempConn, restrictions);`
`1191`	`1191`	`default:`
`1192`		`- throw new ArgumentOutOfRangeException("collectionName", collectionName);`
	`1192`	`+ throw new ArgumentOutOfRangeException("collectionName", collectionName, "Invalid collection name");`
`1193`	`1193`	`}`
`1194`	`1194`	`}`
`1195`	`1195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ public NpgsqlDbType NpgsqlDbType`
`381`	`381`	`bound = false;`
`382`	`382`	`if (value == NpgsqlDbType.Array)`
`383`	`383`	`{`
`384`		`- throw new ArgumentOutOfRangeException(resman.GetString("Exception_ParameterTypeIsOnlyArray"));`
	`384`	`+ throw new ArgumentOutOfRangeException("value", resman.GetString("Exception_ParameterTypeIsOnlyArray"));`
`385`	`385`	`}`
`386`	`386`	`if (!NpgsqlTypesHelper.TryGetNativeTypeInfo(value, out type_info))`
`387`	`387`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2880,13 +2880,13 @@ public NpgsqlInterval Subtract(NpgsqlTimeStamp timestamp)`
`2880`	`2880`	`{`
`2881`	`2881`	`case TimeType.Infinity:`
`2882`	`2882`	`case TimeType.MinusInfinity:`
`2883`		`- throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");`
	`2883`	`+ throw new ArgumentOutOfRangeException("this", "You cannot subtract infinity timestamps");`
`2884`	`2884`	`}`
`2885`	`2885`	`switch (timestamp._type)`
`2886`	`2886`	`{`
`2887`	`2887`	`case TimeType.Infinity:`
`2888`	`2888`	`case TimeType.MinusInfinity:`
`2889`		`- throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");`
	`2889`	`+ throw new ArgumentOutOfRangeException("timestamp", "You cannot subtract infinity timestamps");`
`2890`	`2890`	`}`
`2891`	`2891`	`return new NpgsqlInterval(0, _date.DaysSinceEra - timestamp._date.DaysSinceEra, _time.Ticks - timestamp._time.Ticks);`
`2892`	`2892`	`}`
`@@ -3364,13 +3364,13 @@ public NpgsqlInterval Subtract(NpgsqlTimeStampTZ timestamp)`
`3364`	`3364`	`{`
`3365`	`3365`	`case TimeType.Infinity:`
`3366`	`3366`	`case TimeType.MinusInfinity:`
`3367`		`- throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");`
	`3367`	`+ throw new ArgumentOutOfRangeException("this", "You cannot subtract infinity timestamps");`
`3368`	`3368`	`}`
`3369`	`3369`	`switch (timestamp._type)`
`3370`	`3370`	`{`
`3371`	`3371`	`case TimeType.Infinity:`
`3372`	`3372`	`case TimeType.MinusInfinity:`
`3373`		`- throw new ArgumentOutOfRangeException("You cannot subtract infinity timestamps");`
	`3373`	`+ throw new ArgumentOutOfRangeException("timestamp", "You cannot subtract infinity timestamps");`
`3374`	`3374`	`}`
`3375`	`3375`	`return new NpgsqlInterval(0, _date.DaysSinceEra - timestamp._date.DaysSinceEra, (_time - timestamp._time).Ticks);`
`3376`	`3376`	`}`