[libgdamm] Use libgda-5.0.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgdamm] Use libgda-5.0.
- Date: Tue, 29 Mar 2011 10:08:03 +0000 (UTC)
commit 08812abc58c81061e5ebc742d09f91c4596c7ec8
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Mar 29 12:07:57 2011 +0200
Use libgda-5.0.
* configure.ac: Use libgda-5.0 instead of libgda-4.0.
* libgda/src/libgda_enums.defs: Regenerated.
* libgda/src/libgda_methods.defs: Regenerated.
* libgda/libgdamm/value.[h|cc]: Remove API that uses the list type. It was
apparently removed from the libgda API.
* libgda/src/connection.hg: Remove an unused enum.
* libgda/src/serveroperation.ccg: Adapt to renamed functions.
ChangeLog | 34 ++-
configure.ac | 8 +-
libgda/libgdamm/value.cc | 62 ++---
libgda/libgdamm/value.h | 150 +++++------
libgda/src/connection.hg | 52 ++--
libgda/src/libgda_enums.defs | 172 ++++++-------
libgda/src/libgda_methods.defs | 598 +++++++++++++++++++---------------------
libgda/src/serveroperation.ccg | 34 +--
8 files changed, 524 insertions(+), 586 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4ddd1d4..c8a7a3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,22 @@
+2011-03-29 Murray Cumming <murrayc murrayc com>
+
+ Use libgda-5.0.
+
+ * configure.ac: Use libgda-5.0 instead of libgda-4.0.
+ * libgda/src/libgda_enums.defs: Regenerated.
+ * libgda/src/libgda_methods.defs: Regenerated.
+ * libgda/libgdamm/value.[h|cc]: Remove API that uses the list type. It was
+ apparently removed from the libgda API.
+ * libgda/src/connection.hg: Remove an unused enum.
+ * libgda/src/serveroperation.ccg: Adapt to renamed functions.
+
+This is the master branch. See the libgdamm-4-2 branch too.
+
4.1.2:
2011-01-30 Murray Cumming <murrayc murrayc com>
- Use std::vector<> instead of *Handle<> or std::list<>.
+ Use std::vector<> instead of *Handle<> or std::list<>.
* libgda/src/batch.[hg|ccg]:
* libgda/src/connection.[hg|ccg]:
@@ -16,8 +30,8 @@
* libgda/src/sqlbuilder.[hg|ccg]:
* libgda/src/statement.[hg|ccg]:
* libgda/src/xatransaction.[hg|ccg]:
- * tools/m4/convert_libgdamm.m4: Use the new convention that we have just
- started using in gtkmm 3. libgdamm is API/ABI unstable, so we can still make
+ * tools/m4/convert_libgdamm.m4: Use the new convention that we have just
+ started using in gtkmm 3. libgdamm is API/ABI unstable, so we can still make
big changes like this.
2010-12-09 Murray Cumming <murrayc murrayc com>
@@ -25,7 +39,7 @@
Adapt to gmmproc m4 changes in glibmm.
* tools/m4/convert.m4: Include convert_glibmm.m4 instead of convert_gtkmm.m4.
- * tools/m4/convert_libgdamm.m4: Avoid use of the __FR2P macro, which does
+ * tools/m4/convert_libgdamm.m4: Avoid use of the __FR2P macro, which does
not seem to be defined for some reason.
4.1.1:
@@ -35,7 +49,7 @@
Small documentation improvements.
* libgda/src/libgda_docs.xml: Fix a typo that I fixed in libgda too.
- * libgda/src/sqlbuilder.[hg|ccg]: Small docs improvements.
+ * libgda/src/sqlbuilder.[hg|ccg]: Small docs improvements.
select_add_target_id(): Use _WRAP_METHOD() for this.
* libgda/src/sqlexpr.hg: Added some overview documentation.
* libgda/src/sqlstatement.hg: Added some overview documentation.
@@ -50,11 +64,11 @@
Work around a doxygen crash.
- * libgda/src/sqlparser.hg: Class overview documentation: Instead of
- describing the placeholder syntax, just link to the GdaSqlParser
- documentation. This is unavoidable as there seems to be now way to mention
- /* in a comment. The attempt to use @verbatim endverbatim to do this does
- not seem to have worked in the past and crashes current versions of doxygen.
+ * libgda/src/sqlparser.hg: Class overview documentation: Instead of
+ describing the placeholder syntax, just link to the GdaSqlParser
+ documentation. This is unavoidable as there seems to be now way to mention
+ /* in a comment. The attempt to use @verbatim endverbatim to do this does
+ not seem to have worked in the past and crashes current versions of doxygen.
( Doxygen bug https://bugzilla.gnome.org/show_bug.cgi?id=632311 )
2010-10-16 Murray Cumming <murrayc murrayc com>
diff --git a/configure.ac b/configure.ac
index 1b0d5cd..f6db596 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([libgdamm], [4.1.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgdamm],
+AC_INIT([libgdamm], [4.9.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgdamm],
[libgdamm], [http://www.gtkmm.org/])
AC_PREREQ([2.59])
@@ -25,7 +25,7 @@ AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_HEADERS([build/config.h libgda/libgdammconfig.h])
MM_PREREQ([0.7.1])
-MM_INIT_MODULE([libgdamm-4.0])
+MM_INIT_MODULE([libgdamm-5.0])
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([LIBGDAMM_SO_VERSION], [13:0:0])
@@ -39,10 +39,10 @@ AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
-AC_SUBST([LIBGDAMM_MODULES], ['glibmm-2.4 >= 2.27.93 libgda-4.0 >= 4.1.7'])
+AC_SUBST([LIBGDAMM_MODULES], ['glibmm-2.4 >= 2.27.93 libgda-5.0 >= 4.99.1'])
PKG_CHECK_MODULES([LIBGDAMM], [$LIBGDAMM_MODULES])
-PKG_CHECK_EXISTS([libgda-bdb-4.0], [libgdamm_have_bdb=yes], [libgdamm_have_bdb=no])
+PKG_CHECK_EXISTS([libgda-bdb-5.0], [libgdamm_have_bdb=yes], [libgdamm_have_bdb=no])
AS_IF([test "x$libgdamm_have_bdb" = xyes],
[AC_DEFINE([HAVE_LIBGDA_BDB], [1], [Define if the libgda-bdb plugin is available.])])
diff --git a/libgda/libgdamm/value.cc b/libgda/libgdamm/value.cc
index a995427..08fb729 100644
--- a/libgda/libgdamm/value.cc
+++ b/libgda/libgdamm/value.cc
@@ -2,7 +2,7 @@
// -*- C++ -*- //
/* value.cc
- *
+ *
* Copyright 2006 libgdamm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ namespace
namespace Gnome
{
-
+
namespace Gda
{
@@ -97,11 +97,6 @@ Value::Value(int val)
set(val);
}
-Value::Value(const GdaValueList* val)
-{
- set(val);
-}
-
Value::Value(const GdaNumeric* val)
{
set(val);
@@ -185,7 +180,7 @@ bool Value::operator==(const Value& src) const
if(get_value_type() != src.get_value_type()) //gda_value_compare() can only compare GValues of the same type.
return false;
-
+
gint test = gda_value_compare(const_cast<GValue*>(gobj()), const_cast<GValue*>(src.gobj())); //returns 0 if both contain
return test == 0;
}
@@ -271,7 +266,7 @@ guint64 Value::get_uint64() const
void Value::set_uint64(guint64 val)
{
value_reinit(gobj(), G_TYPE_UINT64);
- g_value_set_uint64(gobj(), val);
+ g_value_set_uint64(gobj(), val);
}
const guchar* Value::get_binary(long& size) const
@@ -292,7 +287,7 @@ void Value::set(const guchar* val, long size)
GdaBinary gdabinary;
gdabinary.data = const_cast<guchar*>(val);
gdabinary.binary_length = size;
- gda_value_set_binary(gobj(), &gdabinary);
+ gda_value_set_binary(gobj(), &gdabinary);
}
const GdaBlob* Value::get_blob() const
@@ -302,7 +297,7 @@ const GdaBlob* Value::get_blob() const
void Value::set(const GdaBlob* val)
{
- gda_value_set_blob(gobj(), val);
+ gda_value_set_blob(gobj(), val);
}
bool Value::get_boolean() const
@@ -313,7 +308,7 @@ bool Value::get_boolean() const
void Value::set(bool val)
{
value_reinit(gobj(), Glib::Value<bool>::value_type());
- g_value_set_boolean(gobj(), static_cast<int>(val));
+ g_value_set_boolean(gobj(), static_cast<int>(val));
}
Glib::Date Value::get_date() const
@@ -341,7 +336,7 @@ double Value::get_double() const
void Value::set(double val)
{
value_reinit(gobj(), Glib::Value<double>::value_type());
- g_value_set_double(gobj(), val);
+ g_value_set_double(gobj(), val);
}
GeometricPoint Value::get_geometric_point() const
@@ -351,7 +346,7 @@ GeometricPoint Value::get_geometric_point() const
void Value::set(const GeometricPoint& val)
{
- gda_value_set_geometric_point(gobj(), &(val));
+ gda_value_set_geometric_point(gobj(), &(val));
}
int Value::get_int() const
@@ -362,17 +357,7 @@ int Value::get_int() const
void Value::set(int val)
{
value_reinit(gobj(), Glib::Value<int>::value_type());
- g_value_set_int(gobj(), val);
-}
-
-const GdaValueList* Value::get_list()
-{
- return gda_value_get_list(gobj());
-}
-
-void Value::set(const GdaValueList * val)
-{
- gda_value_set_list(gobj(), val);
+ g_value_set_int(gobj(), val);
}
const GdaNumeric* Value::get_numeric() const
@@ -393,7 +378,7 @@ float Value::get_float() const
void Value::set(float val)
{
value_reinit(gobj(), Glib::Value<float>::value_type());
- g_value_set_float(gobj(), val);
+ g_value_set_float(gobj(), val);
}
gshort Value::get_short() const
@@ -403,7 +388,7 @@ gshort Value::get_short() const
void Value::set(gshort val)
{
- gda_value_set_short(gobj(), val);
+ gda_value_set_short(gobj(), val);
}
gushort Value::get_ushort() const
@@ -413,7 +398,7 @@ gushort Value::get_ushort() const
void Value::set(gushort val)
{
- gda_value_set_ushort(gobj(), val);
+ gda_value_set_ushort(gobj(), val);
}
glong Value::get_long() const
@@ -423,7 +408,7 @@ glong Value::get_long() const
void Value::set(glong val)
{
- g_value_set_long(gobj(), val);
+ g_value_set_long(gobj(), val);
}
gulong Value::get_ulong() const
@@ -433,7 +418,7 @@ gulong Value::get_ulong() const
void Value::set(gulong val)
{
- g_value_set_ulong(gobj(), val);
+ g_value_set_ulong(gobj(), val);
}
Glib::ustring Value::get_string() const
@@ -444,7 +429,7 @@ Glib::ustring Value::get_string() const
void Value::set(const Glib::ustring& val)
{
value_reinit(gobj(), G_TYPE_STRING);
- g_value_set_string(gobj(), val.c_str());
+ g_value_set_string(gobj(), val.c_str());
}
void Value::set(const char* val)
@@ -460,7 +445,7 @@ Time Value::get_time() const
void Value::set(const Time& val)
{
- gda_value_set_time(gobj(), &(val));
+ gda_value_set_time(gobj(), &(val));
}
Timestamp Value::get_timestamp() const
@@ -470,7 +455,7 @@ Timestamp Value::get_timestamp() const
void Value::set(const Timestamp& val)
{
- gda_value_set_timestamp(gobj(), &(val));
+ gda_value_set_timestamp(gobj(), &(val));
}
guint Value::get_uint() const
@@ -481,7 +466,7 @@ guint Value::get_uint() const
void Value::set(guint val)
{
value_reinit(gobj(), Glib::Value<unsigned int>::value_type());
- g_value_set_uint(gobj(), val);
+ g_value_set_uint(gobj(), val);
}
GType Value::get_g_type() const
@@ -530,11 +515,6 @@ GType value_get_type_geometric_point()
return GDA_TYPE_GEOMETRIC_POINT;
}
-GType value_get_type_list()
-{
- return GDA_TYPE_LIST;
-}
-
GType value_get_type_numeric()
{
return GDA_TYPE_NUMERIC;
@@ -593,7 +573,7 @@ bool value_equal(const Glib::ValueBase& value1, const Glib::ValueBase& value2)
if(G_VALUE_TYPE(value1.gobj()) != G_VALUE_TYPE(value2.gobj())) //gda_value_compare() can only compare GValues of the same type.
return false;
-
+
int test = gda_value_compare(value1.gobj(), value2.gobj());
return test == 0;
}
@@ -609,5 +589,3 @@ bool value_equal(const Glib::ValueBase& value1, const Glib::ValueBase& value2)
} // namespace Gda
} // namespace Gnome
-
-
diff --git a/libgda/libgdamm/value.h b/libgda/libgdamm/value.h
index e37979f..ff98ef8 100644
--- a/libgda/libgdamm/value.h
+++ b/libgda/libgdamm/value.h
@@ -40,7 +40,7 @@ typedef GdaGeometricPoint GeometricPoint;
typedef GdaTime Time;
typedef GdaTimestamp Timestamp;
-/**
+/**
*
* Use value_type() to identify the value type at runtime.
*/
@@ -55,7 +55,7 @@ public:
Value& operator=(const Value& src);
~Value();
-
+
//We can't have this constructor because gint64 and int are the same on 64-bit systems:
//explicit Value(gint64 val);
@@ -65,179 +65,173 @@ public:
//explicit Value(gint64 val);
// explicit Value(guint64 val);
static Value create_as_uint64(guint64 val);
-
- explicit Value(const guchar* val, long size);
+
+ explicit Value(const guchar* val, long size);
explicit Value(const GdaBlob* val);
explicit Value(bool val);
-
+
explicit Value(const Glib::Date& val);
-
+
explicit Value(double val);
-
+
explicit Value(const GeometricPoint& val);
-
+
explicit Value(int val);
-
- explicit Value(const GdaValueList* val);
-
+
explicit Value(const GdaNumeric* val);
-
+
explicit Value(float val);
-
+
explicit Value(gshort val);
-
+
explicit Value(gushort val);
explicit Value(gulong val);
-
+
explicit Value(const Glib::ustring& val);
-
+
//If this constructor does not exists, then Value("something") uses Value(bool) instead of Value(ustring).
explicit Value(const char* val);
explicit Value(const Time& val);
-
+
explicit Value(const Timestamp& val);
-
-
+
+
//This causes ambiguity with another constructor on 64-bit systems:
//explicit Value(time_t val);
-
+
static Value create_as_time_t(time_t val);
explicit Value(gchar val);
-
+
explicit Value(guchar val);
-
+
explicit Value(guint val);
-
+
explicit Value(const Glib::ustring& as_string, GType type);
-
+
//TODO: explicit Value(const xmlNodePtr node);
//__IGNORE(gda_value_new_from_xml)
bool operator==(const Value& src) const;
bool operator!=(const Value& src) const;
-
+
GType get_value_type() const;
-
+
bool is_null() const;
-
+
bool is_number() const;
-
+
gint64 get_int64() const;
-
+
// We can't have this as a regular set() overload because it has the same
// type as GType on 64bit systems.
void set_int64(gint64 val);
-
+
guint64 get_uint64() const;
-
+
// We can't have this as a regular set() overload because it has the same
// type as GType on 64bit systems.
void set_uint64(guint64 val);
//TODO: The const here is quite meaningless:
-
+
const guchar* get_binary(long& size) const;
-
+
void set(const guchar* val, long size);
//TODO: The const here is quite meaningless:
-
+
const GdaBlob* get_blob() const;
-
+
void set(const GdaBlob* val);
-
+
bool get_boolean() const;
-
+
void set(bool val);
-
+
Glib::Date get_date() const;
-
+
void set(const Glib::Date& val);
-
+
double get_double() const;
-
+
void set(double val);
-
+
GeometricPoint get_geometric_point() const;
-
+
void set(const GeometricPoint& val);
-
+
Glib::RefPtr<const Glib::Object> get_gobject();
-
+
void set(const Glib::RefPtr<Glib::Object>& val);
-
+
int get_int() const;
-
+
void set(int val);
-
- const GdaValueList* get_list();
-
- void set(const GdaValueList *val);
-
+
const GdaNumeric* get_numeric() const;
-
+
void set(const GdaNumeric *val);
-
+
float get_float() const;
-
+
void set(float val);
-
+
gshort get_short() const;
-
+
void set(gshort val);
-
+
gushort get_ushort() const;
-
+
void set(gushort val);
glong get_long() const;
-
+
void set(glong val);
-
+
gulong get_ulong() const;
-
+
void set(gulong val);
-
+
Glib::ustring get_string() const;
-
+
void set(const Glib::ustring& val);
//If this method does not exists, then set("something") uses set(bool) instead of set(ustring).
void set(const char* val);
-
+
Time get_time() const;
-
+
void set(const Time& val);
-
+
Timestamp get_timestamp() const;
-
+
void set(const Timestamp& val);
-
+
void set(gchar val);
-
+
void set(guchar val);
-
+
guint get_uint() const;
-
+
void set(guint val);
-
+
GType get_g_type() const;
-
+
void set_g_type(GType val);
-
+
//Use the copy constructor instead: _WRAP_METHOD(bool set_from_value(const Value& from), gda_value_set_from_value)
-
+
//TODO: Wrap this as some stream operator thing?
-
+
Glib::ustring to_string() const;
};
@@ -263,7 +257,6 @@ GType value_get_type_null();
GType value_get_type_binary();
GType value_get_type_blob();
GType value_get_type_geometric_point();
-GType value_get_type_list();
GType value_get_type_numeric();
GType value_get_type_short();
GType value_get_type_ushort();
@@ -349,4 +342,3 @@ GType gda_ushort_get_type (void) G_GNUC_CONST;
#endif /* _LIBGDAMM_VALUE_H */
-
diff --git a/libgda/src/connection.hg b/libgda/src/connection.hg
index 76b1469..b40a0f5 100644
--- a/libgda/src/connection.hg
+++ b/libgda/src/connection.hg
@@ -1,8 +1,8 @@
/* $Id: connection.hg,v 1.35 2006/11/30 06:58:55 murrayc Exp $ */
-// -*- C++ -*- //
+// -*- C++ -*- //
/* connection.h
- *
+ *
* Copyright 2003 libgdamm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -47,15 +47,14 @@ typedef GdaServerProviderInfo ServerProviderInfo;
*/
_WRAP_GERROR(ConnectionError, GdaConnectionError, GDA_CONNECTION_ERROR)
-_WRAP_ENUM(ConnectionSchema, GdaConnectionSchema)
_WRAP_ENUM(ConnectionOptions, GdaConnectionOptions)
_WRAP_ENUM(ConnectionMetaType, GdaConnectionMetaType)
/** Manages a connection to a data source.
- * This class offers access to all operations involving an opened connection to a database.
+ * This class offers access to all operations involving an opened connection to a database.
* Connection objects are obtained via the Client class.
- *
- * Once obtained, applications can use a Connection to execute commands, run transactions, and get information about all
+ *
+ * Once obtained, applications can use a Connection to execute commands, run transactions, and get information about all
* objects stored in the underlying database.
*
* @ingroup Connections
@@ -135,14 +134,14 @@ public:
#else
Glib::RefPtr<Glib::Object> statement_execute(const Glib::ustring& sql, StatementModelUsage model_usage, std::auto_ptr<Glib::Error>& error);
#endif // GLIBMM_EXCEPTIONS_ENABLED
-
+
//_WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& params), gda_connection_statement_execute_select, errthrow)
_IGNORE(gda_connection_statement_execute_select) //We instead create a version that can take an optional usage parameter too.
#m4 _CONVERSION(`const std::vector<GType>&', `GType*', `const_cast<GType*>(Glib::ArrayHandler<GType>::vector_to_array($3).data())')
_WRAP_METHOD(Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& params, StatementModelUsage model_usage, const std::vector<GType>& col_types), gda_connection_statement_execute_select_full, errthrow)
_IGNORE(gda_connection_statement_execute_select_fullv)
-
+
//TODO: Documentation:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
@@ -152,7 +151,7 @@ public:
Glib::RefPtr<DataModel> statement_execute_select(const Glib::ustring& sql, StatementModelUsage model_usage, std::auto_ptr<Glib::Error>& error);
#endif
-
+
//TODO: Documentation:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
Glib::RefPtr<DataModel> statement_execute_select(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& params, StatementModelUsage model_usage = STATEMENT_MODEL_RANDOM_ACCESS);
@@ -179,7 +178,7 @@ public:
Glib::RefPtr<DataModel> statement_execute_select_builder(const Glib::RefPtr<const SqlBuilder>& stmt, const Glib::RefPtr<const Set>& params, StatementModelUsage model_usage, std::auto_ptr<Glib::Error>& error);
#endif
-
+
_WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute_non_select)
//TODO: Documentation:
//TODO: It's not nice that these two method overloads differ only by the constness of the set.
@@ -187,7 +186,7 @@ public:
int statement_execute_non_select(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& params, Glib::RefPtr<const Set>& last_insert_row);
#else
int statement_execute_non_select(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& params, Glib::RefPtr<const Set>& last_insert_row, std::auto_ptr<Glib::Error>& error);
-#endif //GLIBMM_EXCEPTIONS_ENABLED
+#endif //GLIBMM_EXCEPTIONS_ENABLED
//TODO: Documentation:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -204,7 +203,7 @@ public:
#endif //GLIBMM_EXCEPTIONS_ENABLED
_WRAP_METHOD(int statement_execute_non_select(const Glib::ustring& sql), gda_execute_non_select_command, errthrow)
-
+
//TODO: Documentation:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -233,8 +232,8 @@ public:
_WRAP_METHOD(bool delete_savepoint(const Glib::ustring& name), gda_connection_delete_savepoint, errthrow)
- //Use a special conversion here, because we should not own any part of the returned GList,
- //according to the documentation for gda_connection_get_events(),
+ //Use a special conversion here, because we should not own any part of the returned GList,
+ //according to the documentation for gda_connection_get_events(),
//and because we need to unconst the GList.:
#m4 _CONVERSION(`const GList*',`std::vector< Glib::RefPtr<ConnectionEvent> >',`$2(Glib::ListHandler< Glib::RefPtr<ConnectionEvent> >::list_to_vector(const_cast<GList*>($3), Glib::OWNERSHIP_NONE))')
#m4 _CONVERSION(`const GList*',`std::vector< Glib::RefPtr<const ConnectionEvent> >',`$2(Glib::ListHandler< Glib::RefPtr<const ConnectionEvent> >::list_to_vector(const_cast<GList*>($3), Glib::OWNERSHIP_NONE))')
@@ -246,7 +245,7 @@ public:
_WRAP_METHOD(Glib::ustring value_to_sql_string(const Value& from) const, gda_connection_value_to_sql_string)
_WRAP_METHOD(bool supports_feature(ConnectionFeature feature) const, gda_connection_supports_feature)
-
+
_WRAP_METHOD(Glib::ustring get_authentication() const, gda_connection_get_authentication)
_WRAP_METHOD(Glib::RefPtr<SqlParser> create_parser(), gda_connection_create_parser)
@@ -255,7 +254,7 @@ public:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
/** Update the full meta store information.
- *
+ *
* Note that this may take some time for big databases
* @return <tt>true</tt> if no error occurred.
*/
@@ -266,8 +265,8 @@ public:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
/** Update the meta store information @a id
- *
- * This can speed up the update of the meta store if you only need a
+ *
+ * This can speed up the update of the meta store if you only need a
* specific information
* @param id An id for the information to update (see http://library.gnome.org/devel/libgda/unstable/information_schema.html)
* @return <tt>true</tt> if no error occurred.
@@ -280,7 +279,7 @@ public:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
/** Update the meta store information for the table named @a table_name
- *
+ *
* This can speed up the update of the meta store if you only need the information
* for a specific table
* @param table_name Name of the table where the information is needed
@@ -298,7 +297,7 @@ public:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
/** Update the meta store information for the table names.
- *
+ *
* This can speed up the update of the meta store if you only need the list of table names.
*
* @param schema_name Name of the schema whose tables to update, or "" to
@@ -317,7 +316,7 @@ public:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
/** Update the meta store information for the data types.
- *
+ *
* This can speed up the update of the meta store if you only need the data types.
*
* @return <tt>true</tt> if no error occurred.
@@ -326,7 +325,7 @@ public:
#else
bool update_meta_store_data_types(std::auto_ptr<Glib::Error>& err);
#endif //GLIBMM_EXCEPTIONS_ENABLED
-
+
_WRAP_METHOD(bool statement_prepare(const Glib::RefPtr<const Statement>& stmt), gda_connection_statement_prepare, errthrow)
@@ -351,9 +350,9 @@ public:
_WRAP_METHOD(Glib::RefPtr<ServerProvider> get_provider(), gda_connection_get_provider, refreturn)
_WRAP_METHOD(Glib::RefPtr<const ServerProvider> get_provider() const, gda_connection_get_provider, refreturn)
-
+
_WRAP_METHOD(Glib::ustring quote_sql_identifier(const Glib::ustring& id) const, gda_connection_quote_sql_identifier)
-
+
_WRAP_METHOD_DOCS_ONLY(gda_connection_statement_to_sql)
//TODO: Add an overload without the params_used.
@@ -362,9 +361,9 @@ public:
#else
Glib::ustring statement_to_sql(const Glib::RefPtr<const Statement>& stmt, const Glib::RefPtr<const Set>& params, StatementSqlFlag flags, std::vector< Glib::RefPtr<Holder> >& params_used, std::auto_ptr<Glib::Error>& error) const;
#endif //GLIBMM_EXCEPTIONS_ENABLED
-
+
_IGNORE(gda_connection_internal_reset_transaction_status)
-
+
#m4 _CONVERSION(`GdaConnectionEvent*',`const Glib::RefPtr<ConnectionEvent>&',Glib::wrap($3, true))
_WRAP_SIGNAL(void error(const Glib::RefPtr<ConnectionEvent>& error), "error")
@@ -383,4 +382,3 @@ public:
} // namespace Gda
} // namespace Gnome
-
diff --git a/libgda/src/libgda_enums.defs b/libgda/src/libgda_enums.defs
index afa7c89..c50a3dc 100644
--- a/libgda/src/libgda_enums.defs
+++ b/libgda/src/libgda_enums.defs
@@ -176,7 +176,8 @@
;; GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0,
;; GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE = 1 << 1,
;; GDA_CONNECTION_OPTIONS_THREAD_SAFE = 1 << 2,
-;; GDA_CONNECTION_OPTIONS_THREAD_ISOLATED = 1 << 3
+;; GDA_CONNECTION_OPTIONS_THREAD_ISOLATED = 1 << 3,
+;; GDA_CONNECTION_OPTIONS_AUTO_META_DATA = 1 << 4
;; } GdaConnectionOptions;
(define-flags-extended ConnectionOptions
@@ -188,6 +189,7 @@
'("sql-identifiers-case-sensitive" "GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE" "1 << 1")
'("thread-safe" "GDA_CONNECTION_OPTIONS_THREAD_SAFE" "1 << 2")
'("thread-isolated" "GDA_CONNECTION_OPTIONS_THREAD_ISOLATED" "1 << 3")
+ '("auto-meta-data" "GDA_CONNECTION_OPTIONS_AUTO_META_DATA" "1 << 4")
)
)
@@ -242,49 +244,6 @@
;; Original typedef:
;; typedef enum {
-;; GDA_CONNECTION_SCHEMA_AGGREGATES,
-;; GDA_CONNECTION_SCHEMA_DATABASES,
-;; GDA_CONNECTION_SCHEMA_FIELDS,
-;; GDA_CONNECTION_SCHEMA_INDEXES,
-;; GDA_CONNECTION_SCHEMA_LANGUAGES,
-;; GDA_CONNECTION_SCHEMA_NAMESPACES,
-;; GDA_CONNECTION_SCHEMA_PARENT_TABLES,
-;; GDA_CONNECTION_SCHEMA_PROCEDURES,
-;; GDA_CONNECTION_SCHEMA_SEQUENCES,
-;; GDA_CONNECTION_SCHEMA_TABLES,
-;; GDA_CONNECTION_SCHEMA_TRIGGERS,
-;; GDA_CONNECTION_SCHEMA_TYPES,
-;; GDA_CONNECTION_SCHEMA_USERS,
-;; GDA_CONNECTION_SCHEMA_VIEWS,
-;; GDA_CONNECTION_SCHEMA_CONSTRAINTS,
-;; GDA_CONNECTION_SCHEMA_TABLE_CONTENTS
-;; } GdaConnectionSchema;
-
-(define-enum-extended ConnectionSchema
- (in-module "Gda")
- (c-name "GdaConnectionSchema")
- (values
- '("aggregates" "GDA_CONNECTION_SCHEMA_AGGREGATES" "0")
- '("databases" "GDA_CONNECTION_SCHEMA_DATABASES" "1")
- '("fields" "GDA_CONNECTION_SCHEMA_FIELDS" "2")
- '("indexes" "GDA_CONNECTION_SCHEMA_INDEXES" "3")
- '("languages" "GDA_CONNECTION_SCHEMA_LANGUAGES" "4")
- '("namespaces" "GDA_CONNECTION_SCHEMA_NAMESPACES" "5")
- '("parent-tables" "GDA_CONNECTION_SCHEMA_PARENT_TABLES" "6")
- '("procedures" "GDA_CONNECTION_SCHEMA_PROCEDURES" "7")
- '("sequences" "GDA_CONNECTION_SCHEMA_SEQUENCES" "8")
- '("tables" "GDA_CONNECTION_SCHEMA_TABLES" "9")
- '("triggers" "GDA_CONNECTION_SCHEMA_TRIGGERS" "10")
- '("types" "GDA_CONNECTION_SCHEMA_TYPES" "11")
- '("users" "GDA_CONNECTION_SCHEMA_USERS" "12")
- '("views" "GDA_CONNECTION_SCHEMA_VIEWS" "13")
- '("constraints" "GDA_CONNECTION_SCHEMA_CONSTRAINTS" "14")
- '("table-contents" "GDA_CONNECTION_SCHEMA_TABLE_CONTENTS" "15")
- )
-)
-
-;; Original typedef:
-;; typedef enum {
;; GDA_CONNECTION_META_NAMESPACES,
;; GDA_CONNECTION_META_TYPES,
;; GDA_CONNECTION_META_TABLES,
@@ -499,52 +458,6 @@
)
)
-;; From gda-easy.h
-
-;; Original typedef:
-;; typedef enum {
-;; GDA_EASY_OBJECT_NAME_ERROR,
-;; GDA_EASY_INCORRECT_VALUE_ERROR,
-;; GDA_EASY_OPERATION_ERROR
-;; } GdaEasyError;
-
-(define-enum-extended EasyError
- (in-module "Gda")
- (c-name "GdaEasyError")
- (values
- '("object-name-error" "GDA_EASY_OBJECT_NAME_ERROR" "0")
- '("incorrect-value-error" "GDA_EASY_INCORRECT_VALUE_ERROR" "1")
- '("operation-error" "GDA_EASY_OPERATION_ERROR" "2")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDA_EASY_CREATE_TABLE_NOTHING_FLAG = 1 << 0,
-;; GDA_EASY_CREATE_TABLE_PKEY_FLAG = 1 << 1,
-;; GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG = 1 << 2,
-;; GDA_EASY_CREATE_TABLE_UNIQUE_FLAG = 1 << 3,
-;; GDA_EASY_CREATE_TABLE_AUTOINC_FLAG = 1 << 4,
-;; GDA_EASY_CREATE_TABLE_FKEY_FLAG = 1 << 5,
-;; /* Flags combinations */
-;; GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG = GDA_EASY_CREATE_TABLE_PKEY_FLAG | GDA_EASY_CREATE_TABLE_AUTOINC_FLAG
-;; } GdaEasyCreateTableFlag;
-
-(define-flags-extended EasyCreateTableFlag
- (in-module "Gda")
- (c-name "GdaEasyCreateTableFlag")
- (values
- '("nothing-flag" "GDA_EASY_CREATE_TABLE_NOTHING_FLAG" "1 << 0")
- '("pkey-flag" "GDA_EASY_CREATE_TABLE_PKEY_FLAG" "1 << 1")
- '("not-null-flag" "GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG" "1 << 2")
- '("unique-flag" "GDA_EASY_CREATE_TABLE_UNIQUE_FLAG" "1 << 3")
- '("autoinc-flag" "GDA_EASY_CREATE_TABLE_AUTOINC_FLAG" "1 << 4")
- '("fkey-flag" "GDA_EASY_CREATE_TABLE_FKEY_FLAG" "1 << 5")
- '("pkey-autoinc-flag" "GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG" "0x12")
- )
-)
-
;; From gda-enums.h
;; Original typedef:
@@ -763,6 +676,31 @@
;; Original typedef:
;; typedef enum {
+;; GDA_META_FOREIGN_KEY_UNKNOWN,
+;; GDA_META_FOREIGN_KEY_NONE,
+;; GDA_META_FOREIGN_KEY_NO_ACTION,
+;; GDA_META_FOREIGN_KEY_RESTRICT,
+;; GDA_META_FOREIGN_KEY_CASCADE,
+;; GDA_META_FOREIGN_KEY_SET_NULL,
+;; GDA_META_FOREIGN_KEY_SET_DEFAULT
+;; } GdaMetaForeignKeyPolicy;
+
+(define-enum-extended MetaForeignKeyPolicy
+ (in-module "Gda")
+ (c-name "GdaMetaForeignKeyPolicy")
+ (values
+ '("unknown" "GDA_META_FOREIGN_KEY_UNKNOWN" "0")
+ '("none" "GDA_META_FOREIGN_KEY_NONE" "1")
+ '("no-action" "GDA_META_FOREIGN_KEY_NO_ACTION" "2")
+ '("restrict" "GDA_META_FOREIGN_KEY_RESTRICT" "3")
+ '("cascade" "GDA_META_FOREIGN_KEY_CASCADE" "4")
+ '("set-null" "GDA_META_FOREIGN_KEY_SET_NULL" "5")
+ '("set-default" "GDA_META_FOREIGN_KEY_SET_DEFAULT" "6")
+ )
+)
+
+;; Original typedef:
+;; typedef enum {
;; GDA_META_GRAPH_COLUMNS = 1 << 0
;; } GdaMetaGraphInfo;
@@ -830,6 +768,48 @@
;; Original typedef:
;; typedef enum {
+;; GDA_SERVER_OPERATION_OBJECT_NAME_ERROR,
+;; GDA_SERVER_OPERATION_INCORRECT_VALUE_ERROR
+;; } GdaServerOperationError;
+
+(define-enum-extended ServerOperationError
+ (in-module "Gda")
+ (c-name "GdaServerOperationError")
+ (values
+ '("object-name-error" "GDA_SERVER_OPERATION_OBJECT_NAME_ERROR" "0")
+ '("incorrect-value-error" "GDA_SERVER_OPERATION_INCORRECT_VALUE_ERROR" "1")
+ )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; GDA_SERVER_OPERATION_CREATE_TABLE_NOTHING_FLAG = 1 << 0,
+;; GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_FLAG = 1 << 1,
+;; GDA_SERVER_OPERATION_CREATE_TABLE_NOT_NULL_FLAG = 1 << 2,
+;; GDA_SERVER_OPERATION_CREATE_TABLE_UNIQUE_FLAG = 1 << 3,
+;; GDA_SERVER_OPERATION_CREATE_TABLE_AUTOINC_FLAG = 1 << 4,
+;; GDA_SERVER_OPERATION_CREATE_TABLE_FKEY_FLAG = 1 << 5,
+;; /* Flags combinations */
+;; GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_AUTOINC_FLAG = GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_FLAG | GDA_SERVER_OPERATION_CREATE_TABLE_AUTOINC_FLAG
+;; } GdaServerOperationCreateTableFlag;
+
+(define-flags-extended ServerOperationCreateTableFlag
+ (in-module "Gda")
+ (c-name "GdaServerOperationCreateTableFlag")
+ (values
+ '("nothing-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_NOTHING_FLAG" "1 << 0")
+ '("pkey-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_FLAG" "1 << 1")
+ '("not-null-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_NOT_NULL_FLAG" "1 << 2")
+ '("unique-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_UNIQUE_FLAG" "1 << 3")
+ '("autoinc-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_AUTOINC_FLAG" "1 << 4")
+ '("fkey-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_FKEY_FLAG" "1 << 5")
+ '("pkey-autoinc-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_AUTOINC_FLAG" "0x12")
+ )
+)
+
+;; Original typedef:
+;; typedef enum {
;; GDA_SERVER_OPERATION_NODE_PARAMLIST,
;; GDA_SERVER_OPERATION_NODE_DATA_MODEL,
;; GDA_SERVER_OPERATION_NODE_PARAM,
@@ -886,7 +866,8 @@
;; GDA_SERVER_PROVIDER_BUSY_ERROR,
;; GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
;; GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
-;; GDA_SERVER_PROVIDER_DATA_ERROR
+;; GDA_SERVER_PROVIDER_DATA_ERROR,
+;; GDA_SERVER_PROVIDER_DEFAULT_VALUE_HANDLING_ERROR
;; } GdaServerProviderError;
(define-enum-extended ServerProviderError
@@ -904,6 +885,7 @@
'("non-supported-error" "GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR" "8")
'("server-version-error" "GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR" "9")
'("data-error" "GDA_SERVER_PROVIDER_DATA_ERROR" "10")
+ '("default-value-handling-error" "GDA_SERVER_PROVIDER_DEFAULT_VALUE_HANDLING_ERROR" "11")
)
)
@@ -914,7 +896,8 @@
;; {
;; GDA_SET_XML_SPEC_ERROR,
;; GDA_SET_HOLDER_NOT_FOUND_ERROR,
-;; GDA_SET_INVALID_ERROR
+;; GDA_SET_INVALID_ERROR,
+;; GDA_SET_READ_ONLY_ERROR
;; } GdaSetError;
(define-enum-extended SetError
@@ -924,6 +907,7 @@
'("xml-spec-error" "GDA_SET_XML_SPEC_ERROR" "0")
'("holder-not-found-error" "GDA_SET_HOLDER_NOT_FOUND_ERROR" "1")
'("invalid-error" "GDA_SET_INVALID_ERROR" "2")
+ '("read-only-error" "GDA_SET_READ_ONLY_ERROR" "3")
)
)
@@ -1105,7 +1089,8 @@
;; typedef enum
;; {
;; GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR,
-;; GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR
+;; GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR,
+;; GDA_XA_TRANSACTION_CONNECTION_BRANCH_LENGTH_ERROR
;; } GdaXaTransactionError;
(define-enum-extended XaTransactionError
@@ -1114,6 +1099,7 @@
(values
'("already-registered-error" "GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR" "0")
'("dtp-not-supported-error" "GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR" "1")
+ '("connection-branch-length-error" "GDA_XA_TRANSACTION_CONNECTION_BRANCH_LENGTH_ERROR" "2")
)
)
diff --git a/libgda/src/libgda_methods.defs b/libgda/src/libgda_methods.defs
index a5a5a76..6f606d8 100644
--- a/libgda/src/libgda_methods.defs
+++ b/libgda/src/libgda_methods.defs
@@ -428,30 +428,6 @@
)
)
-(define-enum ConnectionSchema
- (in-module "Gda")
- (c-name "GdaConnectionSchema")
- (gtype-id "GDA_TYPE_CONNECTION_SCHEMA")
- (values
- '("aggregates" "GDA_CONNECTION_SCHEMA_AGGREGATES")
- '("databases" "GDA_CONNECTION_SCHEMA_DATABASES")
- '("fields" "GDA_CONNECTION_SCHEMA_FIELDS")
- '("indexes" "GDA_CONNECTION_SCHEMA_INDEXES")
- '("languages" "GDA_CONNECTION_SCHEMA_LANGUAGES")
- '("namespaces" "GDA_CONNECTION_SCHEMA_NAMESPACES")
- '("parent-tables" "GDA_CONNECTION_SCHEMA_PARENT_TABLES")
- '("procedures" "GDA_CONNECTION_SCHEMA_PROCEDURES")
- '("sequences" "GDA_CONNECTION_SCHEMA_SEQUENCES")
- '("tables" "GDA_CONNECTION_SCHEMA_TABLES")
- '("triggers" "GDA_CONNECTION_SCHEMA_TRIGGERS")
- '("types" "GDA_CONNECTION_SCHEMA_TYPES")
- '("users" "GDA_CONNECTION_SCHEMA_USERS")
- '("views" "GDA_CONNECTION_SCHEMA_VIEWS")
- '("constraints" "GDA_CONNECTION_SCHEMA_CONSTRAINTS")
- '("table-contents" "GDA_CONNECTION_SCHEMA_TABLE_CONTENTS")
- )
-)
-
(define-enum ConnectionMetaType
(in-module "Gda")
(c-name "GdaConnectionMetaType")
@@ -579,32 +555,6 @@
)
)
-(define-enum EasyError
- (in-module "Gda")
- (c-name "GdaEasyError")
- (gtype-id "GDA_TYPE_EASY_ERROR")
- (values
- '("object-name-error" "GDA_EASY_OBJECT_NAME_ERROR")
- '("incorrect-value-error" "GDA_EASY_INCORRECT_VALUE_ERROR")
- '("operation-error" "GDA_EASY_OPERATION_ERROR")
- )
-)
-
-(define-flags EasyCreateTableFlag
- (in-module "Gda")
- (c-name "GdaEasyCreateTableFlag")
- (gtype-id "GDA_TYPE_EASY_CREATE_TABLE_FLAG")
- (values
- '("nothing-flag" "GDA_EASY_CREATE_TABLE_NOTHING_FLAG")
- '("pkey-flag" "GDA_EASY_CREATE_TABLE_PKEY_FLAG")
- '("not-null-flag" "GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG")
- '("unique-flag" "GDA_EASY_CREATE_TABLE_UNIQUE_FLAG")
- '("autoinc-flag" "GDA_EASY_CREATE_TABLE_AUTOINC_FLAG")
- '("fkey-flag" "GDA_EASY_CREATE_TABLE_FKEY_FLAG")
- '("pkey-autoinc-flag" "GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG")
- )
-)
-
(define-enum TransactionIsolation
(in-module "Gda")
(c-name "GdaTransactionIsolation")
@@ -733,6 +683,21 @@
)
)
+(define-enum MetaForeignKeyPolicy
+ (in-module "Gda")
+ (c-name "GdaMetaForeignKeyPolicy")
+ (gtype-id "GDA_TYPE_META_FOREIGN_KEY_POLICY")
+ (values
+ '("unknown" "GDA_META_FOREIGN_KEY_UNKNOWN")
+ '("none" "GDA_META_FOREIGN_KEY_NONE")
+ '("no-action" "GDA_META_FOREIGN_KEY_NO_ACTION")
+ '("restrict" "GDA_META_FOREIGN_KEY_RESTRICT")
+ '("cascade" "GDA_META_FOREIGN_KEY_CASCADE")
+ '("set-null" "GDA_META_FOREIGN_KEY_SET_NULL")
+ '("set-default" "GDA_META_FOREIGN_KEY_SET_DEFAULT")
+ )
+)
+
(define-flags MetaGraphInfo
(in-module "Gda")
(c-name "GdaMetaGraphInfo")
@@ -767,6 +732,31 @@
)
)
+(define-enum ServerOperationError
+ (in-module "Gda")
+ (c-name "GdaServerOperationError")
+ (gtype-id "GDA_TYPE_SERVER_OPERATION_ERROR")
+ (values
+ '("object-name-error" "GDA_SERVER_OPERATION_OBJECT_NAME_ERROR")
+ '("incorrect-value-error" "GDA_SERVER_OPERATION_INCORRECT_VALUE_ERROR")
+ )
+)
+
+(define-flags ServerOperationCreateTableFlag
+ (in-module "Gda")
+ (c-name "GdaServerOperationCreateTableFlag")
+ (gtype-id "GDA_TYPE_SERVER_OPERATION_CREATE_TABLE_FLAG")
+ (values
+ '("nothing-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_NOTHING_FLAG")
+ '("pkey-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_FLAG")
+ '("not-null-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_NOT_NULL_FLAG")
+ '("unique-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_UNIQUE_FLAG")
+ '("autoinc-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_AUTOINC_FLAG")
+ '("fkey-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_FKEY_FLAG")
+ '("pkey-autoinc-flag" "GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_AUTOINC_FLAG")
+ )
+)
+
(define-enum ServerOperationNodeType
(in-module "Gda")
(c-name "GdaServerOperationNodeType")
@@ -934,6 +924,7 @@
(values
'("already-registered-error" "GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR")
'("dtp-not-supported-error" "GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR")
+ '("connection-branch-length-error" "GDA_XA_TRANSACTION_CONNECTION_BRANCH_LENGTH_ERROR")
)
)
@@ -1589,15 +1580,6 @@
(return-type "GType")
)
-(define-function gda_connection_event_new
- (c-name "gda_connection_event_new")
- (is-constructor-of "GdaConnectionEvent")
- (return-type "GdaConnectionEvent*")
- (parameters
- '("GdaConnectionEventType" "type")
- )
-)
-
(define-method set_event_type
(of-object "GdaConnectionEvent")
(c-name "gda_connection_event_set_event_type")
@@ -1804,6 +1786,99 @@
(return-type "const-gchar*")
)
+(define-method parse_sql_string
+ (of-object "GdaConnection")
+ (c-name "gda_connection_parse_sql_string")
+ (return-type "GdaStatement*")
+ (parameters
+ '("const-gchar*" "sql")
+ '("GdaSet**" "params")
+ '("GError**" "error")
+ )
+)
+
+(define-method execute_select_command
+ (of-object "GdaConnection")
+ (c-name "gda_connection_execute_select_command")
+ (return-type "GdaDataModel*")
+ (parameters
+ '("const-gchar*" "sql")
+ '("GError**" "error")
+ )
+)
+
+(define-method execute_non_select_command
+ (of-object "GdaConnection")
+ (c-name "gda_connection_execute_non_select_command")
+ (return-type "gint")
+ (parameters
+ '("const-gchar*" "sql")
+ '("GError**" "error")
+ )
+)
+
+(define-method insert_row_into_table
+ (of-object "GdaConnection")
+ (c-name "gda_connection_insert_row_into_table")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "table")
+ '("GError**" "error")
+ )
+ (varargs #t)
+)
+
+(define-method insert_row_into_table_v
+ (of-object "GdaConnection")
+ (c-name "gda_connection_insert_row_into_table_v")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "table")
+ '("GSList*" "col_names")
+ '("GSList*" "values")
+ '("GError**" "error")
+ )
+)
+
+(define-method update_row_in_table
+ (of-object "GdaConnection")
+ (c-name "gda_connection_update_row_in_table")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "table")
+ '("const-gchar*" "condition_column_name")
+ '("GValue*" "condition_value")
+ '("GError**" "error")
+ )
+ (varargs #t)
+)
+
+(define-method update_row_in_table_v
+ (of-object "GdaConnection")
+ (c-name "gda_connection_update_row_in_table_v")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "table")
+ '("const-gchar*" "condition_column_name")
+ '("GValue*" "condition_value")
+ '("GSList*" "col_names")
+ '("GSList*" "values")
+ '("GError**" "error")
+ )
+)
+
+(define-method delete_row_from_table
+ (of-object "GdaConnection")
+ (c-name "gda_connection_delete_row_from_table")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "table")
+ '("const-gchar*" "condition_column_name")
+ '("GValue*" "condition_value")
+ '("GError**" "error")
+ )
+)
+
(define-method get_events
(of-object "GdaConnection")
(c-name "gda_connection_get_events")
@@ -2411,6 +2486,14 @@
(return-type "const-gchar*")
)
+(define-function gda_data_handler_get_default
+ (c-name "gda_data_handler_get_default")
+ (return-type "GdaDataHandler*")
+ (parameters
+ '("GType" "for_type")
+ )
+)
+
;; From gda-data-model-array.h
@@ -3358,190 +3441,6 @@
-;; From gda-easy.h
-
-(define-function gda_get_default_handler
- (c-name "gda_get_default_handler")
- (return-type "GdaDataHandler*")
- (parameters
- '("GType" "for_type")
- )
-)
-
-(define-function gda_parse_sql_string
- (c-name "gda_parse_sql_string")
- (return-type "GdaStatement*")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "sql")
- '("GdaSet**" "params")
- '("GError**" "error")
- )
-)
-
-(define-function gda_execute_select_command
- (c-name "gda_execute_select_command")
- (return-type "GdaDataModel*")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "sql")
- '("GError**" "error")
- )
-)
-
-(define-function gda_execute_non_select_command
- (c-name "gda_execute_non_select_command")
- (return-type "gint")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "sql")
- '("GError**" "error")
- )
-)
-
-(define-function gda_prepare_create_database
- (c-name "gda_prepare_create_database")
- (return-type "GdaServerOperation*")
- (parameters
- '("const-gchar*" "provider")
- '("const-gchar*" "db_name")
- '("GError**" "error")
- )
-)
-
-(define-function gda_perform_create_database
- (c-name "gda_perform_create_database")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "provider")
- '("GdaServerOperation*" "op")
- '("GError**" "error")
- )
-)
-
-(define-function gda_prepare_drop_database
- (c-name "gda_prepare_drop_database")
- (return-type "GdaServerOperation*")
- (parameters
- '("const-gchar*" "provider")
- '("const-gchar*" "db_name")
- '("GError**" "error")
- )
-)
-
-(define-function gda_perform_drop_database
- (c-name "gda_perform_drop_database")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "provider")
- '("GdaServerOperation*" "op")
- '("GError**" "error")
- )
-)
-
-(define-function gda_prepare_create_table
- (c-name "gda_prepare_create_table")
- (return-type "GdaServerOperation*")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table_name")
- '("GError**" "error")
- )
- (varargs #t)
-)
-
-(define-function gda_perform_create_table
- (c-name "gda_perform_create_table")
- (return-type "gboolean")
- (parameters
- '("GdaServerOperation*" "op")
- '("GError**" "error")
- )
-)
-
-(define-function gda_prepare_drop_table
- (c-name "gda_prepare_drop_table")
- (return-type "GdaServerOperation*")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table_name")
- '("GError**" "error")
- )
-)
-
-(define-function gda_perform_drop_table
- (c-name "gda_perform_drop_table")
- (return-type "gboolean")
- (parameters
- '("GdaServerOperation*" "op")
- '("GError**" "error")
- )
-)
-
-(define-function gda_insert_row_into_table
- (c-name "gda_insert_row_into_table")
- (return-type "gboolean")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table")
- '("GError**" "error")
- )
- (varargs #t)
-)
-
-(define-function gda_insert_row_into_table_v
- (c-name "gda_insert_row_into_table_v")
- (return-type "gboolean")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table")
- '("GSList*" "col_names")
- '("GSList*" "values")
- '("GError**" "error")
- )
-)
-
-(define-function gda_update_row_in_table
- (c-name "gda_update_row_in_table")
- (return-type "gboolean")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table")
- '("const-gchar*" "condition_column_name")
- '("GValue*" "condition_value")
- '("GError**" "error")
- )
- (varargs #t)
-)
-
-(define-function gda_update_row_in_table_v
- (c-name "gda_update_row_in_table_v")
- (return-type "gboolean")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table")
- '("const-gchar*" "condition_column_name")
- '("GValue*" "condition_value")
- '("GSList*" "col_names")
- '("GSList*" "values")
- '("GError**" "error")
- )
-)
-
-(define-function gda_delete_row_from_table
- (c-name "gda_delete_row_from_table")
- (return-type "gboolean")
- (parameters
- '("GdaConnection*" "cnc")
- '("const-gchar*" "table")
- '("const-gchar*" "condition_column_name")
- '("GValue*" "condition_value")
- '("GError**" "error")
- )
-)
-
-
-
;; From gda-enums.h
@@ -3583,11 +3482,6 @@
(return-type "GType")
)
-(define-function gda_connection_schema_get_type
- (c-name "gda_connection_schema_get_type")
- (return-type "GType")
-)
-
(define-function gda_connection_meta_type_get_type
(c-name "gda_connection_meta_type_get_type")
(return-type "GType")
@@ -3638,16 +3532,6 @@
(return-type "GType")
)
-(define-function gda_easy_error_get_type
- (c-name "gda_easy_error_get_type")
- (return-type "GType")
-)
-
-(define-function gda_easy_create_table_flag_get_type
- (c-name "gda_easy_create_table_flag_get_type")
- (return-type "GType")
-)
-
(define-function gda_transaction_isolation_get_type
(c-name "gda_transaction_isolation_get_type")
(return-type "GType")
@@ -3698,6 +3582,11 @@
(return-type "GType")
)
+(define-function gda_meta_foreign_key_policy_get_type
+ (c-name "gda_meta_foreign_key_policy_get_type")
+ (return-type "GType")
+)
+
(define-function gda_meta_graph_info_get_type
(c-name "gda_meta_graph_info_get_type")
(return-type "GType")
@@ -3713,6 +3602,16 @@
(return-type "GType")
)
+(define-function gda_server_operation_error_get_type
+ (c-name "gda_server_operation_error_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_server_operation_create_table_flag_get_type
+ (c-name "gda_server_operation_create_table_flag_get_type")
+ (return-type "GType")
+)
+
(define-function gda_server_operation_node_type_get_type
(c-name "gda_server_operation_node_type_get_type")
(return-type "GType")
@@ -4234,6 +4133,43 @@
)
)
+(define-method declare_foreign_key
+ (of-object "GdaMetaStore")
+ (c-name "gda_meta_store_declare_foreign_key")
+ (return-type "gboolean")
+ (parameters
+ '("GdaMetaStruct*" "mstruct")
+ '("const-gchar*" "fk_name")
+ '("const-gchar*" "catalog")
+ '("const-gchar*" "schema")
+ '("const-gchar*" "table")
+ '("const-gchar*" "ref_catalog")
+ '("const-gchar*" "ref_schema")
+ '("const-gchar*" "ref_table")
+ '("guint" "nb_cols")
+ '("gchar**" "colnames")
+ '("gchar**" "ref_colnames")
+ '("GError**" "error")
+ )
+)
+
+(define-method undeclare_foreign_key
+ (of-object "GdaMetaStore")
+ (c-name "gda_meta_store_undeclare_foreign_key")
+ (return-type "gboolean")
+ (parameters
+ '("GdaMetaStruct*" "mstruct")
+ '("const-gchar*" "fk_name")
+ '("const-gchar*" "catalog")
+ '("const-gchar*" "schema")
+ '("const-gchar*" "table")
+ '("const-gchar*" "ref_catalog")
+ '("const-gchar*" "ref_schema")
+ '("const-gchar*" "ref_table")
+ '("GError**" "error")
+ )
+)
+
;; From gda-meta-struct.h
@@ -4416,6 +4352,24 @@
(return-type "none")
)
+(define-method debug
+ (of-object "GdaMutex")
+ (c-name "gda_mutex_debug")
+ (return-type "none")
+ (parameters
+ '("gboolean" "debug")
+ )
+)
+
+(define-method dump_usage
+ (of-object "GdaMutex")
+ (c-name "gda_mutex_dump_usage")
+ (return-type "none")
+ (parameters
+ '("FILE*" "stream")
+ )
+)
+
;; From gda-quark-list.h
@@ -4801,43 +4755,95 @@
)
)
+(define-function gda_server_operation_prepare_create_database
+ (c-name "gda_server_operation_prepare_create_database")
+ (return-type "GdaServerOperation*")
+ (parameters
+ '("const-gchar*" "provider")
+ '("const-gchar*" "db_name")
+ '("GError**" "error")
+ )
+)
+(define-method perform_create_database
+ (of-object "GdaServerOperation")
+ (c-name "gda_server_operation_perform_create_database")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "provider")
+ '("GError**" "error")
+ )
+)
-;; From gda-server-provider-extra.h
+(define-function gda_server_operation_prepare_drop_database
+ (c-name "gda_server_operation_prepare_drop_database")
+ (return-type "GdaServerOperation*")
+ (parameters
+ '("const-gchar*" "provider")
+ '("const-gchar*" "db_name")
+ '("GError**" "error")
+ )
+)
-(define-method internal_get_parser
- (of-object "GdaServerProvider")
- (c-name "gda_server_provider_internal_get_parser")
- (return-type "GdaSqlParser*")
+(define-method perform_drop_database
+ (of-object "GdaServerOperation")
+ (c-name "gda_server_operation_perform_drop_database")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "provider")
+ '("GError**" "error")
+ )
)
-(define-function gda_server_provider_get_schema_nb_columns
- (c-name "gda_server_provider_get_schema_nb_columns")
- (return-type "gint")
+(define-function gda_server_operation_prepare_create_table
+ (c-name "gda_server_operation_prepare_create_table")
+ (return-type "GdaServerOperation*")
(parameters
- '("GdaConnectionSchema" "schema")
+ '("GdaConnection*" "cnc")
+ '("const-gchar*" "table_name")
+ '("GError**" "error")
)
+ (varargs #t)
)
-(define-function gda_server_provider_init_schema_model
- (c-name "gda_server_provider_init_schema_model")
+(define-method perform_create_table
+ (of-object "GdaServerOperation")
+ (c-name "gda_server_operation_perform_create_table")
(return-type "gboolean")
(parameters
- '("GdaDataModel*" "model")
- '("GdaConnectionSchema" "schema")
+ '("GError**" "error")
)
)
-(define-function gda_server_provider_test_schema_model
- (c-name "gda_server_provider_test_schema_model")
+(define-function gda_server_operation_prepare_drop_table
+ (c-name "gda_server_operation_prepare_drop_table")
+ (return-type "GdaServerOperation*")
+ (parameters
+ '("GdaConnection*" "cnc")
+ '("const-gchar*" "table_name")
+ '("GError**" "error")
+ )
+)
+
+(define-method perform_drop_table
+ (of-object "GdaServerOperation")
+ (c-name "gda_server_operation_perform_drop_table")
(return-type "gboolean")
(parameters
- '("GdaDataModel*" "model")
- '("GdaConnectionSchema" "schema")
'("GError**" "error")
)
)
+
+
+;; From gda-server-provider-extra.h
+
+(define-method internal_get_parser
+ (of-object "GdaServerProvider")
+ (c-name "gda_server_provider_internal_get_parser")
+ (return-type "GdaSqlParser*")
+)
+
(define-method perform_operation_default
(of-object "GdaServerProvider")
(c-name "gda_server_provider_perform_operation_default")
@@ -6591,23 +6597,6 @@
)
)
-(define-function gda_value_get_list
- (c-name "gda_value_get_list")
- (return-type "const-GdaValueList*")
- (parameters
- '("const-GValue*" "value")
- )
-)
-
-(define-function gda_value_set_list
- (c-name "gda_value_set_list")
- (return-type "none")
- (parameters
- '("GValue*" "value")
- '("const-GdaValueList*" "val")
- )
-)
-
(define-function gda_value_set_null
(c-name "gda_value_set_null")
(return-type "none")
@@ -6935,11 +6924,6 @@
)
)
-(define-function gda_value_list_get_type
- (c-name "gda_value_list_get_type")
- (return-type "GType")
-)
-
(define-function gda_short_get_type
(c-name "gda_short_get_type")
(return-type "GType")
@@ -8067,24 +8051,16 @@
;; From gda-statement-struct-util.h
-(define-function gda_sql_identifier_needs_quotes
- (c-name "gda_sql_identifier_needs_quotes")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "str")
- )
-)
-
-(define-function gda_sql_identifier_add_quotes
- (c-name "gda_sql_identifier_add_quotes")
+(define-function gda_sql_identifier_force_quotes
+ (c-name "gda_sql_identifier_force_quotes")
(return-type "gchar*")
(parameters
'("const-gchar*" "str")
)
)
-(define-function gda_sql_identifier_remove_quotes
- (c-name "gda_sql_identifier_remove_quotes")
+(define-function gda_sql_identifier_prepare_for_compare
+ (c-name "gda_sql_identifier_prepare_for_compare")
(return-type "gchar*")
(parameters
'("gchar*" "str")
@@ -8246,7 +8222,3 @@
)
-
-;; From libgda-report.h
-
-
diff --git a/libgda/src/serveroperation.ccg b/libgda/src/serveroperation.ccg
index 7938adb..cdc6b96 100644
--- a/libgda/src/serveroperation.ccg
+++ b/libgda/src/serveroperation.ccg
@@ -2,7 +2,7 @@
// -*- C++ -*- // this is for the .ccg, I realize gensig puts one in
/* serveroperation.cc
- *
+ *
* Copyright 2006 libgdamm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
#include <libgda/gda-server-operation.h>
#include <libgda/gda-enum-types.h>
-#include <libgda/gda-easy.h>
#include <libgdamm/connection.h>
namespace Gnome
@@ -41,16 +40,16 @@ Glib::RefPtr<ServerOperation> ServerOperation::prepare_create_database(const Gli
#endif
{
GError* gerror = 0;
- Glib::RefPtr<ServerOperation> op =
- Glib::wrap(gda_prepare_create_database(provider.c_str(), db_name.c_str(), &gerror));
+ Glib::RefPtr<ServerOperation> op =
+ Glib::wrap(gda_server_operation_prepare_create_database(provider.c_str(), db_name.c_str(), &gerror));
#ifdef GLIBMM_EXCEPTIONS_ENABLED
if(gerror) ::Glib::Error::throw_exception(gerror);
#else
if(gerror) error = ::Glib::Error::throw_exception(gerror);
#endif // GLIBMM_EXCEPTIONS_ENABLED
-
- return op;
+
+ return op;
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -63,16 +62,16 @@ Glib::RefPtr<ServerOperation> ServerOperation::prepare_drop_database(const Glib:
#endif
{
GError* gerror = 0;
- Glib::RefPtr<ServerOperation> op =
- Glib::wrap(gda_prepare_drop_database(provider.c_str(), db_name.c_str(), &gerror));
+ Glib::RefPtr<ServerOperation> op =
+ Glib::wrap(gda_server_operation_prepare_drop_database(provider.c_str(), db_name.c_str(), &gerror));
#ifdef GLIBMM_EXCEPTIONS_ENABLED
if(gerror) ::Glib::Error::throw_exception(gerror);
#else
if(gerror) error = ::Glib::Error::throw_exception(gerror);
#endif // GLIBMM_EXCEPTIONS_ENABLED
-
- return op;
+
+ return op;
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -83,15 +82,15 @@ bool ServerOperation::perform_drop_database(const Glib::ustring& provider,
#endif
{
GError* gerror = 0;
- bool retval =
- static_cast<bool>(gda_perform_drop_database(provider.c_str(), gobj(), &gerror));
+ bool retval =
+ static_cast<bool>(gda_server_operation_perform_drop_database(gobj(), provider.c_str(), &gerror));
#ifdef GLIBMM_EXCEPTIONS_ENABLED
if(gerror) ::Glib::Error::throw_exception(gerror);
#else
if(gerror) error = ::Glib::Error::throw_exception(gerror);
#endif // GLIBMM_EXCEPTIONS_ENABLED
-
+
return retval;
}
@@ -103,15 +102,15 @@ bool ServerOperation::perform_create_database(const Glib::ustring& provider,
#endif
{
GError* gerror = 0;
- bool retval =
- static_cast<bool>(gda_perform_create_database(provider.c_str(), gobj(), &gerror));
+ bool retval =
+ static_cast<bool>(gda_server_operation_perform_create_database(gobj(), provider.c_str(), &gerror));
#ifdef GLIBMM_EXCEPTIONS_ENABLED
if(gerror) ::Glib::Error::throw_exception(gerror);
#else
if(gerror) error = ::Glib::Error::throw_exception(gerror);
#endif // GLIBMM_EXCEPTIONS_ENABLED
-
+
return retval;
}
@@ -121,7 +120,7 @@ Value ServerOperation::get_value_at(const Glib::ustring& path) const
const GValue* value = gda_server_operation_get_value_at(const_cast<GdaServerOperation*>(gobj()), "%s", path.c_str());
retval.init(value);
return retval;
-}
+}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
void ServerOperation::set_value_at_as_value(const Glib::ustring& path, const Glib::ValueBase& value)
@@ -144,4 +143,3 @@ void ServerOperation::set_value_at_as_value(const Glib::ustring& path, const Gli
} /* namespace Gda */
} /* namespace Gnome */
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
