Misc exception messages improved (AE, ANE, IOE), ensured stack trace not cut off

Athari · Athari · commit 1b3c37d76658 · 2013-04-08T01:12:16.000+04:00
diff --git a/Simple.Data.Ado/AdoAdapterGetter.cs b/Simple.Data.Ado/AdoAdapterGetter.cs
@@ -35,7 +35,7 @@ public AdoAdapterGetter(AdoAdapter adapter, IDbTransaction transaction)
         public Func<object[],IDictionary<string,object>> CreateGetDelegate(string tableName, params object[] keyValues)
         {
             var primaryKey = _adapter.GetSchema().FindTable(tableName).PrimaryKey;
-            if (primaryKey == null) throw new InvalidOperationException("Table has no primary key.");
+            if (primaryKey == null) throw new InvalidOperationException(string.Format("Table '{0}' has no primary key.", tableName));
             if (primaryKey.Length != keyValues.Length) throw new ArgumentException("Incorrect number of values for key.");
 
 
@@ -107,7 +107,7 @@ private static object FixObjectType(object value)
         public IDictionary<string, object> Get(string tableName, object[] parameterValues)
         {
             var primaryKey = _adapter.GetSchema().FindTable(tableName).PrimaryKey;
-            if (primaryKey == null) throw new InvalidOperationException("Table has no primary key.");
+            if (primaryKey == null) throw new InvalidOperationException(string.Format("Table '{0}' has no primary key.", tableName));
             if (primaryKey.Length != parameterValues.Length) throw new ArgumentException("Incorrect number of values for key.");
 
 
diff --git a/Simple.Data.Ado/AdoAdapterQueryRunner.cs b/Simple.Data.Ado/AdoAdapterQueryRunner.cs
@@ -83,10 +83,10 @@ out IEnumerable<SimpleQueryClauseBase>
             {
                 withCountClause = query.Clauses.OfType<WithCountClause>().First();
             }
-            catch (InvalidOperationException)
+            catch (InvalidOperationException e)
             {
                 // Rethrow with meaning.
-                throw new InvalidOperationException("No WithCountClause specified.");
+                throw new InvalidOperationException("No WithCountClause specified.", e);
             }
 
             query = query.ClearWithTotalCount();
diff --git a/Simple.Data.Ado/ProviderHelper.cs b/Simple.Data.Ado/ProviderHelper.cs
@@ -68,7 +68,7 @@ private static string GetFileExtension(string filename)
         {
             var extension = Path.GetExtension(filename);
 
-            if (extension == null) throw new ArgumentException("Unrecognised file.");
+            if (extension == null) throw new ArgumentException(string.Format("Unrecognised file name '{0}': no extension.", filename), "filename");
             return extension.TrimStart('.').ToLower();
         }
 
@@ -111,7 +111,7 @@ private static IConnectionProvider LoadProviderByConnectionToken(ConnectionToken
             provider = ComposeProvider(token.ProviderName);
             if (provider == null)
             {
-                throw new InvalidOperationException("Provider could not be resolved.");
+                throw new InvalidOperationException(string.Format("Provider '{0}' could not be resolved.", token.ProviderName));
             }
 
             provider.SetConnectionString(token.ConnectionString);
diff --git a/Simple.Data.Ado/Schema/DatabaseSchema.cs b/Simple.Data.Ado/Schema/DatabaseSchema.cs
@@ -139,7 +139,7 @@ public ObjectName BuildObjectName(String text)
             if (text == null) throw new ArgumentNullException("text");
             if (!text.Contains('.')) return new ObjectName(this.DefaultSchema, text);
             var schemaDotTable = text.Split('.');
-            if (schemaDotTable.Length != 2) throw new InvalidOperationException("Could not parse table name.");
+            if (schemaDotTable.Length != 2) throw new InvalidOperationException(string.Format("Could not parse table name '{0}'.", text));
             return new ObjectName(schemaDotTable[0], schemaDotTable[1]);
         }
 
diff --git a/Simple.Data.Ado/Schema/ProcedureCollection.cs b/Simple.Data.Ado/Schema/ProcedureCollection.cs
@@ -56,7 +56,7 @@ private Procedure FindImpl(string procedureName)
             if (procedureName.Contains('.'))
             {
                 var schemaDotprocedure = procedureName.Split('.');
-                if (schemaDotprocedure.Length != 2) throw new InvalidOperationException("Could not resolve qualified procedure name.");
+                if (schemaDotprocedure.Length != 2) throw new InvalidOperationException(string.Format("Could not resolve qualified procedure name '{0}'.", procedureName));
                 return Find(schemaDotprocedure[1], schemaDotprocedure[0]);
             }
             if (!string.IsNullOrWhiteSpace(_defaultSchema))
diff --git a/Simple.Data.Ado/SimpleReferenceFormatter.cs b/Simple.Data.Ado/SimpleReferenceFormatter.cs
@@ -1,3 +1,5 @@
+using System.ComponentModel;
+
 namespace Simple.Data.Ado
 {
     using System;
@@ -99,7 +101,7 @@ private string MathOperatorToString(MathOperator @operator)
                 case MathOperator.Modulo:
                     return _schema.Operators.Modulo;
                 default:
-                    throw new InvalidOperationException("Invalid MathOperator specified.");
+                    throw new InvalidEnumArgumentException("Invalid MathOperator specified.");
             }
         }
 
diff --git a/Simple.Data.Mocking/Ado/MockSchemaProvider.cs b/Simple.Data.Mocking/Ado/MockSchemaProvider.cs
@@ -145,7 +145,7 @@ public string QuoteObjectName(string unquotedName)
         public string NameParameter(string baseName)
         {
             if (baseName == null) throw new ArgumentNullException("baseName");
-            if (baseName.Length == 0) throw new ArgumentException("Base name must be provided");
+            if (baseName.Length == 0) throw new ArgumentException("Base name must be provided", "baseName");
             return (baseName.StartsWith("@")) ? baseName : "@" + baseName;
         }
 
diff --git a/Simple.Data.SqlCe40/SqlCe40SchemaProvider.cs b/Simple.Data.SqlCe40/SqlCe40SchemaProvider.cs
@@ -112,7 +112,7 @@ public string QuoteObjectName(string unquotedName)
         public string NameParameter(string baseName)
         {
             if (baseName == null) throw new ArgumentNullException("baseName");
-            if (baseName.Length == 0) throw new ArgumentException("Base name must be provided");
+            if (baseName.Length == 0) throw new ArgumentException("Base name must be provided", "baseName");
             return (baseName.StartsWith("@")) ? baseName : "@" + baseName;
         }
 
diff --git a/Simple.Data.SqlServer/SqlSchemaProvider.cs b/Simple.Data.SqlServer/SqlSchemaProvider.cs
@@ -150,7 +150,7 @@ public string QuoteObjectName(string unquotedName)
         public string NameParameter(string baseName)
         {
             if (baseName == null) throw new ArgumentNullException("baseName");
-            if (baseName.Length == 0) throw new ArgumentException("Base name must be provided");
+            if (baseName.Length == 0) throw new ArgumentException("Base name must be provided", "baseName");
             return (baseName.StartsWith("@")) ? baseName : "@" + baseName;
         }
 
diff --git a/Simple.Data/InMemoryAdapter.cs b/Simple.Data/InMemoryAdapter.cs
@@ -373,7 +373,7 @@ public bool IsValidFunction(string functionName)
 
         public IEnumerable<IEnumerable<IEnumerable<KeyValuePair<string, object>>>> Execute(string functionName, IDictionary<string, object> parameters)
         {
-            if (!_functions.ContainsKey(functionName)) throw new InvalidOperationException("No function found with that name.");
+            if (!_functions.ContainsKey(functionName)) throw new InvalidOperationException(string.Format("Function '{0}' not found.", functionName));
             var obj = _functions[functionName].DynamicInvoke(parameters.Values.ToArray());
 
             var dict = obj as IDictionary<string, object>;
diff --git a/Simple.Data/QueryPolyfills/ObjectMaths.cs b/Simple.Data/QueryPolyfills/ObjectMaths.cs
@@ -22,7 +22,7 @@ public static object Increment(object value)
             if (value is byte) return (byte)value + 1;
             if (value is sbyte) return (sbyte)value + 1;
 
-            throw new ArgumentException("Cannot increment object type.");
+            throw new ArgumentException(string.Format("Cannot increment object of type '{0}'.", value.GetType().FullName));
         }
 
         public static object Add(object value1, object value2)
@@ -43,11 +43,13 @@ public static object Add(object value1, object value2)
             if (value1 is byte) return (byte)value1 + (byte)value2;
             if (value1 is sbyte) return (sbyte)value1 + (sbyte)value2;
 
-            throw new ArgumentException("Cannot add object types.");
+            throw new ArgumentException(string.Format("Cannot add object of types '{0}' and '{1}'.", value1.GetType().FullName, value2.GetType().FullName));
         }
 
         public static object Divide(object value, int divisor)
         {
+            if (ReferenceEquals(value, null)) throw new ArgumentNullException("value");
+
             if (value is long) return (long)value / divisor;
             if (value is int) return (int)value / divisor;
             if (value is short) return (short)value / divisor;
@@ -60,7 +62,7 @@ public static object Divide(object value, int divisor)
             if (value is byte) return (byte)value / divisor;
             if (value is sbyte) return (sbyte)value / divisor;
 
-            throw new ArgumentException("Cannot divide object type.");
+            throw new ArgumentException(string.Format("Cannot divide object of type '{0}'.", value.GetType()));
         }
     }
 }
