Author: mhutch
Date: 2007-09-04 12:10:54 -0400 (Tue, 04 Sep 2007)
New Revision: 85300
Modified:
trunk/monodevelop/Extras/MonoQuery/ChangeLog
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Mono.Data.Sql.mdp
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/MySqlDbProvider.cs
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/NpgsqlDbProvider.cs
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/OracleDbProvider.cs
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqlDbProvider.cs
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqliteDbProvider.cs
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SybaseDbProvider.cs
trunk/monodevelop/Extras/MonoQuery/MonoQuery/MonoQueryService.cs
Log:
* Mono.Data.Sql/Providers/SqlDbProvider.cs,
Mono.Data.Sql/Providers/SqliteDbProvider.cs,
Mono.Data.Sql/Providers/NpgsqlDbProvider.cs,
Mono.Data.Sql/Providers/MySqlDbProvider.cs,
Mono.Data.Sql/Providers/OracleDbProvider.cs,
Mono.Data.Sql/Providers/SybaseDbProvider.cs,
MonoQuery/MonoQueryService.cs: Fix some compile warnings.
* Mono.Data.Sql/Mono.Data.Sql.mdp: Add optional providers to project,
but build using autotools in order to compile only the
valid/detected ones.
Modified: trunk/monodevelop/Extras/MonoQuery/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoQuery/ChangeLog 2007-09-04 15:52:01 UTC
(rev 85299)
+++ trunk/monodevelop/Extras/MonoQuery/ChangeLog 2007-09-04 16:10:54 UTC
(rev 85300)
@@ -1,3 +1,15 @@
+2007-09-04 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * Mono.Data.Sql/Providers/SqlDbProvider.cs,
+ Mono.Data.Sql/Providers/SqliteDbProvider.cs,
+ Mono.Data.Sql/Providers/NpgsqlDbProvider.cs,
+ Mono.Data.Sql/Providers/MySqlDbProvider.cs,
+ Mono.Data.Sql/Providers/OracleDbProvider.cs,
+ Mono.Data.Sql/Providers/SybaseDbProvider.cs,
+ MonoQuery/MonoQueryService.cs: Fix some compile warnings.
+ * Mono.Data.Sql/Mono.Data.Sql.mdp: Add optional providers to project,
but
+ build using autotools in order to compile only the valid/detected
ones.
+
2007-08-09 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoQuery/MonoQuery.addin.xml: Removed the CommandService class.
Modified: trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Mono.Data.Sql.mdp
===================================================================
--- trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Mono.Data.Sql.mdp
2007-09-04 15:52:01 UTC (rev 85299)
+++ trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Mono.Data.Sql.mdp
2007-09-04 16:10:54 UTC (rev 85300)
@@ -43,19 +43,34 @@
<File name="./Providers/FirebirdDbProvider.cs" subtype="Code"
buildaction="Compile" />
<File name="./Providers/OdbcDbProvider.cs" subtype="Code"
buildaction="Compile" />
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
+ <File name="./Providers/NpgsqlDbProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Providers/MySqlDbProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Providers/OracleDbProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Providers/SqlDbProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Providers/SqliteDbProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Providers/SybaseDbProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Makefile.am" subtype="Code" buildaction="Nothing" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="False" refto="System.Data,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="False" refto="System,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Assembly" localcopy="False"
refto="../../../contrib/FirebirdSql.Data.Firebird.dll" />
</References>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True" IsAutotoolsProject="True"
RelativeConfigureInPath="../../../">
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" SyncReferences="True"
IsAutotoolsProject="True" RelativeConfigureInPath="../../../">
+ <ExcludedFiles>
+ <File>./Providers/SybaseDbProvider.cs</File>
+ <File>./Providers/SqliteDbProvider.cs</File>
+ <File>./Providers/SqlDbProvider.cs</File>
+ <File>./Providers/OracleDbProvider.cs</File>
+ <File>./Providers/NpgsqlDbProvider.cs</File>
+ <File>./Providers/MySqlDbProvider.cs</File>
+ </ExcludedFiles>
<BuildFilesVar Sync="True" Name="FILES" />
<DeployFilesVar />
<ResourcesVar />
<OthersVar />
- <GacRefVar Name="REFS" Prefix="-r:" />
- <AsmRefVar Name="REFS" Prefix="-r:" />
- <ProjectRefVar Name="REFS" Prefix="-r:" />
+ <GacRefVar Sync="True" Name="REFS" Prefix="-r:" />
+ <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
+ <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
</MonoDevelop.Autotools.MakefileInfo>
</Project>
\ No newline at end of file
Modified:
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/MySqlDbProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/MySqlDbProvider.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/MySqlDbProvider.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -86,7 +86,7 @@
try {
Connection.Open ();
OnOpen ();
- } catch (Exception e) {
+ } catch {
isConnectionStringWrong = true;
}
Modified:
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/NpgsqlDbProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/NpgsqlDbProvider.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/NpgsqlDbProvider.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -393,7 +393,7 @@
view.IsSystemView = (r.GetBoolean(4));
view.Comment = r.GetString(5);
- } catch (Exception e) {
+ } catch {
}
collection.Add(view);
Modified:
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/OracleDbProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/OracleDbProvider.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/OracleDbProvider.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -339,7 +339,7 @@
view.Definition = r.GetString(2);
view.IsSystemView = IsSystem
(view.OwnerName);
view.Comment = "";
- } catch (Exception e) {
+ } catch {
}
collection.Add(view);
Modified:
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqlDbProvider.cs
===================================================================
--- trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqlDbProvider.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++ trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqlDbProvider.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -379,7 +379,7 @@
sb.AppendFormat (" {0}\n);", source);
view.Definition = sb.ToString ();
//view.Comment = r.GetString(5);
- } catch (Exception e) {
+ } catch {
}
collection.Add(view);
Modified:
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqliteDbProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqliteDbProvider.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SqliteDbProvider.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -87,7 +87,7 @@
try {
Connection.Open ();
OnOpen ();
- } catch (Exception e) {
+ } catch {
isConnectionStringWrong = true;
}
Modified:
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SybaseDbProvider.cs
===================================================================
---
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SybaseDbProvider.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++
trunk/monodevelop/Extras/MonoQuery/Mono.Data.Sql/Providers/SybaseDbProvider.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -378,7 +378,7 @@
sb.AppendFormat (" {0}\n);", source);
view.Definition = sb.ToString ();
//view.Comment = r.GetString(5);
- } catch (Exception e) {
+ } catch {
}
collection.Add(view);
Modified: trunk/monodevelop/Extras/MonoQuery/MonoQuery/MonoQueryService.cs
===================================================================
--- trunk/monodevelop/Extras/MonoQuery/MonoQuery/MonoQueryService.cs
2007-09-04 15:52:01 UTC (rev 85299)
+++ trunk/monodevelop/Extras/MonoQuery/MonoQuery/MonoQueryService.cs
2007-09-04 16:10:54 UTC (rev 85300)
@@ -94,7 +94,7 @@
providers
=
(DbProviderCollection) serializer.Deserialize (fs);
}
- } catch (Exception e) {
+ } catch {
Runtime.LoggingService.Error ("Invalid
monoquery file.");
Runtime.FileService.DeleteFile
(serializedFile);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
