diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-04-01 15:40:56 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-04-01 15:40:56 +0400 |
| commit | 8c95d557d85afb103e462c3219858a006e78b6b0 (patch) | |
| tree | c423c124d1256ddb276db30161e6c5aed6c6ee26 /extras | |
| parent | 78dfa790999612d5f854e996352a6e8956914259 (diff) | |
| parent | f2ea3136862aa4712e6a4c56e71281aa7cba186f (diff) | |
Merge branch 'master' into newresolver
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs | 7 | ||||
| -rwxr-xr-x | extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs index 693ab4231e..13739db1c3 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/NpgsqlSchemaProvider.cs @@ -145,7 +145,7 @@ using Npgsql; }
r.Close ();
}
- } catch (NpgsqlException ex) {
+ } catch (NpgsqlException) {
// Don't raise error, if the table doesn't exists return an empty collection
} catch (Exception e) {
QueryService.RaiseException (e);
@@ -610,7 +610,7 @@ using Npgsql; }
r.Close ();
}
- } catch (Exception e) {
+ } catch (Exception) {
// Don't raise error, if the table doesn't exists return an empty collection
} finally {
conn.Release ();
@@ -1136,7 +1136,7 @@ using Npgsql; case "bigserial":
dts.LengthRange = new Range (length);
dts.DataTypeCategory = DataTypeCategory.Integer;
- break;
+ break;
case "numeric":
case "decimal":
case "real":
@@ -1146,7 +1146,6 @@ using Npgsql; dts.ScaleRange = new Range (scale);
dts.DataTypeCategory = DataTypeCategory.Float;
break;
- break;
case "character varying":
case "varying":
case "varchar":
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs index 2e0d5f96ca..f95e288caf 100755 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/SqlServerSchemaProvider.cs @@ -139,9 +139,9 @@ using MonoDevelop.Core; }
reader.Close ();
}
- } catch (IOException ioex) {
+ } catch (IOException) {
//FIXME: Avoid an IOException AND ObjectDisposedException (https://bugzilla.novell.com/show_bug.cgi?id=556406)
- } catch (ObjectDisposedException dex) {
+ } catch (ObjectDisposedException) {
}
catch (Exception e) {
QueryService.RaiseException (e);
|