gnomemm r1886 - in libgdamm/trunk: . libgda/src

[murrayc svn gnome org]

Author: murrayc
Date: Thu Dec 18 18:28:55 2008
New Revision: 1886
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1886&view=rev

Log:
2008-12-18  Murray Cumming  <murrayc murrayc com>

* libgda/src/connection.hg: Include serverprovider.h, because 
the *execute* methods may throw ServerProviderError, though that is not 
documented. See bug #565019.
* libgda/src/serverprovider.[hg|ccg]: Do not include connection.h, 
because that would be circular.

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/connection.hg
   libgdamm/trunk/libgda/src/serverprovider.ccg
   libgdamm/trunk/libgda/src/serverprovider.hg

Modified: libgdamm/trunk/libgda/src/connection.hg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.hg	(original)
+++ libgdamm/trunk/libgda/src/connection.hg	Thu Dec 18 18:28:55 2008
@@ -26,6 +26,7 @@
 #include <libgdamm/statement.h>
 #include <libgdamm/sqlparser.h>
 #include <libgdamm/serveroperation.h>
+#include <libgdamm/serverprovider.h> //For ServerProviderError, sometimes thrown by *execute*().
 #include <libgdamm/value.h>
 
 _DEFS(libgdamm,libgda)
@@ -45,7 +46,6 @@
  */
 _WRAP_GERROR(ConnectionError, GdaConnectionError, GDA_CONNECTION_ERROR)
 
-_WRAP_ENUM(ConnectionFeature, GdaConnectionFeature)
 _WRAP_ENUM(ConnectionSchema, GdaConnectionSchema)
 _WRAP_ENUM(ConnectionOptions, GdaConnectionOptions)
 _WRAP_ENUM(ConnectionMetaType, GdaConnectionMetaType)

Modified: libgdamm/trunk/libgda/src/serverprovider.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/serverprovider.ccg	(original)
+++ libgdamm/trunk/libgda/src/serverprovider.ccg	Thu Dec 18 18:28:55 2008
@@ -21,6 +21,7 @@
  */
 
 #include <libgdamm/connection.h>
+#include <libgdamm/sqlparser.h>
 #include <libgda/gda-enum-types.h>
 #include <libgda/gda-server-provider.h>
 #include <libgda/gda-server-provider-extra.h>

Modified: libgdamm/trunk/libgda/src/serverprovider.hg
==============================================================================
--- libgdamm/trunk/libgda/src/serverprovider.hg	(original)
+++ libgdamm/trunk/libgda/src/serverprovider.hg	Thu Dec 18 18:28:55 2008
@@ -21,7 +21,7 @@
  */
 
 #include <libgdamm/statement.h>
-#include <libgdamm/connection.h>
+//#include <libgdamm/connection.h>
 #include <libgdamm/serveroperation.h>
 #include <libgdamm/datahandler.h>
 
@@ -36,7 +36,10 @@
 
 _WRAP_GERROR(ServerProviderError, GdaServerProviderError, GDA_SERVER_PROVIDER_ERROR)
 
+_WRAP_ENUM(ConnectionFeature, GdaConnectionFeature)
+
 class Connection;
+class SqlParser;
 
 /* TODO: Is this appropriate. Investigate how it is used. */
 typedef GdaServerProviderInfo ServerProviderInfo;