diff --git a/Simple.Data/SimpleRecord.cs b/Simple.Data/SimpleRecord.cs
@@ -75,7 +75,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
                 }
                 catch (UnresolvableObjectException e)
                 {
-                    throw new UnresolvableObjectException(e.ObjectName, string.Format("Column '{0}' not found.", e.ObjectName));
+                    throw new UnresolvableObjectException(e.ObjectName, string.Format("Column '{0}' not found.", e.ObjectName), e);
                 }
             }
             return base.TryGetMember(binder, out result);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public AdoAdapterGetter(AdoAdapter adapter, IDbTransaction transaction)`
`35`	`35`	`public Func<object[],IDictionary<string,object>> CreateGetDelegate(string tableName, params object[] keyValues)`
`36`	`36`	`{`
`37`	`37`	`var primaryKey = _adapter.GetSchema().FindTable(tableName).PrimaryKey;`
`38`		`- if (primaryKey == null) throw new InvalidOperationException("Table has no primary key.");`
	`38`	`+ if (primaryKey == null) throw new InvalidOperationException(string.Format("Table '{0}' has no primary key.", tableName));`
`39`	`39`	`if (primaryKey.Length != keyValues.Length) throw new ArgumentException("Incorrect number of values for key.");`
`40`	`40`
`41`	`41`
`@@ -107,7 +107,7 @@ private static object FixObjectType(object value)`
`107`	`107`	`public IDictionary<string, object> Get(string tableName, object[] parameterValues)`
`108`	`108`	`{`
`109`	`109`	`var primaryKey = _adapter.GetSchema().FindTable(tableName).PrimaryKey;`
`110`		`- if (primaryKey == null) throw new InvalidOperationException("Table has no primary key.");`
	`110`	`+ if (primaryKey == null) throw new InvalidOperationException(string.Format("Table '{0}' has no primary key.", tableName));`
`111`	`111`	`if (primaryKey.Length != parameterValues.Length) throw new ArgumentException("Incorrect number of values for key.");`
`112`	`112`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,10 @@ out IEnumerable<SimpleQueryClauseBase>`
`83`	`83`	`{`
`84`	`84`	`withCountClause = query.Clauses.OfType<WithCountClause>().First();`
`85`	`85`	`}`
`86`		`- catch (InvalidOperationException)`
	`86`	`+ catch (InvalidOperationException e)`
`87`	`87`	`{`
`88`	`88`	`// Rethrow with meaning.`
`89`		`- throw new InvalidOperationException("No WithCountClause specified.");`
	`89`	`+ throw new InvalidOperationException("No WithCountClause specified.", e);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`query = query.ClearWithTotalCount();`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private static string GetFileExtension(string filename)`
`68`	`68`	`{`
`69`	`69`	`var extension = Path.GetExtension(filename);`
`70`	`70`
`71`		`- if (extension == null) throw new ArgumentException("Unrecognised file.");`
	`71`	`+ if (extension == null) throw new ArgumentException(string.Format("Unrecognised file name '{0}': no extension.", filename), "filename");`
`72`	`72`	`return extension.TrimStart('.').ToLower();`
`73`	`73`	`}`
`74`	`74`
`@@ -111,7 +111,7 @@ private static IConnectionProvider LoadProviderByConnectionToken(ConnectionToken`
`111`	`111`	`provider = ComposeProvider(token.ProviderName);`
`112`	`112`	`if (provider == null)`
`113`	`113`	`{`
`114`		`- throw new InvalidOperationException("Provider could not be resolved.");`
	`114`	`+ throw new InvalidOperationException(string.Format("Provider '{0}' could not be resolved.", token.ProviderName));`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`provider.SetConnectionString(token.ConnectionString);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public ObjectName BuildObjectName(String text)`
`139`	`139`	`if (text == null) throw new ArgumentNullException("text");`
`140`	`140`	`if (!text.Contains('.')) return new ObjectName(this.DefaultSchema, text);`
`141`	`141`	`var schemaDotTable = text.Split('.');`
`142`		`- if (schemaDotTable.Length != 2) throw new InvalidOperationException("Could not parse table name.");`
	`142`	`+ if (schemaDotTable.Length != 2) throw new InvalidOperationException(string.Format("Could not parse table name '{0}'.", text));`
`143`	`143`	`return new ObjectName(schemaDotTable[0], schemaDotTable[1]);`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private Procedure FindImpl(string procedureName)`
`56`	`56`	`if (procedureName.Contains('.'))`
`57`	`57`	`{`
`58`	`58`	`var schemaDotprocedure = procedureName.Split('.');`
`59`		`- if (schemaDotprocedure.Length != 2) throw new InvalidOperationException("Could not resolve qualified procedure name.");`
	`59`	`+ if (schemaDotprocedure.Length != 2) throw new InvalidOperationException(string.Format("Could not resolve qualified procedure name '{0}'.", procedureName));`
`60`	`60`	`return Find(schemaDotprocedure[1], schemaDotprocedure[0]);`
`61`	`61`	`}`
`62`	`62`	`if (!string.IsNullOrWhiteSpace(_defaultSchema))`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System.ComponentModel;`
	`2`	`+`
`1`	`3`	`namespace Simple.Data.Ado`
`2`	`4`	`{`
`3`	`5`	`using System;`
`@@ -99,7 +101,7 @@ private string MathOperatorToString(MathOperator @operator)`
`99`	`101`	`case MathOperator.Modulo:`
`100`	`102`	`return _schema.Operators.Modulo;`
`101`	`103`	`default:`
`102`		`- throw new InvalidOperationException("Invalid MathOperator specified.");`
	`104`	`+ throw new InvalidEnumArgumentException("Invalid MathOperator specified.");`
`103`	`105`	`}`
`104`	`106`	`}`
`105`	`107`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public string QuoteObjectName(string unquotedName)`
`145`	`145`	`public string NameParameter(string baseName)`
`146`	`146`	`{`
`147`	`147`	`if (baseName == null) throw new ArgumentNullException("baseName");`
`148`		`- if (baseName.Length == 0) throw new ArgumentException("Base name must be provided");`
	`148`	`+ if (baseName.Length == 0) throw new ArgumentException("Base name must be provided", "baseName");`
`149`	`149`	`return (baseName.StartsWith("@")) ? baseName : "@" + baseName;`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public string QuoteObjectName(string unquotedName)`
`112`	`112`	`public string NameParameter(string baseName)`
`113`	`113`	`{`
`114`	`114`	`if (baseName == null) throw new ArgumentNullException("baseName");`
`115`		`- if (baseName.Length == 0) throw new ArgumentException("Base name must be provided");`
	`115`	`+ if (baseName.Length == 0) throw new ArgumentException("Base name must be provided", "baseName");`
`116`	`116`	`return (baseName.StartsWith("@")) ? baseName : "@" + baseName;`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public string QuoteObjectName(string unquotedName)`
`150`	`150`	`public string NameParameter(string baseName)`
`151`	`151`	`{`
`152`	`152`	`if (baseName == null) throw new ArgumentNullException("baseName");`
`153`		`- if (baseName.Length == 0) throw new ArgumentException("Base name must be provided");`
	`153`	`+ if (baseName.Length == 0) throw new ArgumentException("Base name must be provided", "baseName");`
`154`	`154`	`return (baseName.StartsWith("@")) ? baseName : "@" + baseName;`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ public bool IsValidFunction(string functionName)`
`373`	`373`
`374`	`374`	`public IEnumerable<IEnumerable<IEnumerable<KeyValuePair<string, object>>>> Execute(string functionName, IDictionary<string, object> parameters)`
`375`	`375`	`{`
`376`		`- if (!_functions.ContainsKey(functionName)) throw new InvalidOperationException("No function found with that name.");`
	`376`	`+ if (!_functions.ContainsKey(functionName)) throw new InvalidOperationException(string.Format("Function '{0}' not found.", functionName));`
`377`	`377`	`var obj = _functions[functionName].DynamicInvoke(parameters.Values.ToArray());`
`378`	`378`
`379`	`379`	`var dict = obj as IDictionary<string, object>;`