gnomemm r1406 - in libgdamm/trunk: . libgda/src tools/m4



Author: murrayc
Date: Sun Mar 16 13:27:20 2008
New Revision: 1406
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1406&view=rev

Log:
2008-03-16  Murray Cumming  <murrayc murrayc com>

* libgda/src/libgda_methods.defs: Regenerated with h2defs.py
* libgda/src/dictconstraint.hg: Comment out fkey_set_fields() because 
we do not yet have a wrapper for GdaDictConstraintFkeyPair.
* libgda/src/dictfield.hg: Added table and entry-plugin properties.
* libgda/src/dicttable.hg: Added db and is-view properties.
* libgda/src/row.hg: Added row property.

* tools/m4/convert_libgdamm.m4:
* libgda/src/serveroperation.hg: Added get_node_type().

* libgda/src/entity.hg: Added signals, though not really because we 
do not have .defs for these yet.
* libgda/src/entityfield.hg: Removed vfuncs which probaly have 
incorrect refcounting. We can work on this for libgdamm 4.0.

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/dict.hg
   libgdamm/trunk/libgda/src/dictconstraint.hg
   libgdamm/trunk/libgda/src/dictfield.hg
   libgdamm/trunk/libgda/src/dicttable.hg
   libgdamm/trunk/libgda/src/dicttype.hg
   libgdamm/trunk/libgda/src/entity.hg
   libgdamm/trunk/libgda/src/entityfield.hg
   libgdamm/trunk/libgda/src/handlerbin.hg
   libgdamm/trunk/libgda/src/libgda_methods.defs
   libgdamm/trunk/libgda/src/parameter.ccg
   libgdamm/trunk/libgda/src/query.hg
   libgdamm/trunk/libgda/src/querycondition.hg
   libgdamm/trunk/libgda/src/row.hg
   libgdamm/trunk/libgda/src/serveroperation.hg
   libgdamm/trunk/libgda/src/serverprovider.hg
   libgdamm/trunk/tools/m4/convert_libgdamm.m4

Modified: libgdamm/trunk/libgda/src/dict.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dict.hg	(original)
+++ libgdamm/trunk/libgda/src/dict.hg	Sun Mar 16 13:27:20 2008
@@ -142,18 +142,14 @@
 
   //TODO: Use a ListHandle or similar?
   GSList* get_aggregates() const;
-#if 0
-  // The C counterparts to these functions are declared in a header that is not surrounded by
-  // G_BEGIN_DECL / G_END_DECL (gda-dict-reg-aggregates.h). This is a bit strange since there is a macro calling these
-  // functions in the public gda-dict.h file.
-  GSList* get_aggregates_by_name (const Glib::ustring& aggname);
+
+  GSList* get_aggregates_by_name(const Glib::ustring& aggname);
 
   //TODO: Use a C++ type, or at least a reference instead of a pointer:
   //TODO: Make sure that these take a reference.
   Glib::RefPtr<DictAggregate> get_aggregate_by_name_arg(const Glib::ustring& aggname, GdaDictType *argtype);
   Glib::RefPtr<DictAggregate> get_aggregate_by_xml_id(const Glib::ustring& xml_id);
   Glib::RefPtr<DictAggregate> get_aggregate_by_dbms_id(const Glib::ustring& dbms_id);
-#endif
 
 /* GdaQuery manipulations */
   //_WRAP_METHOD(void declare_query(const Glib::RefPtr<Query>& query), gda_dict_declare_query)

Modified: libgdamm/trunk/libgda/src/dictconstraint.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dictconstraint.hg	(original)
+++ libgdamm/trunk/libgda/src/dictconstraint.hg	Sun Mar 16 13:27:20 2008
@@ -87,8 +87,8 @@
   _WRAP_METHOD(Glib::SListHandle< Glib::RefPtr<const DictField> > pkey_get_fields() const, gda_dict_constraint_pkey_get_fields)
 
 /* Foreign KEY specific */
-  //TODO:
-  _WRAP_METHOD(void fkey_set_fields(const GSList *pairs), gda_dict_constraint_fkey_set_fields)
+  //TODO: Wrap GdaDictConstraintFkeyPair (which might or might not be a GObject):
+  //_WRAP_METHOD(void fkey_set_fields(const Glib::SListHandle< Glib::RefPtr<DictConstraintFkeyPair> >& pairs), gda_dict_constraint_fkey_set_fields)
 
   _WRAP_METHOD(Glib::RefPtr<DictTable> fkey_get_ref_table(), gda_dict_constraint_fkey_get_ref_table, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const DictTable> fkey_get_ref_table() const, gda_dict_constraint_fkey_get_ref_table, constversion)

Modified: libgdamm/trunk/libgda/src/dictfield.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dictfield.hg	(original)
+++ libgdamm/trunk/libgda/src/dictfield.hg	Sun Mar 16 13:27:20 2008
@@ -82,7 +82,10 @@
   _WRAP_METHOD(void set_attributes(DictFieldAttribute attributes), gda_dict_field_set_attributes)
   _WRAP_METHOD(DictFieldAttribute get_attributes() const, gda_dict_field_get_attributes)
 
- //TODO: properties, signals, vfuncs.
+  _WRAP_PROPERTY("table", Glib::RefPtr<DictTable>)
+  _WRAP_PROPERTY("entry-plugin", std::string)
+
+  //There are no signals or vfuncs.
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/dicttable.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dicttable.hg	(original)
+++ libgdamm/trunk/libgda/src/dicttable.hg	Sun Mar 16 13:27:20 2008
@@ -79,7 +79,10 @@
 
   _WRAP_METHOD(bool update_dbms_data(), gda_dict_table_update_dbms_data, errthrow)
 
- //TODO: properties, signals, vfuncs.
+  _WRAP_PROPERTY("db", Glib::RefPtr<DictDatabase>)
+  _WRAP_PROPERTY("is-view", bool)
+
+ //There are no signals or vfuncs.
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/dicttype.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dicttype.hg	(original)
+++ libgdamm/trunk/libgda/src/dicttype.hg	Sun Mar 16 13:27:20 2008
@@ -73,7 +73,7 @@
 
   _WRAP_METHOD(void clear_synonyms(), gda_dict_type_clear_synonyms)
 
- //TODO: properties, signals, vfuncs.
+ //There are no properties, signals or vfuncs.
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/entity.hg
==============================================================================
--- libgdamm/trunk/libgda/src/entity.hg	(original)
+++ libgdamm/trunk/libgda/src/entity.hg	Sun Mar 16 13:27:20 2008
@@ -76,8 +76,13 @@
 
   _WRAP_METHOD(bool is_writable() const, gda_entity_is_writable)
 
+  //TODO: .defs.
+  _WRAP_SIGNAL(void field_added(const Glib::RefPtr<EntityField>& field), field_added)
+  _WRAP_SIGNAL(void field_removed(const Glib::RefPtr<EntityField>& field), field_removed)
+  _WRAP_SIGNAL(void field_updated(const Glib::RefPtr<EntityField>& field), field_updated)
+  _WRAP_SIGNAL(void fields_order_changed(), fields_order_changed)
 
-  //TODO: vfuncs and signals.
+  //TODO: vfuncs
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/entityfield.hg
==============================================================================
--- libgdamm/trunk/libgda/src/entityfield.hg	(original)
+++ libgdamm/trunk/libgda/src/entityfield.hg	Sun Mar 16 13:27:20 2008
@@ -60,10 +60,10 @@
   _WRAP_METHOD(Glib::ustring get_description() const, gda_entity_field_get_description)
 
 //TODO: Watch out, this might not do correct reference counting:
-  _WRAP_VFUNC(Glib::RefPtr<Entity> get_entity(), get_entity)
+  //_WRAP_VFUNC(Glib::RefPtr<Entity> get_entity(), get_entity)
   _WRAP_VFUNC(GType get_g_type(), get_g_type)
   _WRAP_VFUNC(void set_dict_type(const Glib::RefPtr<DictType>& type), set_dict_type)
-  _WRAP_VFUNC(Glib::RefPtr<DictType> get_dict_type(), get_dict_type)
+  //_WRAP_VFUNC(Glib::RefPtr<DictType> get_dict_type(), get_dict_type)
   _WRAP_VFUNC(Glib::ustring get_alias(), get_alias)
 };
 

Modified: libgdamm/trunk/libgda/src/handlerbin.hg
==============================================================================
--- libgdamm/trunk/libgda/src/handlerbin.hg	(original)
+++ libgdamm/trunk/libgda/src/handlerbin.hg	Sun Mar 16 13:27:20 2008
@@ -44,7 +44,7 @@
 protected:
 
   // TODO: We cannot wrap gda_handler_bin_new_with_prov because this sets some
-  // private fields. I guess these should be properties in libgnomedb. armin.
+  // private fields. I guess these should be properties in libgda. armin.
   //   Maybe that is fixed now. murrayc.
  _CTOR_DEFAULT
 

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Sun Mar 16 13:27:20 2008
@@ -523,34 +523,6 @@
   )
 )
 
-(define-enum DataModelIterError
-  (in-module "Gda")
-  (c-name "GdaDataModelIterError")
-  (gtype-id "GDA_TYPE_DATA_MODEL_ITER_ERROR")
-  (values
-    '("r" "GDA_DATA_MODEL_ITER_WHAT_ERROR")
-  )
-)
-
-(define-enum DataModelQueryError
-  (in-module "Gda")
-  (c-name "GdaDataModelQueryError")
-  (gtype-id "GDA_TYPE_DATA_MODEL_QUERY_ERROR")
-  (values
-    '("xml-load-error" "GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR")
-    '("compute-modif-queries-error" "GDA_DATA_MODEL_QUERY_COMPUTE_MODIF_QUERIES_ERROR")
-  )
-)
-
-(define-flags DataModelQueryOptions
-  (in-module "Gda")
-  (c-name "GdaDataModelQueryOptions")
-  (gtype-id "GDA_TYPE_DATA_MODEL_QUERY_OPTIONS")
-  (values
-    '("k" "GDA_DATA_MODEL_QUERY_OPTION_USE_ALL_FIELDS_IF_NO_PK")
-  )
-)
-
 (define-flags DataModelAccessFlags
   (in-module "Gda")
   (c-name "GdaDataModelAccessFlags")
@@ -587,6 +559,34 @@
   )
 )
 
+(define-enum DataModelIterError
+  (in-module "Gda")
+  (c-name "GdaDataModelIterError")
+  (gtype-id "GDA_TYPE_DATA_MODEL_ITER_ERROR")
+  (values
+    '("r" "GDA_DATA_MODEL_ITER_WHAT_ERROR")
+  )
+)
+
+(define-enum DataModelQueryError
+  (in-module "Gda")
+  (c-name "GdaDataModelQueryError")
+  (gtype-id "GDA_TYPE_DATA_MODEL_QUERY_ERROR")
+  (values
+    '("xml-load-error" "GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR")
+    '("compute-modif-queries-error" "GDA_DATA_MODEL_QUERY_COMPUTE_MODIF_QUERIES_ERROR")
+  )
+)
+
+(define-flags DataModelQueryOptions
+  (in-module "Gda")
+  (c-name "GdaDataModelQueryOptions")
+  (gtype-id "GDA_TYPE_DATA_MODEL_QUERY_OPTIONS")
+  (values
+    '("k" "GDA_DATA_MODEL_QUERY_OPTION_USE_ALL_FIELDS_IF_NO_PK")
+  )
+)
+
 (define-enum DataProxyError
   (in-module "Gda")
   (c-name "GdaDataProxyError")
@@ -686,6 +686,22 @@
   )
 )
 
+(define-enum DictError
+  (in-module "Gda")
+  (c-name "GdaDictError")
+  (gtype-id "GDA_TYPE_DICT_ERROR")
+  (values
+    '("meta-data-update-error" "GDA_DICT_META_DATA_UPDATE_ERROR")
+    '("meta-data-update-user-stopped" "GDA_DICT_META_DATA_UPDATE_USER_STOPPED")
+    '("load-file-not-exist-error" "GDA_DICT_LOAD_FILE_NOT_EXIST_ERROR")
+    '("file-load-error" "GDA_DICT_FILE_LOAD_ERROR")
+    '("file-save-error" "GDA_DICT_FILE_SAVE_ERROR")
+    '("datatype-error" "GDA_DICT_DATATYPE_ERROR")
+    '("functions-error" "GDA_DICT_FUNCTIONS_ERROR")
+    '("aggregates-error" "GDA_DICT_AGGREGATES_ERROR")
+  )
+)
+
 (define-enum DictTableError
   (in-module "Gda")
   (c-name "GdaDictTableError")
@@ -706,22 +722,6 @@
   )
 )
 
-(define-enum DictError
-  (in-module "Gda")
-  (c-name "GdaDictError")
-  (gtype-id "GDA_TYPE_DICT_ERROR")
-  (values
-    '("meta-data-update-error" "GDA_DICT_META_DATA_UPDATE_ERROR")
-    '("meta-data-update-user-stopped" "GDA_DICT_META_DATA_UPDATE_USER_STOPPED")
-    '("load-file-not-exist-error" "GDA_DICT_LOAD_FILE_NOT_EXIST_ERROR")
-    '("file-load-error" "GDA_DICT_FILE_LOAD_ERROR")
-    '("file-save-error" "GDA_DICT_FILE_SAVE_ERROR")
-    '("datatype-error" "GDA_DICT_DATATYPE_ERROR")
-    '("functions-error" "GDA_DICT_FUNCTIONS_ERROR")
-    '("aggregates-error" "GDA_DICT_AGGREGATES_ERROR")
-  )
-)
-
 (define-enum TransactionIsolation
   (in-module "Gda")
   (c-name "GdaTransactionIsolation")
@@ -795,6 +795,15 @@
   )
 )
 
+(define-enum ParameterError
+  (in-module "Gda")
+  (c-name "GdaParameterError")
+  (gtype-id "GDA_TYPE_PARAMETER_ERROR")
+  (values
+    '("r" "GDA_PARAMETER_QUERY_LIMIT_ERROR")
+  )
+)
+
 (define-enum ParameterListError
   (in-module "Gda")
   (c-name "GdaParameterListError")
@@ -822,15 +831,6 @@
   )
 )
 
-(define-enum ParameterError
-  (in-module "Gda")
-  (c-name "GdaParameterError")
-  (gtype-id "GDA_TYPE_PARAMETER_ERROR")
-  (values
-    '("r" "GDA_PARAMETER_QUERY_LIMIT_ERROR")
-  )
-)
-
 (define-enum QueryConditionType
   (in-module "Gda")
   (c-name "GdaQueryConditionType")
@@ -919,6 +919,15 @@
   )
 )
 
+(define-enum QueryFieldError
+  (in-module "Gda")
+  (c-name "GdaQueryFieldError")
+  (gtype-id "GDA_TYPE_QUERY_FIELD_ERROR")
+  (values
+    '("r" "GDA_QUERY_FIELD_XML_LOAD_ERROR")
+  )
+)
+
 (define-enum QueryFieldValueError
   (in-module "Gda")
   (c-name "GdaQueryFieldValueError")
@@ -931,12 +940,40 @@
   )
 )
 
-(define-enum QueryFieldError
+(define-enum QueryType
   (in-module "Gda")
-  (c-name "GdaQueryFieldError")
-  (gtype-id "GDA_TYPE_QUERY_FIELD_ERROR")
+  (c-name "GdaQueryType")
+  (gtype-id "GDA_TYPE_QUERY_TYPE")
   (values
-    '("r" "GDA_QUERY_FIELD_XML_LOAD_ERROR")
+    '("select" "GDA_QUERY_TYPE_SELECT")
+    '("insert" "GDA_QUERY_TYPE_INSERT")
+    '("update" "GDA_QUERY_TYPE_UPDATE")
+    '("delete" "GDA_QUERY_TYPE_DELETE")
+    '("union" "GDA_QUERY_TYPE_UNION")
+    '("intersect" "GDA_QUERY_TYPE_INTERSECT")
+    '("except" "GDA_QUERY_TYPE_EXCEPT")
+    '("non-parsed-sql" "GDA_QUERY_TYPE_NON_PARSED_SQL")
+  )
+)
+
+(define-enum QueryError
+  (in-module "Gda")
+  (c-name "GdaQueryError")
+  (gtype-id "GDA_TYPE_QUERY_ERROR")
+  (values
+    '("xml-load-error" "GDA_QUERY_XML_LOAD_ERROR")
+    '("meta-data-update" "GDA_QUERY_META_DATA_UPDATE")
+    '("fields-error" "GDA_QUERY_FIELDS_ERROR")
+    '("targets-error" "GDA_QUERY_TARGETS_ERROR")
+    '("render-error" "GDA_QUERY_RENDER_ERROR")
+    '("parse-error" "GDA_QUERY_PARSE_ERROR")
+    '("syntax-error" "GDA_QUERY_SYNTAX_ERROR")
+    '("structure-error" "GDA_QUERY_STRUCTURE_ERROR")
+    '("sql-analyse-error" "GDA_QUERY_SQL_ANALYSE_ERROR")
+    '("no-cnc-error" "GDA_QUERY_NO_CNC_ERROR")
+    '("cnc-closed-error" "GDA_QUERY_CNC_CLOSED_ERROR")
+    '("exec-error" "GDA_QUERY_EXEC_ERROR")
+    '("param-type-error" "GDA_QUERY_PARAM_TYPE_ERROR")
   )
 )
 
@@ -979,42 +1016,6 @@
   )
 )
 
-(define-enum QueryType
-  (in-module "Gda")
-  (c-name "GdaQueryType")
-  (gtype-id "GDA_TYPE_QUERY_TYPE")
-  (values
-    '("select" "GDA_QUERY_TYPE_SELECT")
-    '("insert" "GDA_QUERY_TYPE_INSERT")
-    '("update" "GDA_QUERY_TYPE_UPDATE")
-    '("delete" "GDA_QUERY_TYPE_DELETE")
-    '("union" "GDA_QUERY_TYPE_UNION")
-    '("intersect" "GDA_QUERY_TYPE_INTERSECT")
-    '("except" "GDA_QUERY_TYPE_EXCEPT")
-    '("non-parsed-sql" "GDA_QUERY_TYPE_NON_PARSED_SQL")
-  )
-)
-
-(define-enum QueryError
-  (in-module "Gda")
-  (c-name "GdaQueryError")
-  (gtype-id "GDA_TYPE_QUERY_ERROR")
-  (values
-    '("xml-load-error" "GDA_QUERY_XML_LOAD_ERROR")
-    '("meta-data-update" "GDA_QUERY_META_DATA_UPDATE")
-    '("fields-error" "GDA_QUERY_FIELDS_ERROR")
-    '("targets-error" "GDA_QUERY_TARGETS_ERROR")
-    '("render-error" "GDA_QUERY_RENDER_ERROR")
-    '("parse-error" "GDA_QUERY_PARSE_ERROR")
-    '("syntax-error" "GDA_QUERY_SYNTAX_ERROR")
-    '("structure-error" "GDA_QUERY_STRUCTURE_ERROR")
-    '("sql-analyse-error" "GDA_QUERY_SQL_ANALYSE_ERROR")
-    '("no-cnc-error" "GDA_QUERY_NO_CNC_ERROR")
-    '("cnc-closed-error" "GDA_QUERY_CNC_CLOSED_ERROR")
-    '("exec-error" "GDA_QUERY_EXEC_ERROR")
-  )
-)
-
 (define-flags RendererOptions
   (in-module "Gda")
   (c-name "GdaRendererOptions")
@@ -1094,17 +1095,6 @@
   )
 )
 
-(define-enum GeneralError
-  (in-module "Gda")
-  (c-name "GdaGeneralError")
-  (gtype-id "GDA_TYPE_GENERAL_ERROR")
-  (values
-    '("object-name-error" "GDA_GENERAL_OBJECT_NAME_ERROR")
-    '("incorrect-value-error" "GDA_GENERAL_INCORRECT_VALUE_ERROR")
-    '("operation-error" "GDA_GENERAL_OPERATION_ERROR")
-  )
-)
-
 
 ;; From gda-blob-op.h
 
@@ -1353,154 +1343,64 @@
 
 
 
-;; From gda-column-index.h
+;; From gda-column.h
 
-(define-function gda_column_index_get_type
-  (c-name "gda_column_index_get_type")
+(define-function gda_column_get_type
+  (c-name "gda_column_get_type")
   (return-type "GType")
 )
 
-(define-function gda_column_index_new
-  (c-name "gda_column_index_new")
-  (is-constructor-of "GdaColumnIndex")
-  (return-type "GdaColumnIndex*")
+(define-function gda_column_new
+  (c-name "gda_column_new")
+  (is-constructor-of "GdaColumn")
+  (return-type "GdaColumn*")
 )
 
 (define-method copy
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_copy")
-  (return-type "GdaColumnIndex*")
-)
-
-(define-method equal
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_equal")
-  (return-type "gboolean")
-  (parameters
-    '("const-GdaColumnIndex*" "rhs")
-  )
+  (of-object "GdaColumn")
+  (c-name "gda_column_copy")
+  (return-type "GdaColumn*")
 )
 
-(define-method get_column_name
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_get_column_name")
+(define-method get_title
+  (of-object "GdaColumn")
+  (c-name "gda_column_get_title")
   (return-type "const-gchar*")
 )
 
-(define-method set_column_name
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_set_column_name")
+(define-method set_title
+  (of-object "GdaColumn")
+  (c-name "gda_column_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "column_name")
+    '("const-gchar*" "title")
   )
 )
 
 (define-method get_defined_size
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_get_defined_size")
+  (of-object "GdaColumn")
+  (c-name "gda_column_get_defined_size")
   (return-type "glong")
 )
 
 (define-method set_defined_size
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_set_defined_size")
+  (of-object "GdaColumn")
+  (c-name "gda_column_set_defined_size")
   (return-type "none")
   (parameters
     '("glong" "size")
   )
 )
 
-(define-method get_sorting
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_get_sorting")
-  (return-type "GdaSorting")
+(define-method get_name
+  (of-object "GdaColumn")
+  (c-name "gda_column_get_name")
+  (return-type "const-gchar*")
 )
 
-(define-method set_sorting
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_set_sorting")
-  (return-type "none")
-  (parameters
-    '("GdaSorting" "sorting")
-  )
-)
-
-(define-method get_references
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_get_references")
-  (return-type "const-gchar*")
-)
-
-(define-method set_references
-  (of-object "GdaColumnIndex")
-  (c-name "gda_column_index_set_references")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "ref")
-  )
-)
-
-
-
-;; From gda-column.h
-
-(define-function gda_column_get_type
-  (c-name "gda_column_get_type")
-  (return-type "GType")
-)
-
-(define-function gda_column_new
-  (c-name "gda_column_new")
-  (is-constructor-of "GdaColumn")
-  (return-type "GdaColumn*")
-)
-
-(define-method copy
-  (of-object "GdaColumn")
-  (c-name "gda_column_copy")
-  (return-type "GdaColumn*")
-)
-
-(define-method get_title
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_title")
-  (return-type "const-gchar*")
-)
-
-(define-method set_title
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_title")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "title")
-  )
-)
-
-(define-method get_defined_size
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_defined_size")
-  (return-type "glong")
-)
-
-(define-method set_defined_size
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_defined_size")
-  (return-type "none")
-  (parameters
-    '("glong" "size")
-  )
-)
-
-(define-method get_name
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_name
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_name")
+(define-method set_name
+  (of-object "GdaColumn")
+  (c-name "gda_column_set_name")
   (return-type "none")
   (parameters
     '("const-gchar*" "name")
@@ -1689,6 +1589,96 @@
 
 
 
+;; From gda-column-index.h
+
+(define-function gda_column_index_get_type
+  (c-name "gda_column_index_get_type")
+  (return-type "GType")
+)
+
+(define-function gda_column_index_new
+  (c-name "gda_column_index_new")
+  (is-constructor-of "GdaColumnIndex")
+  (return-type "GdaColumnIndex*")
+)
+
+(define-method copy
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_copy")
+  (return-type "GdaColumnIndex*")
+)
+
+(define-method equal
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_equal")
+  (return-type "gboolean")
+  (parameters
+    '("const-GdaColumnIndex*" "rhs")
+  )
+)
+
+(define-method get_column_name
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_get_column_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_column_name
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_set_column_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "column_name")
+  )
+)
+
+(define-method get_defined_size
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_get_defined_size")
+  (return-type "glong")
+)
+
+(define-method set_defined_size
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_set_defined_size")
+  (return-type "none")
+  (parameters
+    '("glong" "size")
+  )
+)
+
+(define-method get_sorting
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_get_sorting")
+  (return-type "GdaSorting")
+)
+
+(define-method set_sorting
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_set_sorting")
+  (return-type "none")
+  (parameters
+    '("GdaSorting" "sorting")
+  )
+)
+
+(define-method get_references
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_get_references")
+  (return-type "const-gchar*")
+)
+
+(define-method set_references
+  (of-object "GdaColumnIndex")
+  (c-name "gda_column_index_set_references")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "ref")
+  )
+)
+
+
+
 ;; From gda-command.h
 
 (define-function gda_command_get_type
@@ -1966,6 +1956,14 @@
   (return-type "GType")
 )
 
+(define-function gda_data_source_info_new
+  (c-name "gda_data_source_info_new")
+  (is-constructor-of "GdaDataSourceInfo")
+  (return-type "GdaDataSourceInfo*")
+  (parameters
+  )
+)
+
 (define-method copy
   (of-object "GdaDataSourceInfo")
   (c-name "gda_data_source_info_copy")
@@ -2510,6 +2508,96 @@
 
 
 
+;; From gda-connection-private.h
+
+(define-method internal_transaction_started
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_transaction_started")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "parent_trans")
+    '("const-gchar*" "trans_name")
+    '("GdaTransactionIsolation" "isol_level")
+  )
+)
+
+(define-method internal_transaction_rolledback
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_transaction_rolledback")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "trans_name")
+  )
+)
+
+(define-method internal_transaction_committed
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_transaction_committed")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "trans_name")
+  )
+)
+
+(define-method internal_sql_executed
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_sql_executed")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "sql")
+    '("GdaConnectionEvent*" "error")
+  )
+)
+
+(define-method internal_savepoint_added
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_savepoint_added")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "parent_trans")
+    '("const-gchar*" "svp_name")
+  )
+)
+
+(define-method internal_savepoint_rolledback
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_savepoint_rolledback")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "svp_name")
+  )
+)
+
+(define-method internal_savepoint_removed
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_savepoint_removed")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "svp_name")
+  )
+)
+
+(define-method internal_change_transaction_state
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_change_transaction_state")
+  (return-type "none")
+  (parameters
+    '("GdaTransactionStatusState" "newstate")
+  )
+)
+
+(define-method internal_treat_sql
+  (of-object "GdaConnection")
+  (c-name "gda_connection_internal_treat_sql")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "sql")
+    '("GdaConnectionEvent*" "error")
+  )
+)
+
+
+
 ;; From gda-data-access-wrapper.h
 
 (define-function gda_data_access_wrapper_get_type
@@ -2785,642 +2873,697 @@
 
 
 
-;; From gda-data-model-hash.h
+;; From gda-data-model.h
 
-(define-function gda_data_model_hash_get_type
-  (c-name "gda_data_model_hash_get_type")
+(define-function gda_data_model_get_type
+  (c-name "gda_data_model_get_type")
   (return-type "GType")
 )
 
-(define-function gda_data_model_hash_new
-  (c-name "gda_data_model_hash_new")
-  (is-constructor-of "GdaDataModelHash")
-  (return-type "GdaDataModel*")
-  (parameters
-    '("gint" "cols")
-  )
+(define-method is_updatable
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_is_updatable")
+  (return-type "gboolean")
 )
 
-(define-method clear
-  (of-object "GdaDataModelHash")
-  (c-name "gda_data_model_hash_clear")
-  (return-type "none")
+(define-method get_access_flags
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_access_flags")
+  (return-type "GdaDataModelAccessFlags")
 )
 
-(define-method set_n_columns
-  (of-object "GdaDataModelHash")
-  (c-name "gda_data_model_hash_set_n_columns")
-  (return-type "none")
-  (parameters
-    '("gint" "cols")
-  )
+(define-method get_n_rows
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_n_rows")
+  (return-type "gint")
 )
 
-(define-method insert_row
-  (of-object "GdaDataModelHash")
-  (c-name "gda_data_model_hash_insert_row")
-  (return-type "none")
-  (parameters
-    '("gint" "rownum")
-    '("GdaRow*" "row")
-  )
+(define-method get_n_columns
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_n_columns")
+  (return-type "gint")
 )
 
-
-
-;; From gda-data-model-import.h
-
-(define-function gda_data_model_import_get_type
-  (c-name "gda_data_model_import_get_type")
-  (return-type "GType")
+(define-method describe_column
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_describe_column")
+  (return-type "GdaColumn*")
+  (parameters
+    '("gint" "col")
+  )
 )
 
-(define-function gda_data_model_import_new_file
-  (c-name "gda_data_model_import_new_file")
-  (return-type "GdaDataModel*")
+(define-method get_column_index_by_name
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_column_index_by_name")
+  (return-type "gint")
   (parameters
-    '("const-gchar*" "filename")
-    '("gboolean" "random_access")
-    '("GdaParameterList*" "options")
+    '("const-gchar*" "name")
   )
 )
 
-(define-function gda_data_model_import_new_mem
-  (c-name "gda_data_model_import_new_mem")
-  (return-type "GdaDataModel*")
+(define-method get_column_title
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_column_title")
+  (return-type "const-gchar*")
   (parameters
-    '("const-gchar*" "data")
-    '("gboolean" "random_access")
-    '("GdaParameterList*" "options")
+    '("gint" "col")
   )
 )
 
-(define-function gda_data_model_import_new_xml_node
-  (c-name "gda_data_model_import_new_xml_node")
-  (return-type "GdaDataModel*")
+(define-method set_column_title
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_set_column_title")
+  (return-type "none")
   (parameters
-    '("xmlNodePtr" "node")
+    '("gint" "col")
+    '("const-gchar*" "title")
   )
 )
 
-(define-method get_errors
-  (of-object "GdaDataModelImport")
-  (c-name "gda_data_model_import_get_errors")
-  (return-type "GSList*")
+(define-method get_value_at
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_value_at")
+  (return-type "const-GValue*")
+  (parameters
+    '("gint" "col")
+    '("gint" "row")
+  )
 )
 
-(define-method clean_errors
-  (of-object "GdaDataModelImport")
-  (c-name "gda_data_model_import_clean_errors")
-  (return-type "none")
+(define-method get_value_at_col_name
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_value_at_col_name")
+  (return-type "const-GValue*")
+  (parameters
+    '("const-gchar*" "column_name")
+    '("gint" "row")
+  )
 )
 
-
-
-;; From gda-data-model-index.h
-
-(define-function gda_data_model_index_get_type
-  (c-name "gda_data_model_index_get_type")
-  (return-type "GType")
+(define-method get_attributes_at
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_attributes_at")
+  (return-type "GdaValueAttribute")
+  (parameters
+    '("gint" "col")
+    '("gint" "row")
+  )
 )
 
-(define-function gda_data_model_index_new
-  (c-name "gda_data_model_index_new")
-  (is-constructor-of "GdaDataModelIndex")
-  (return-type "GdaDataModelIndex*")
+(define-method create_iter
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_create_iter")
+  (return-type "GdaDataModelIter*")
 )
 
-(define-method copy
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_copy")
-  (return-type "GdaDataModelIndex*")
+(define-method freeze
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_freeze")
+  (return-type "none")
 )
 
-(define-method free
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_free")
+(define-method thaw
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_thaw")
   (return-type "none")
 )
 
-(define-method equal
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_equal")
+(define-method set_value_at
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_set_value_at")
   (return-type "gboolean")
   (parameters
-    '("const-GdaDataModelIndex*" "rhs")
+    '("gint" "col")
+    '("gint" "row")
+    '("const-GValue*" "value")
+    '("GError**" "error")
   )
 )
 
-(define-method get_name
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_name
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_name")
-  (return-type "none")
+(define-method set_values
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_set_values")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "name")
+    '("gint" "row")
+    '("GList*" "values")
+    '("GError**" "error")
   )
 )
 
-(define-method get_table_name
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_table_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_table_name
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_table_name")
-  (return-type "none")
+(define-method append_row
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_append_row")
+  (return-type "gint")
   (parameters
-    '("const-gchar*" "name")
+    '("GError**" "error")
   )
 )
 
-(define-method get_primary_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_primary_key")
-  (return-type "gboolean")
-)
-
-(define-method set_primary_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_primary_key")
-  (return-type "none")
+(define-method append_values
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_append_values")
+  (return-type "gint")
   (parameters
-    '("gboolean" "pk")
+    '("const-GList*" "values")
+    '("GError**" "error")
   )
 )
 
-(define-method get_unique_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_unique_key")
+(define-method remove_row
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_remove_row")
   (return-type "gboolean")
-)
-
-(define-method set_unique_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_unique_key")
-  (return-type "none")
   (parameters
-    '("gboolean" "uk")
+    '("gint" "row")
+    '("GError**" "error")
   )
 )
 
-(define-method get_references
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_references")
-  (return-type "const-gchar*")
-)
-
-(define-method set_references
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_references")
-  (return-type "none")
+(define-method get_row_from_values
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_get_row_from_values")
+  (return-type "gint")
   (parameters
-    '("const-gchar*" "ref")
+    '("GSList*" "values")
+    '("gint*" "cols_index")
   )
 )
 
-(define-method get_column_index_list
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_column_index_list")
-  (return-type "GList*")
-)
-
-(define-method set_column_index_list
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_column_index_list")
+(define-method send_hint
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_send_hint")
   (return-type "none")
   (parameters
-    '("GList*" "col_idx_list")
+    '("GdaDataModelHint" "hint")
+    '("const-GValue*" "hint_value")
   )
 )
 
-
-
-;; From gda-data-model-iter.h
-
-(define-function gda_data_model_iter_get_type
-  (c-name "gda_data_model_iter_get_type")
-  (return-type "GType")
-)
-
-(define-method iter_new
+(define-method export_to_string
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_iter_new")
-  (return-type "GdaDataModelIter*")
+  (c-name "gda_data_model_export_to_string")
+  (return-type "gchar*")
+  (parameters
+    '("GdaDataModelIOFormat" "format")
+    '("const-gint*" "cols")
+    '("gint" "nb_cols")
+    '("const-gint*" "rows")
+    '("gint" "nb_rows")
+    '("GdaParameterList*" "options")
+  )
 )
 
-(define-method set_at_row
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_set_at_row")
+(define-method export_to_file
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_export_to_file")
   (return-type "gboolean")
   (parameters
-    '("gint" "row")
+    '("GdaDataModelIOFormat" "format")
+    '("const-gchar*" "file")
+    '("const-gint*" "cols")
+    '("gint" "nb_cols")
+    '("const-gint*" "rows")
+    '("gint" "nb_rows")
+    '("GdaParameterList*" "options")
+    '("GError**" "error")
   )
 )
 
-(define-method move_next
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_move_next")
+(define-method import_from_model
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_import_from_model")
   (return-type "gboolean")
+  (parameters
+    '("GdaDataModel*" "from")
+    '("gboolean" "overwrite")
+    '("GHashTable*" "cols_trans")
+    '("GError**" "error")
+  )
 )
 
-(define-method move_prev
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_move_prev")
+(define-method import_from_string
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_import_from_string")
   (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "string")
+    '("GHashTable*" "cols_trans")
+    '("GdaParameterList*" "options")
+    '("GError**" "error")
+  )
 )
 
-(define-method get_row
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_get_row")
-  (return-type "gint")
-)
-
-(define-method can_be_moved
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_can_be_moved")
+(define-method import_from_file
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_import_from_file")
   (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "file")
+    '("GHashTable*" "cols_trans")
+    '("GdaParameterList*" "options")
+    '("GError**" "error")
+  )
 )
 
-(define-method invalidate_contents
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_invalidate_contents")
+(define-method dump
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_dump")
   (return-type "none")
-)
-
-(define-method is_valid
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_is_valid")
-  (return-type "gboolean")
-)
-
-(define-method get_column_for_param
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_get_column_for_param")
-  (return-type "gint")
   (parameters
-    '("GdaParameter*" "param")
+    '("FILE*" "to_stream")
   )
 )
 
-(define-method get_param_for_column
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_get_param_for_column")
-  (return-type "GdaParameter*")
-  (parameters
-    '("gint" "col")
-  )
+(define-method dump_as_string
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_dump_as_string")
+  (return-type "gchar*")
 )
 
 
 
-;; From gda-data-model-query.h
+;; From gda-data-model-hash.h
 
-(define-function gda_data_model_query_get_type
-  (c-name "gda_data_model_query_get_type")
+(define-function gda_data_model_hash_get_type
+  (c-name "gda_data_model_hash_get_type")
   (return-type "GType")
 )
 
-(define-function gda_data_model_query_new
-  (c-name "gda_data_model_query_new")
-  (is-constructor-of "GdaDataModelQuery")
+(define-function gda_data_model_hash_new
+  (c-name "gda_data_model_hash_new")
+  (is-constructor-of "GdaDataModelHash")
   (return-type "GdaDataModel*")
   (parameters
-    '("GdaQuery*" "query")
+    '("gint" "cols")
   )
 )
 
-(define-method get_parameter_list
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_get_parameter_list")
-  (return-type "GdaParameterList*")
-)
-
-(define-method refresh
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_refresh")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
+(define-method clear
+  (of-object "GdaDataModelHash")
+  (c-name "gda_data_model_hash_clear")
+  (return-type "none")
 )
 
-(define-method set_modification_query
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_set_modification_query")
-  (return-type "gboolean")
+(define-method set_n_columns
+  (of-object "GdaDataModelHash")
+  (c-name "gda_data_model_hash_set_n_columns")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "query")
-    '("GError**" "error")
+    '("gint" "cols")
   )
 )
 
-(define-method compute_modification_queries
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_compute_modification_queries")
-  (return-type "gboolean")
+(define-method insert_row
+  (of-object "GdaDataModelHash")
+  (c-name "gda_data_model_hash_insert_row")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "target")
-    '("GdaDataModelQueryOptions" "options")
-    '("GError**" "error")
+    '("gint" "rownum")
+    '("GdaRow*" "row")
   )
 )
 
 
 
-;; From gda-data-model-row.h
+;; From gda-data-model-import.h
 
-(define-function gda_data_model_row_get_type
-  (c-name "gda_data_model_row_get_type")
+(define-function gda_data_model_import_get_type
+  (c-name "gda_data_model_import_get_type")
   (return-type "GType")
 )
 
-(define-method get_row
-  (of-object "GdaDataModelRow")
-  (c-name "gda_data_model_row_get_row")
-  (return-type "GdaRow*")
+(define-function gda_data_model_import_new_file
+  (c-name "gda_data_model_import_new_file")
+  (return-type "GdaDataModel*")
   (parameters
-    '("gint" "row")
-    '("GError**" "error")
+    '("const-gchar*" "filename")
+    '("gboolean" "random_access")
+    '("GdaParameterList*" "options")
+  )
+)
+
+(define-function gda_data_model_import_new_mem
+  (c-name "gda_data_model_import_new_mem")
+  (return-type "GdaDataModel*")
+  (parameters
+    '("const-gchar*" "data")
+    '("gboolean" "random_access")
+    '("GdaParameterList*" "options")
+  )
+)
+
+(define-function gda_data_model_import_new_xml_node
+  (c-name "gda_data_model_import_new_xml_node")
+  (return-type "GdaDataModel*")
+  (parameters
+    '("xmlNodePtr" "node")
   )
 )
 
+(define-method get_errors
+  (of-object "GdaDataModelImport")
+  (c-name "gda_data_model_import_get_errors")
+  (return-type "GSList*")
+)
+
+(define-method clean_errors
+  (of-object "GdaDataModelImport")
+  (c-name "gda_data_model_import_clean_errors")
+  (return-type "none")
+)
 
 
-;; From gda-data-model.h
 
-(define-function gda_data_model_get_type
-  (c-name "gda_data_model_get_type")
-  (return-type "GType")
-)
+;; From gda-data-model-index.h
 
-(define-method is_updatable
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_is_updatable")
-  (return-type "gboolean")
+(define-function gda_data_model_index_get_type
+  (c-name "gda_data_model_index_get_type")
+  (return-type "GType")
 )
 
-(define-method get_access_flags
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_access_flags")
-  (return-type "GdaDataModelAccessFlags")
+(define-function gda_data_model_index_new
+  (c-name "gda_data_model_index_new")
+  (is-constructor-of "GdaDataModelIndex")
+  (return-type "GdaDataModelIndex*")
 )
 
-(define-method get_n_rows
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_n_rows")
-  (return-type "gint")
+(define-method copy
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_copy")
+  (return-type "GdaDataModelIndex*")
 )
 
-(define-method get_n_columns
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_n_columns")
-  (return-type "gint")
+(define-method free
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_free")
+  (return-type "none")
 )
 
-(define-method describe_column
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_describe_column")
-  (return-type "GdaColumn*")
+(define-method equal
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_equal")
+  (return-type "gboolean")
   (parameters
-    '("gint" "col")
+    '("const-GdaDataModelIndex*" "rhs")
   )
 )
 
-(define-method get_column_index_by_name
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_column_index_by_name")
-  (return-type "gint")
+(define-method get_name
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_name
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_set_name")
+  (return-type "none")
   (parameters
     '("const-gchar*" "name")
   )
 )
 
-(define-method get_column_title
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_column_title")
+(define-method get_table_name
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_get_table_name")
   (return-type "const-gchar*")
-  (parameters
-    '("gint" "col")
-  )
 )
 
-(define-method set_column_title
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_set_column_title")
+(define-method set_table_name
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_set_table_name")
   (return-type "none")
   (parameters
-    '("gint" "col")
-    '("const-gchar*" "title")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_value_at
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_value_at")
-  (return-type "const-GValue*")
+(define-method get_primary_key
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_get_primary_key")
+  (return-type "gboolean")
+)
+
+(define-method set_primary_key
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_set_primary_key")
+  (return-type "none")
   (parameters
-    '("gint" "col")
-    '("gint" "row")
+    '("gboolean" "pk")
   )
 )
 
-(define-method get_value_at_col_name
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_value_at_col_name")
-  (return-type "const-GValue*")
+(define-method get_unique_key
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_get_unique_key")
+  (return-type "gboolean")
+)
+
+(define-method set_unique_key
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_set_unique_key")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "column_name")
-    '("gint" "row")
+    '("gboolean" "uk")
   )
 )
 
-(define-method get_attributes_at
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_attributes_at")
-  (return-type "GdaValueAttribute")
+(define-method get_references
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_get_references")
+  (return-type "const-gchar*")
+)
+
+(define-method set_references
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_set_references")
+  (return-type "none")
   (parameters
-    '("gint" "col")
-    '("gint" "row")
+    '("const-gchar*" "ref")
   )
 )
 
-(define-method create_iter
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_create_iter")
-  (return-type "GdaDataModelIter*")
+(define-method get_column_index_list
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_get_column_index_list")
+  (return-type "GList*")
 )
 
-(define-method freeze
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_freeze")
+(define-method set_column_index_list
+  (of-object "GdaDataModelIndex")
+  (c-name "gda_data_model_index_set_column_index_list")
   (return-type "none")
+  (parameters
+    '("GList*" "col_idx_list")
+  )
 )
 
-(define-method thaw
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_thaw")
-  (return-type "none")
+
+
+;; From gda-data-model-iter.h
+
+(define-function gda_data_model_iter_get_type
+  (c-name "gda_data_model_iter_get_type")
+  (return-type "GType")
 )
 
-(define-method set_value_at
+(define-method iter_new
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_set_value_at")
+  (c-name "gda_data_model_iter_new")
+  (return-type "GdaDataModelIter*")
+)
+
+(define-method set_at_row
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_set_at_row")
   (return-type "gboolean")
   (parameters
-    '("gint" "col")
     '("gint" "row")
-    '("const-GValue*" "value")
-    '("GError**" "error")
   )
 )
 
-(define-method set_values
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_set_values")
+(define-method move_next
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_move_next")
   (return-type "gboolean")
-  (parameters
-    '("gint" "row")
-    '("GList*" "values")
-    '("GError**" "error")
-  )
 )
 
-(define-method append_row
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_append_row")
-  (return-type "gint")
-  (parameters
-    '("GError**" "error")
-  )
+(define-method move_prev
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_move_prev")
+  (return-type "gboolean")
 )
 
-(define-method append_values
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_append_values")
+(define-method get_row
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_get_row")
   (return-type "gint")
-  (parameters
-    '("const-GList*" "values")
-    '("GError**" "error")
-  )
 )
 
-(define-method remove_row
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_remove_row")
+(define-method can_be_moved
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_can_be_moved")
   (return-type "gboolean")
-  (parameters
-    '("gint" "row")
-    '("GError**" "error")
-  )
 )
 
-(define-method get_row_from_values
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_row_from_values")
+(define-method invalidate_contents
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_invalidate_contents")
+  (return-type "none")
+)
+
+(define-method is_valid
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_is_valid")
+  (return-type "gboolean")
+)
+
+(define-method get_column_for_param
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_get_column_for_param")
   (return-type "gint")
   (parameters
-    '("GSList*" "values")
-    '("gint*" "cols_index")
+    '("GdaParameter*" "param")
   )
 )
 
-(define-method send_hint
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_send_hint")
-  (return-type "none")
+(define-method get_param_for_column
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_get_param_for_column")
+  (return-type "GdaParameter*")
   (parameters
-    '("GdaDataModelHint" "hint")
-    '("const-GValue*" "hint_value")
+    '("gint" "col")
   )
 )
 
-(define-method export_to_string
+
+
+;; From gda-data-model-private.h
+
+(define-method to_xml_node
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_export_to_string")
-  (return-type "gchar*")
+  (c-name "gda_data_model_to_xml_node")
+  (return-type "xmlNodePtr")
   (parameters
-    '("GdaDataModelIOFormat" "format")
     '("const-gint*" "cols")
     '("gint" "nb_cols")
     '("const-gint*" "rows")
     '("gint" "nb_rows")
-    '("GdaParameterList*" "options")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method export_to_file
+(define-method add_data_from_xml_node
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_export_to_file")
+  (c-name "gda_data_model_add_data_from_xml_node")
   (return-type "gboolean")
   (parameters
-    '("GdaDataModelIOFormat" "format")
-    '("const-gchar*" "file")
-    '("const-gint*" "cols")
-    '("gint" "nb_cols")
-    '("const-gint*" "rows")
-    '("gint" "nb_rows")
-    '("GdaParameterList*" "options")
+    '("xmlNodePtr" "node")
     '("GError**" "error")
   )
 )
 
-(define-method import_from_model
+(define-method move_iter_at_row
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_import_from_model")
+  (c-name "gda_data_model_move_iter_at_row")
   (return-type "gboolean")
   (parameters
-    '("GdaDataModel*" "from")
-    '("gboolean" "overwrite")
-    '("GHashTable*" "cols_trans")
-    '("GError**" "error")
+    '("GdaDataModelIter*" "iter")
+    '("gint" "row")
   )
 )
 
-(define-method import_from_string
+(define-method move_iter_next
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_import_from_string")
+  (c-name "gda_data_model_move_iter_next")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "string")
-    '("GHashTable*" "cols_trans")
-    '("GdaParameterList*" "options")
-    '("GError**" "error")
+    '("GdaDataModelIter*" "iter")
   )
 )
 
-(define-method import_from_file
+(define-method move_iter_prev
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_import_from_file")
+  (c-name "gda_data_model_move_iter_prev")
+  (return-type "gboolean")
+  (parameters
+    '("GdaDataModelIter*" "iter")
+  )
+)
+
+
+
+;; From gda-data-model-query.h
+
+(define-function gda_data_model_query_get_type
+  (c-name "gda_data_model_query_get_type")
+  (return-type "GType")
+)
+
+(define-function gda_data_model_query_new
+  (c-name "gda_data_model_query_new")
+  (is-constructor-of "GdaDataModelQuery")
+  (return-type "GdaDataModel*")
+  (parameters
+    '("GdaQuery*" "query")
+  )
+)
+
+(define-method get_parameter_list
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_get_parameter_list")
+  (return-type "GdaParameterList*")
+)
+
+(define-method refresh
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_refresh")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "file")
-    '("GHashTable*" "cols_trans")
-    '("GdaParameterList*" "options")
     '("GError**" "error")
   )
 )
 
-(define-method dump
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_dump")
-  (return-type "none")
+(define-method set_modification_query
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_set_modification_query")
+  (return-type "gboolean")
   (parameters
-    '("FILE*" "to_stream")
+    '("const-gchar*" "query")
+    '("GError**" "error")
   )
 )
 
-(define-method dump_as_string
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_dump_as_string")
-  (return-type "gchar*")
+(define-method compute_modification_queries
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_compute_modification_queries")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "target")
+    '("GdaDataModelQueryOptions" "options")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gda-data-model-row.h
+
+(define-function gda_data_model_row_get_type
+  (c-name "gda_data_model_row_get_type")
+  (return-type "GType")
+)
+
+(define-method get_row
+  (of-object "GdaDataModelRow")
+  (c-name "gda_data_model_row_get_row")
+  (return-type "GdaRow*")
+  (parameters
+    '("gint" "row")
+    '("GError**" "error")
+  )
 )
 
 
@@ -4101,167 +4244,45 @@
   )
 )
 
-(define-method get_attributes
-  (of-object "GdaDictField")
-  (c-name "gda_dict_field_get_attributes")
-  (return-type "GdaDictFieldAttribute")
-)
-
-
-
-;; From gda-dict-function.h
-
-(define-function gda_dict_function_get_type
-  (c-name "gda_dict_function_get_type")
-  (return-type "GType")
-)
-
-(define-method function_new
-  (of-object "GdaDict")
-  (c-name "gda_dict_function_new")
-  (return-type "GObject*")
-)
-
-(define-method set_dbms_id
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_set_dbms_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "id")
-  )
-)
-
-(define-method get_dbms_id
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_get_dbms_id")
-  (return-type "gchar*")
-)
-
-(define-method set_sqlname
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_set_sqlname")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "sqlname")
-  )
-)
-
-(define-method get_sqlname
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_get_sqlname")
-  (return-type "const-gchar*")
-)
-
-(define-method set_arg_dict_types
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_set_arg_dict_types")
-  (return-type "none")
-  (parameters
-    '("const-GSList*" "arg_types")
-  )
-)
-
-(define-method get_arg_dict_types
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_get_arg_dict_types")
-  (return-type "const-GSList*")
-)
-
-(define-method set_ret_dict_type
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_set_ret_dict_type")
-  (return-type "none")
-  (parameters
-    '("GdaDictType*" "dt")
-  )
-)
-
-(define-method get_ret_dict_type
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_get_ret_dict_type")
-  (return-type "GdaDictType*")
-)
-
-(define-method accepts_arg_dict_types
-  (of-object "GdaDictFunction")
-  (c-name "gda_dict_function_accepts_arg_dict_types")
-  (return-type "gboolean")
-  (parameters
-    '("const-GSList*" "arg_types")
-  )
-)
-
-
-;; From gda-dict-table.h
-
-(define-function gda_dict_table_get_type
-  (c-name "gda_dict_table_get_type")
-  (return-type "GType")
-)
-
-(define-method table_new
-  (of-object "GdaDict")
-  (c-name "gda_dict_table_new")
-  (return-type "GObject*")
-)
-
-(define-method get_database
-  (of-object "GdaDictTable")
-  (c-name "gda_dict_table_get_database")
-  (return-type "GdaDictDatabase*")
-)
-
-(define-method is_view
-  (of-object "GdaDictTable")
-  (c-name "gda_dict_table_is_view")
-  (return-type "gboolean")
-)
-
-(define-method get_parents
-  (of-object "GdaDictTable")
-  (c-name "gda_dict_table_get_parents")
-  (return-type "const-GSList*")
-)
-
-(define-method get_constraints
-  (of-object "GdaDictTable")
-  (c-name "gda_dict_table_get_constraints")
-  (return-type "GSList*")
-)
-
-(define-method get_pk_constraint
-  (of-object "GdaDictTable")
-  (c-name "gda_dict_table_get_pk_constraint")
-  (return-type "GdaDictConstraint*")
-)
-
-(define-method update_dbms_data
-  (of-object "GdaDictTable")
-  (c-name "gda_dict_table_update_dbms_data")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
-)
-
+(define-method get_attributes
+  (of-object "GdaDictField")
+  (c-name "gda_dict_field_get_attributes")
+  (return-type "GdaDictFieldAttribute")
+)
 
 
-;; From gda-dict-type.h
 
-(define-function gda_dict_type_get_type
-  (c-name "gda_dict_type_get_type")
+;; From gda-dict-function.h
+
+(define-function gda_dict_function_get_type
+  (c-name "gda_dict_function_get_type")
   (return-type "GType")
 )
 
-(define-method type_new
+(define-method function_new
   (of-object "GdaDict")
-  (c-name "gda_dict_type_new")
-  (return-type "GdaDictType*")
+  (c-name "gda_dict_function_new")
+  (return-type "GObject*")
+)
+
+(define-method set_dbms_id
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_set_dbms_id")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "id")
+  )
+)
+
+(define-method get_dbms_id
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_get_dbms_id")
+  (return-type "gchar*")
 )
 
 (define-method set_sqlname
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_set_sqlname")
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_set_sqlname")
   (return-type "none")
   (parameters
     '("const-gchar*" "sqlname")
@@ -4269,45 +4290,48 @@
 )
 
 (define-method get_sqlname
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_get_sqlname")
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_get_sqlname")
   (return-type "const-gchar*")
 )
 
-(define-method set_g_type
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_set_g_type")
+(define-method set_arg_dict_types
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_set_arg_dict_types")
   (return-type "none")
   (parameters
-    '("GType" "g_type")
+    '("const-GSList*" "arg_types")
   )
 )
 
-(define-method get_g_type
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_get_g_type")
-  (return-type "GType")
+(define-method get_arg_dict_types
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_get_arg_dict_types")
+  (return-type "const-GSList*")
 )
 
-(define-method add_synonym
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_add_synonym")
+(define-method set_ret_dict_type
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_set_ret_dict_type")
   (return-type "none")
   (parameters
-    '("const-gchar*" "synonym")
+    '("GdaDictType*" "dt")
   )
 )
 
-(define-method get_synonyms
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_get_synonyms")
-  (return-type "const-GSList*")
+(define-method get_ret_dict_type
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_get_ret_dict_type")
+  (return-type "GdaDictType*")
 )
 
-(define-method clear_synonyms
-  (of-object "GdaDictType")
-  (c-name "gda_dict_type_clear_synonyms")
-  (return-type "none")
+(define-method accepts_arg_dict_types
+  (of-object "GdaDictFunction")
+  (c-name "gda_dict_function_accepts_arg_dict_types")
+  (return-type "gboolean")
+  (parameters
+    '("const-GSList*" "arg_types")
+  )
 )
 
 
@@ -4452,112 +4476,401 @@
   )
 )
 
-(define-method get_handler
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_handler")
-  (return-type "GdaDataHandler*")
+(define-method get_handler
+  (of-object "GdaDict")
+  (c-name "gda_dict_get_handler")
+  (return-type "GdaDataHandler*")
+  (parameters
+    '("GType" "for_type")
+  )
+)
+
+(define-method get_default_handler
+  (of-object "GdaDict")
+  (c-name "gda_dict_get_default_handler")
+  (return-type "GdaDataHandler*")
+  (parameters
+    '("GType" "for_type")
+  )
+)
+
+(define-method declare_object
+  (of-object "GdaDict")
+  (c-name "gda_dict_declare_object")
+  (return-type "none")
+  (parameters
+    '("GdaObject*" "object")
+  )
+)
+
+(define-method declare_object_as
+  (of-object "GdaDict")
+  (c-name "gda_dict_declare_object_as")
+  (return-type "none")
+  (parameters
+    '("GdaObject*" "object")
+    '("GType" "as_type")
+  )
+)
+
+(define-method assume_object
+  (of-object "GdaDict")
+  (c-name "gda_dict_assume_object")
+  (return-type "none")
+  (parameters
+    '("GdaObject*" "object")
+  )
+)
+
+(define-method assume_object_as
+  (of-object "GdaDict")
+  (c-name "gda_dict_assume_object_as")
+  (return-type "none")
+  (parameters
+    '("GdaObject*" "object")
+    '("GType" "as_type")
+  )
+)
+
+(define-method unassume_object
+  (of-object "GdaDict")
+  (c-name "gda_dict_unassume_object")
+  (return-type "none")
+  (parameters
+    '("GdaObject*" "object")
+  )
+)
+
+(define-method object_is_assumed
+  (of-object "GdaDict")
+  (c-name "gda_dict_object_is_assumed")
+  (return-type "gboolean")
+  (parameters
+    '("GdaObject*" "object")
+  )
+)
+
+(define-method get_objects
+  (of-object "GdaDict")
+  (c-name "gda_dict_get_objects")
+  (return-type "GSList*")
+  (parameters
+    '("GType" "type")
+  )
+)
+
+(define-method get_object_by_name
+  (of-object "GdaDict")
+  (c-name "gda_dict_get_object_by_name")
+  (return-type "GdaObject*")
+  (parameters
+    '("GType" "type")
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_object_by_xml_id
+  (of-object "GdaDict")
+  (c-name "gda_dict_get_object_by_xml_id")
+  (return-type "GdaObject*")
+  (parameters
+    '("GType" "type")
+    '("const-gchar*" "xml_id")
+  )
+)
+
+(define-method dump
+  (of-object "GdaDict")
+  (c-name "gda_dict_dump")
+  (return-type "none")
+)
+
+
+
+;; From gda-dict-private.h
+
+(define-function gda_dict_class_always_register
+  (c-name "gda_dict_class_always_register")
+  (return-type "none")
+  (parameters
+    '("GdaDictRegFunc" "func")
+  )
+)
+
+(define-method register_object_type
+  (of-object "GdaDict")
+  (c-name "gda_dict_register_object_type")
+  (return-type "none")
+  (parameters
+    '("GdaDictRegisterStruct*" "reg")
+  )
+)
+
+(define-method get_object_type_registration
+  (of-object "GdaDict")
+  (c-name "gda_dict_get_object_type_registration")
+  (return-type "GdaDictRegisterStruct*")
+  (parameters
+    '("GType" "type")
+  )
+)
+
+
+
+;; From gda-dict-reg-aggregates.h
+
+(define-function gda_aggregates_get_register
+  (c-name "gda_aggregates_get_register")
+  (return-type "GdaDictRegisterStruct*")
+  (parameters
+  )
+)
+
+(define-function gda_aggregates_get_by_name
+  (c-name "gda_aggregates_get_by_name")
+  (return-type "GSList*")
+  (parameters
+    '("GdaDict*" "dict")
+    '("const-gchar*" "aggname")
+  )
+)
+
+(define-function gda_aggregates_get_by_name_arg
+  (c-name "gda_aggregates_get_by_name_arg")
+  (return-type "GdaDictAggregate*")
+  (parameters
+    '("GdaDict*" "dict")
+    '("const-gchar*" "aggname")
+    '("GdaDictType*" "argtype")
+  )
+)
+
+(define-function gda_aggregates_get_by_name_arg_in_list
+  (c-name "gda_aggregates_get_by_name_arg_in_list")
+  (return-type "GdaDictAggregate*")
+  (parameters
+    '("GdaDict*" "dict")
+    '("GSList*" "aggregates")
+    '("const-gchar*" "aggname")
+    '("GdaDictType*" "argtype")
+  )
+)
+
+(define-function gda_aggregates_get_by_dbms_id
+  (c-name "gda_aggregates_get_by_dbms_id")
+  (return-type "GdaDictAggregate*")
+  (parameters
+    '("GdaDict*" "dict")
+    '("const-gchar*" "dbms_id")
+  )
+)
+
+
+
+;; From gda-dict-reg-functions.h
+
+(define-function gda_functions_get_register
+  (c-name "gda_functions_get_register")
+  (return-type "GdaDictRegisterStruct*")
+  (parameters
+  )
+)
+
+(define-function gda_functions_get_by_name
+  (c-name "gda_functions_get_by_name")
+  (return-type "GSList*")
+  (parameters
+    '("GdaDict*" "dict")
+    '("const-gchar*" "aggname")
+  )
+)
+
+(define-function gda_functions_get_by_name_arg
+  (c-name "gda_functions_get_by_name_arg")
+  (return-type "GdaDictFunction*")
   (parameters
-    '("GType" "for_type")
+    '("GdaDict*" "dict")
+    '("const-gchar*" "aggname")
+    '("const-GSList*" "argtypes")
   )
 )
 
-(define-method get_default_handler
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_default_handler")
-  (return-type "GdaDataHandler*")
+(define-function gda_functions_get_by_name_arg_in_list
+  (c-name "gda_functions_get_by_name_arg_in_list")
+  (return-type "GdaDictFunction*")
   (parameters
-    '("GType" "for_type")
+    '("GdaDict*" "dict")
+    '("GSList*" "functions")
+    '("const-gchar*" "aggname")
+    '("const-GSList*" "argtypes")
   )
 )
 
-(define-method declare_object
-  (of-object "GdaDict")
-  (c-name "gda_dict_declare_object")
-  (return-type "none")
+(define-function gda_functions_get_by_dbms_id
+  (c-name "gda_functions_get_by_dbms_id")
+  (return-type "GdaDictFunction*")
   (parameters
-    '("GdaObject*" "object")
+    '("GdaDict*" "dict")
+    '("const-gchar*" "dbms_id")
   )
 )
 
-(define-method declare_object_as
-  (of-object "GdaDict")
-  (c-name "gda_dict_declare_object_as")
-  (return-type "none")
+
+
+;; From gda-dict-reg-queries.h
+
+(define-function gda_queries_get_register
+  (c-name "gda_queries_get_register")
+  (return-type "GdaDictRegisterStruct*")
   (parameters
-    '("GdaObject*" "object")
-    '("GType" "as_type")
   )
 )
 
-(define-method assume_object
-  (of-object "GdaDict")
-  (c-name "gda_dict_assume_object")
-  (return-type "none")
+(define-function gda_queries_get_serial
+  (c-name "gda_queries_get_serial")
+  (return-type "guint")
   (parameters
-    '("GdaObject*" "object")
+    '("GdaDictRegisterStruct*" "reg")
   )
 )
 
-(define-method assume_object_as
-  (of-object "GdaDict")
-  (c-name "gda_dict_assume_object_as")
+(define-function gda_queries_declare_serial
+  (c-name "gda_queries_declare_serial")
   (return-type "none")
   (parameters
-    '("GdaObject*" "object")
-    '("GType" "as_type")
+    '("GdaDictRegisterStruct*" "reg")
+    '("guint" "id")
   )
 )
 
-(define-method unassume_object
-  (of-object "GdaDict")
-  (c-name "gda_dict_unassume_object")
-  (return-type "none")
+
+
+;; From gda-dict-reg-types.h
+
+(define-function g_types_get_register
+  (c-name "g_types_get_register")
+  (return-type "GdaDictRegisterStruct*")
   (parameters
-    '("GdaObject*" "object")
   )
 )
 
-(define-method object_is_assumed
+
+
+;; From gda-dict-table.h
+
+(define-function gda_dict_table_get_type
+  (c-name "gda_dict_table_get_type")
+  (return-type "GType")
+)
+
+(define-method table_new
   (of-object "GdaDict")
-  (c-name "gda_dict_object_is_assumed")
+  (c-name "gda_dict_table_new")
+  (return-type "GObject*")
+)
+
+(define-method get_database
+  (of-object "GdaDictTable")
+  (c-name "gda_dict_table_get_database")
+  (return-type "GdaDictDatabase*")
+)
+
+(define-method is_view
+  (of-object "GdaDictTable")
+  (c-name "gda_dict_table_is_view")
+  (return-type "gboolean")
+)
+
+(define-method get_parents
+  (of-object "GdaDictTable")
+  (c-name "gda_dict_table_get_parents")
+  (return-type "const-GSList*")
+)
+
+(define-method get_constraints
+  (of-object "GdaDictTable")
+  (c-name "gda_dict_table_get_constraints")
+  (return-type "GSList*")
+)
+
+(define-method get_pk_constraint
+  (of-object "GdaDictTable")
+  (c-name "gda_dict_table_get_pk_constraint")
+  (return-type "GdaDictConstraint*")
+)
+
+(define-method update_dbms_data
+  (of-object "GdaDictTable")
+  (c-name "gda_dict_table_update_dbms_data")
   (return-type "gboolean")
   (parameters
-    '("GdaObject*" "object")
+    '("GError**" "error")
   )
 )
 
-(define-method get_objects
+
+
+;; From gda-dict-type.h
+
+(define-function gda_dict_type_get_type
+  (c-name "gda_dict_type_get_type")
+  (return-type "GType")
+)
+
+(define-method type_new
   (of-object "GdaDict")
-  (c-name "gda_dict_get_objects")
-  (return-type "GSList*")
+  (c-name "gda_dict_type_new")
+  (return-type "GdaDictType*")
+)
+
+(define-method set_sqlname
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_set_sqlname")
+  (return-type "none")
   (parameters
-    '("GType" "type")
+    '("const-gchar*" "sqlname")
   )
 )
 
-(define-method get_object_by_name
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_object_by_name")
-  (return-type "GdaObject*")
+(define-method get_sqlname
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_get_sqlname")
+  (return-type "const-gchar*")
+)
+
+(define-method set_g_type
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_set_g_type")
+  (return-type "none")
   (parameters
-    '("GType" "type")
-    '("const-gchar*" "name")
+    '("GType" "g_type")
   )
 )
 
-(define-method get_object_by_xml_id
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_object_by_xml_id")
-  (return-type "GdaObject*")
+(define-method get_g_type
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_get_g_type")
+  (return-type "GType")
+)
+
+(define-method add_synonym
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_add_synonym")
+  (return-type "none")
   (parameters
-    '("GType" "type")
-    '("const-gchar*" "xml_id")
+    '("const-gchar*" "synonym")
   )
 )
 
-(define-method dump
-  (of-object "GdaDict")
-  (c-name "gda_dict_dump")
+(define-method get_synonyms
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_get_synonyms")
+  (return-type "const-GSList*")
+)
+
+(define-method clear_synonyms
+  (of-object "GdaDictType")
+  (c-name "gda_dict_type_clear_synonyms")
   (return-type "none")
 )
 
@@ -4721,6 +5034,10 @@
 
 
 
+;; From gda-enums.h
+
+
+
 ;; From gda-enum-types.h
 
 (define-function gda_client_event_get_type
@@ -5018,87 +5335,212 @@
   (return-type "GType")
 )
 
+(define-function gda_general_create_table_flag_get_type
+  (c-name "gda_general_create_table_flag_get_type")
+  (return-type "GType")
+)
 
 
-;; From gda-enums.h
 
+;; From gda-graphviz.h
 
+(define-function gda_graphviz_get_type
+  (c-name "gda_graphviz_get_type")
+  (return-type "GType")
+)
 
-;; From gda-graphviz.h
+(define-function gda_graphviz_new
+  (c-name "gda_graphviz_new")
+  (is-constructor-of "GdaGraphviz")
+  (return-type "GObject*")
+  (parameters
+    '("GdaDict*" "dict")
+  )
+)
+
+(define-method add_to_graph
+  (of-object "GdaGraphviz")
+  (c-name "gda_graphviz_add_to_graph")
+  (return-type "none")
+  (parameters
+    '("GObject*" "obj")
+  )
+)
+
+(define-method save_file
+  (of-object "GdaGraphviz")
+  (c-name "gda_graphviz_save_file")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "filename")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gda-log.h
+
+(define-function gda_log_enable
+  (c-name "gda_log_enable")
+  (return-type "none")
+)
+
+(define-function gda_log_disable
+  (c-name "gda_log_disable")
+  (return-type "none")
+)
+
+(define-function gda_log_is_enabled
+  (c-name "gda_log_is_enabled")
+  (return-type "gboolean")
+)
+
+(define-function gda_log_message
+  (c-name "gda_log_message")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format")
+  )
+  (varargs #t)
+)
+
+(define-function gda_log_error
+  (c-name "gda_log_error")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format")
+  )
+  (varargs #t)
+)
+
+
+
+;; From gda-marshal.h
+
+
+
+;; From gda-object.h
 
-(define-function gda_graphviz_get_type
-  (c-name "gda_graphviz_get_type")
+(define-function gda_object_get_type
+  (c-name "gda_object_get_type")
   (return-type "GType")
 )
 
-(define-function gda_graphviz_new
-  (c-name "gda_graphviz_new")
-  (is-constructor-of "GdaGraphviz")
-  (return-type "GObject*")
+(define-method get_dict
+  (of-object "GdaObject")
+  (c-name "gda_object_get_dict")
+  (return-type "GdaDict*")
+)
+
+(define-method set_id
+  (of-object "GdaObject")
+  (c-name "gda_object_set_id")
+  (return-type "none")
   (parameters
-    '("GdaDict*" "dict")
+    '("const-gchar*" "strid")
   )
 )
 
-(define-method add_to_graph
-  (of-object "GdaGraphviz")
-  (c-name "gda_graphviz_add_to_graph")
+(define-method set_name
+  (of-object "GdaObject")
+  (c-name "gda_object_set_name")
   (return-type "none")
   (parameters
-    '("GObject*" "obj")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method save_file
-  (of-object "GdaGraphviz")
-  (c-name "gda_graphviz_save_file")
-  (return-type "gboolean")
+(define-method set_description
+  (of-object "GdaObject")
+  (c-name "gda_object_set_description")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("const-gchar*" "descr")
   )
 )
 
+(define-method set_owner
+  (of-object "GdaObject")
+  (c-name "gda_object_set_owner")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "owner")
+  )
+)
 
+(define-method get_id
+  (of-object "GdaObject")
+  (c-name "gda_object_get_id")
+  (return-type "const-gchar*")
+)
 
-;; From gda-log.h
+(define-method get_name
+  (of-object "GdaObject")
+  (c-name "gda_object_get_name")
+  (return-type "const-gchar*")
+)
 
-(define-function gda_log_enable
-  (c-name "gda_log_enable")
-  (return-type "none")
+(define-method get_description
+  (of-object "GdaObject")
+  (c-name "gda_object_get_description")
+  (return-type "const-gchar*")
 )
 
-(define-function gda_log_disable
-  (c-name "gda_log_disable")
-  (return-type "none")
+(define-method get_owner
+  (of-object "GdaObject")
+  (c-name "gda_object_get_owner")
+  (return-type "const-gchar*")
 )
 
-(define-function gda_log_is_enabled
-  (c-name "gda_log_is_enabled")
-  (return-type "gboolean")
+(define-method destroy
+  (of-object "GdaObject")
+  (c-name "gda_object_destroy")
+  (return-type "none")
 )
 
-(define-function gda_log_message
-  (c-name "gda_log_message")
+(define-method destroy_check
+  (of-object "GdaObject")
+  (c-name "gda_object_destroy_check")
   (return-type "none")
+)
+
+(define-function gda_object_connect_destroy
+  (c-name "gda_object_connect_destroy")
+  (return-type "gulong")
   (parameters
-    '("const-gchar*" "format")
+    '("gpointer" "gdaobj")
+    '("GCallback" "callback")
+    '("gpointer" "data")
   )
-  (varargs #t)
 )
 
-(define-function gda_log_error
-  (c-name "gda_log_error")
+(define-method signal_emit_changed
+  (of-object "GdaObject")
+  (c-name "gda_object_signal_emit_changed")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "format")
-  )
-  (varargs #t)
 )
 
+(define-method block_changed
+  (of-object "GdaObject")
+  (c-name "gda_object_block_changed")
+  (return-type "none")
+)
 
+(define-method unblock_changed
+  (of-object "GdaObject")
+  (c-name "gda_object_unblock_changed")
+  (return-type "none")
+)
 
-;; From gda-marshal.h
+(define-method dump
+  (of-object "GdaObject")
+  (c-name "gda_object_dump")
+  (return-type "none")
+  (parameters
+    '("guint" "offset")
+  )
+)
 
 
 
@@ -5219,128 +5661,175 @@
 
 
 
-;; From gda-object.h
+;; From gda-parameter.h
 
-(define-function gda_object_get_type
-  (c-name "gda_object_get_type")
+(define-function gda_parameter_get_type
+  (c-name "gda_parameter_get_type")
   (return-type "GType")
 )
 
-(define-method get_dict
-  (of-object "GdaObject")
-  (c-name "gda_object_get_dict")
-  (return-type "GdaDict*")
+(define-function gda_parameter_new
+  (c-name "gda_parameter_new")
+  (is-constructor-of "GdaParameter")
+  (return-type "GdaParameter*")
+  (parameters
+    '("GType" "type")
+  )
 )
 
-(define-method set_id
-  (of-object "GdaObject")
-  (c-name "gda_object_set_id")
-  (return-type "none")
+(define-method new_copy
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_new_copy")
+  (return-type "GdaParameter*")
+)
+
+(define-method get_g_type
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_g_type")
+  (return-type "GType")
+)
+
+(define-function gda_parameter_new_string
+  (c-name "gda_parameter_new_string")
+  (return-type "GdaParameter*")
   (parameters
-    '("const-gchar*" "strid")
+    '("const-gchar*" "name")
+    '("const-gchar*" "str")
   )
 )
 
-(define-method set_name
-  (of-object "GdaObject")
-  (c-name "gda_object_set_name")
-  (return-type "none")
+(define-function gda_parameter_new_boolean
+  (c-name "gda_parameter_new_boolean")
+  (return-type "GdaParameter*")
   (parameters
     '("const-gchar*" "name")
+    '("gboolean" "value")
   )
 )
 
-(define-method set_description
-  (of-object "GdaObject")
-  (c-name "gda_object_set_description")
+(define-method get_value
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_value")
+  (return-type "const-GValue*")
+)
+
+(define-method get_value_str
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_value_str")
+  (return-type "gchar*")
+)
+
+(define-method set_value
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_set_value")
   (return-type "none")
   (parameters
-    '("const-gchar*" "descr")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method set_owner
-  (of-object "GdaObject")
-  (c-name "gda_object_set_owner")
-  (return-type "none")
+(define-method set_value_str
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_set_value_str")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "owner")
+    '("const-gchar*" "value")
   )
 )
 
-(define-method get_id
-  (of-object "GdaObject")
-  (c-name "gda_object_get_id")
-  (return-type "const-gchar*")
+(define-method declare_invalid
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_declare_invalid")
+  (return-type "none")
 )
 
-(define-method get_name
-  (of-object "GdaObject")
-  (c-name "gda_object_get_name")
-  (return-type "const-gchar*")
+(define-method is_valid
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_is_valid")
+  (return-type "gboolean")
 )
 
-(define-method get_description
-  (of-object "GdaObject")
-  (c-name "gda_object_get_description")
-  (return-type "const-gchar*")
+(define-method get_default_value
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_default_value")
+  (return-type "const-GValue*")
 )
 
-(define-method get_owner
-  (of-object "GdaObject")
-  (c-name "gda_object_get_owner")
-  (return-type "const-gchar*")
+(define-method set_default_value
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_set_default_value")
+  (return-type "none")
+  (parameters
+    '("const-GValue*" "value")
+  )
 )
 
-(define-method destroy
-  (of-object "GdaObject")
-  (c-name "gda_object_destroy")
-  (return-type "none")
+(define-method get_exists_default_value
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_exists_default_value")
+  (return-type "gboolean")
 )
 
-(define-method destroy_check
-  (of-object "GdaObject")
-  (c-name "gda_object_destroy_check")
+(define-method set_exists_default_value
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_set_exists_default_value")
   (return-type "none")
+  (parameters
+    '("gboolean" "default_value_exists")
+  )
 )
 
-(define-function gda_object_connect_destroy
-  (c-name "gda_object_connect_destroy")
-  (return-type "gulong")
+(define-method set_not_null
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_set_not_null")
+  (return-type "none")
   (parameters
-    '("gpointer" "gdaobj")
-    '("GCallback" "callback")
-    '("gpointer" "data")
+    '("gboolean" "not_null")
   )
 )
 
-(define-method signal_emit_changed
-  (of-object "GdaObject")
-  (c-name "gda_object_signal_emit_changed")
-  (return-type "none")
+(define-method get_not_null
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_not_null")
+  (return-type "gboolean")
 )
 
-(define-method block_changed
-  (of-object "GdaObject")
-  (c-name "gda_object_block_changed")
-  (return-type "none")
+(define-method restrict_values
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_restrict_values")
+  (return-type "gboolean")
+  (parameters
+    '("GdaDataModel*" "model")
+    '("gint" "col")
+    '("GError**" "error")
+  )
 )
 
-(define-method unblock_changed
-  (of-object "GdaObject")
-  (c-name "gda_object_unblock_changed")
-  (return-type "none")
+(define-method has_restrict_values
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_has_restrict_values")
+  (return-type "gboolean")
+  (parameters
+    '("GdaDataModel**" "model")
+    '("gint*" "col")
+  )
 )
 
-(define-method dump
-  (of-object "GdaObject")
-  (c-name "gda_object_dump")
+(define-method bind_to_param
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_bind_to_param")
   (return-type "none")
   (parameters
-    '("guint" "offset")
+    '("GdaParameter*" "bind_to")
   )
 )
 
+(define-method get_bind_param
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_bind_param")
+  (return-type "GdaParameter*")
+)
+
 
 
 ;; From gda-parameter-list.h
@@ -5431,315 +5920,144 @@
 )
 
 (define-method merge
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_merge")
-  (return-type "none")
-  (parameters
-    '("GdaParameterList*" "paramlist_to_merge")
-  )
-)
-
-(define-method is_coherent
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_is_coherent")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
-)
-
-(define-method is_valid
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_is_valid")
-  (return-type "gboolean")
-)
-
-(define-method find_param
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_find_param")
-  (return-type "GdaParameter*")
-  (parameters
-    '("const-gchar*" "param_name")
-  )
-)
-
-(define-method find_node_for_param
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_find_node_for_param")
-  (return-type "GdaParameterListNode*")
-  (parameters
-    '("GdaParameter*" "param")
-  )
-)
-
-(define-method find_source
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_find_source")
-  (return-type "GdaParameterListSource*")
-  (parameters
-    '("GdaDataModel*" "model")
-  )
-)
-
-(define-method find_source_for_param
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_find_source_for_param")
-  (return-type "GdaParameterListSource*")
-  (parameters
-    '("GdaParameter*" "param")
-  )
-)
-
-(define-method find_group_for_param
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_find_group_for_param")
-  (return-type "GdaParameterListGroup*")
-  (parameters
-    '("GdaParameter*" "param")
-  )
-)
-
-(define-method set_param_default_value
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_set_param_default_value")
-  (return-type "none")
-  (parameters
-    '("GdaParameter*" "param")
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method set_param_default_alias
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_set_param_default_alias")
-  (return-type "none")
-  (parameters
-    '("GdaParameter*" "param")
-    '("GdaParameter*" "alias")
-  )
-)
-
-(define-method get_param_default_value
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_get_param_default_value")
-  (return-type "const-GValue*")
-  (parameters
-    '("GdaParameter*" "param")
-  )
-)
-
-
-
-;; From gda-parameter-util.h
-
-(define-method declare_param_user
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_declare_param_user")
-  (return-type "none")
-  (parameters
-    '("GdaObject*" "user")
-  )
-)
-
-(define-method get_param_users
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_param_users")
-  (return-type "GSList*")
-)
-
-(define-method replace_param_users
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_replace_param_users")
-  (return-type "none")
-  (parameters
-    '("GHashTable*" "replacements")
-  )
-)
-
-(define-method find_param_for_user
-  (of-object "GdaParameterList")
-  (c-name "gda_parameter_list_find_param_for_user")
-  (return-type "GdaParameter*")
-  (parameters
-    '("GdaObject*" "user")
-  )
-)
-
-(define-method get_alphanum_name
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_alphanum_name")
-  (return-type "gchar*")
-)
-
-
-
-;; From gda-parameter.h
-
-(define-function gda_parameter_get_type
-  (c-name "gda_parameter_get_type")
-  (return-type "GType")
-)
-
-(define-function gda_parameter_new
-  (c-name "gda_parameter_new")
-  (is-constructor-of "GdaParameter")
-  (return-type "GdaParameter*")
-  (parameters
-    '("GType" "type")
-  )
-)
-
-(define-method new_copy
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_new_copy")
-  (return-type "GdaParameter*")
-)
-
-(define-method get_g_type
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_g_type")
-  (return-type "GType")
-)
-
-(define-function gda_parameter_new_string
-  (c-name "gda_parameter_new_string")
-  (return-type "GdaParameter*")
-  (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "str")
-  )
-)
-
-(define-function gda_parameter_new_boolean
-  (c-name "gda_parameter_new_boolean")
-  (return-type "GdaParameter*")
-  (parameters
-    '("const-gchar*" "name")
-    '("gboolean" "value")
-  )
-)
-
-(define-method get_value
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_value")
-  (return-type "const-GValue*")
-)
-
-(define-method get_value_str
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_value_str")
-  (return-type "gchar*")
-)
-
-(define-method set_value
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_set_value")
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_merge")
   (return-type "none")
   (parameters
-    '("const-GValue*" "value")
+    '("GdaParameterList*" "paramlist_to_merge")
   )
 )
 
-(define-method set_value_str
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_set_value_str")
+(define-method is_coherent
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_is_coherent")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "value")
+    '("GError**" "error")
   )
 )
 
-(define-method declare_invalid
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_declare_invalid")
-  (return-type "none")
-)
-
 (define-method is_valid
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_is_valid")
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_is_valid")
   (return-type "gboolean")
 )
 
-(define-method get_default_value
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_default_value")
-  (return-type "const-GValue*")
+(define-method find_param
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_find_param")
+  (return-type "GdaParameter*")
+  (parameters
+    '("const-gchar*" "param_name")
+  )
 )
 
-(define-method set_default_value
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_set_default_value")
-  (return-type "none")
+(define-method find_node_for_param
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_find_node_for_param")
+  (return-type "GdaParameterListNode*")
   (parameters
-    '("const-GValue*" "value")
+    '("GdaParameter*" "param")
   )
 )
 
-(define-method get_exists_default_value
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_exists_default_value")
-  (return-type "gboolean")
+(define-method find_source
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_find_source")
+  (return-type "GdaParameterListSource*")
+  (parameters
+    '("GdaDataModel*" "model")
+  )
 )
 
-(define-method set_exists_default_value
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_set_exists_default_value")
-  (return-type "none")
+(define-method find_source_for_param
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_find_source_for_param")
+  (return-type "GdaParameterListSource*")
   (parameters
-    '("gboolean" "default_value_exists")
+    '("GdaParameter*" "param")
   )
 )
 
-(define-method set_not_null
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_set_not_null")
+(define-method find_group_for_param
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_find_group_for_param")
+  (return-type "GdaParameterListGroup*")
+  (parameters
+    '("GdaParameter*" "param")
+  )
+)
+
+(define-method set_param_default_value
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_set_param_default_value")
   (return-type "none")
   (parameters
-    '("gboolean" "not_null")
+    '("GdaParameter*" "param")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_not_null
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_not_null")
-  (return-type "gboolean")
+(define-method set_param_default_alias
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_set_param_default_alias")
+  (return-type "none")
+  (parameters
+    '("GdaParameter*" "param")
+    '("GdaParameter*" "alias")
+  )
 )
 
-(define-method restrict_values
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_restrict_values")
-  (return-type "gboolean")
+(define-method get_param_default_value
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_get_param_default_value")
+  (return-type "const-GValue*")
   (parameters
-    '("GdaDataModel*" "model")
-    '("gint" "col")
-    '("GError**" "error")
+    '("GdaParameter*" "param")
   )
 )
 
-(define-method has_restrict_values
+
+
+;; From gda-parameter-util.h
+
+(define-method declare_param_user
   (of-object "GdaParameter")
-  (c-name "gda_parameter_has_restrict_values")
-  (return-type "gboolean")
+  (c-name "gda_parameter_declare_param_user")
+  (return-type "none")
   (parameters
-    '("GdaDataModel**" "model")
-    '("gint*" "col")
+    '("GdaObject*" "user")
   )
 )
 
-(define-method bind_to_param
+(define-method get_param_users
   (of-object "GdaParameter")
-  (c-name "gda_parameter_bind_to_param")
+  (c-name "gda_parameter_get_param_users")
+  (return-type "GSList*")
+)
+
+(define-method replace_param_users
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_replace_param_users")
   (return-type "none")
   (parameters
-    '("GdaParameter*" "bind_to")
+    '("GHashTable*" "replacements")
   )
 )
 
-(define-method get_bind_param
-  (of-object "GdaParameter")
-  (c-name "gda_parameter_get_bind_param")
+(define-method find_param_for_user
+  (of-object "GdaParameterList")
+  (c-name "gda_parameter_list_find_param_for_user")
   (return-type "GdaParameter*")
+  (parameters
+    '("GdaObject*" "user")
+  )
+)
+
+(define-method get_alphanum_name
+  (of-object "GdaParameter")
+  (c-name "gda_parameter_get_alphanum_name")
+  (return-type "gchar*")
 )
 
 
@@ -6082,153 +6400,49 @@
 
 
 
-;; From gda-query-field-func.h
-
-(define-function gda_query_field_func_get_type
-  (c-name "gda_query_field_func_get_type")
-  (return-type "GType")
-)
-
-(define-method field_func_new
-  (of-object "GdaQuery")
-  (c-name "gda_query_field_func_new")
-  (return-type "GdaQueryField*")
-  (parameters
-    '("const-gchar*" "func_name")
-  )
-)
-
-(define-method get_ref_func
-  (of-object "GdaQueryFieldFunc")
-  (c-name "gda_query_field_func_get_ref_func")
-  (return-type "GdaDictFunction*")
-)
-
-(define-method get_ref_func_name
-  (of-object "GdaQueryFieldFunc")
-  (c-name "gda_query_field_func_get_ref_func_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_args
-  (of-object "GdaQueryFieldFunc")
-  (c-name "gda_query_field_func_set_args")
-  (return-type "gboolean")
-  (parameters
-    '("GSList*" "args")
-  )
-)
-
-(define-method get_args
-  (of-object "GdaQueryFieldFunc")
-  (c-name "gda_query_field_func_get_args")
-  (return-type "GSList*")
-)
-
-
-
-;; From gda-query-field-value.h
-
-(define-function gda_query_field_value_get_type
-  (c-name "gda_query_field_value_get_type")
-  (return-type "GType")
-)
-
-(define-method field_value_new
-  (of-object "GdaQuery")
-  (c-name "gda_query_field_value_new")
-  (return-type "GdaQueryField*")
-  (parameters
-    '("GType" "type")
-  )
-)
-
-(define-method set_value
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_set_value")
-  (return-type "none")
-  (parameters
-    '("const-GValue*" "val")
-  )
-)
-
-(define-method get_value
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_get_value")
-  (return-type "const-GValue*")
-)
-
-(define-method set_default_value
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_set_default_value")
-  (return-type "none")
-  (parameters
-    '("const-GValue*" "default_val")
-  )
-)
-
-(define-method get_default_value
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_get_default_value")
-  (return-type "const-GValue*")
-)
-
-(define-method set_is_parameter
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_set_is_parameter")
-  (return-type "none")
-  (parameters
-    '("gboolean" "is_param")
-  )
-)
-
-(define-method get_is_parameter
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_get_is_parameter")
-  (return-type "gboolean")
-)
-
-(define-method get_parameter_index
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_get_parameter_index")
-  (return-type "gint")
+;; From gda-query-field-func.h
+
+(define-function gda_query_field_func_get_type
+  (c-name "gda_query_field_func_get_type")
+  (return-type "GType")
 )
 
-(define-method set_not_null
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_set_not_null")
-  (return-type "none")
+(define-method field_func_new
+  (of-object "GdaQuery")
+  (c-name "gda_query_field_func_new")
+  (return-type "GdaQueryField*")
   (parameters
-    '("gboolean" "not_null")
+    '("const-gchar*" "func_name")
   )
 )
 
-(define-method get_not_null
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_get_not_null")
-  (return-type "gboolean")
+(define-method get_ref_func
+  (of-object "GdaQueryFieldFunc")
+  (c-name "gda_query_field_func_get_ref_func")
+  (return-type "GdaDictFunction*")
 )
 
-(define-method is_value_null
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_is_value_null")
-  (return-type "gboolean")
-  (parameters
-    '("GdaParameterList*" "context")
-  )
+(define-method get_ref_func_name
+  (of-object "GdaQueryFieldFunc")
+  (c-name "gda_query_field_func_get_ref_func_name")
+  (return-type "const-gchar*")
 )
 
-(define-method restrict
-  (of-object "GdaQueryFieldValue")
-  (c-name "gda_query_field_value_restrict")
+(define-method set_args
+  (of-object "GdaQueryFieldFunc")
+  (c-name "gda_query_field_func_set_args")
   (return-type "gboolean")
   (parameters
-    '("GdaDataModel*" "model")
-    '("gint" "col")
-    '("GError**" "error")
+    '("GSList*" "args")
   )
 )
 
+(define-method get_args
+  (of-object "GdaQueryFieldFunc")
+  (c-name "gda_query_field_func_get_args")
+  (return-type "GSList*")
+)
+
 
 
 ;; From gda-query-field.h
@@ -6338,202 +6552,106 @@
 
 
 
-;; From gda-query-join.h
+;; From gda-query-field-value.h
 
-(define-function gda_query_join_get_type
-  (c-name "gda_query_join_get_type")
+(define-function gda_query_field_value_get_type
+  (c-name "gda_query_field_value_get_type")
   (return-type "GType")
 )
 
-(define-method join_new_with_targets
+(define-method field_value_new
   (of-object "GdaQuery")
-  (c-name "gda_query_join_new_with_targets")
-  (return-type "GdaQueryJoin*")
+  (c-name "gda_query_field_value_new")
+  (return-type "GdaQueryField*")
   (parameters
-    '("GdaQueryTarget*" "target_1")
-    '("GdaQueryTarget*" "target_2")
+    '("GType" "type")
   )
 )
 
-(define-method join_new_with_xml_ids
-  (of-object "GdaQuery")
-  (c-name "gda_query_join_new_with_xml_ids")
-  (return-type "GdaQueryJoin*")
+(define-method set_value
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_set_value")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "target_1_xml_id")
-    '("const-gchar*" "target_2_xml_id")
+    '("const-GValue*" "val")
   )
 )
 
-(define-method new_copy
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_new_copy")
-  (return-type "GdaQueryJoin*")
-  (parameters
-    '("GHashTable*" "replacements")
-  )
+(define-method get_value
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_get_value")
+  (return-type "const-GValue*")
 )
 
-(define-method set_join_type
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_set_join_type")
+(define-method set_default_value
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_set_default_value")
   (return-type "none")
   (parameters
-    '("GdaQueryJoinType" "type")
+    '("const-GValue*" "default_val")
   )
 )
 
-(define-method get_join_type
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_get_join_type")
-  (return-type "GdaQueryJoinType")
-)
-
-(define-method get_query
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_get_query")
-  (return-type "GdaQuery*")
-)
-
-(define-method get_target_1
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_get_target_1")
-  (return-type "GdaQueryTarget*")
-)
-
-(define-method get_target_2
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_get_target_2")
-  (return-type "GdaQueryTarget*")
+(define-method get_default_value
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_get_default_value")
+  (return-type "const-GValue*")
 )
 
-(define-method swap_targets
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_swap_targets")
+(define-method set_is_parameter
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_set_is_parameter")
   (return-type "none")
-)
-
-(define-method set_condition
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_set_condition")
-  (return-type "gboolean")
   (parameters
-    '("GdaQueryCondition*" "cond")
+    '("gboolean" "is_param")
   )
 )
 
-(define-method get_condition
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_get_condition")
-  (return-type "GdaQueryCondition*")
-)
-
-(define-method set_condition_from_fkcons
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_set_condition_from_fkcons")
-  (return-type "gboolean")
-)
-
-(define-method set_condition_from_sql
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_set_condition_from_sql")
+(define-method get_is_parameter
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_get_is_parameter")
   (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "cond")
-    '("GError**" "error")
-  )
-)
-
-(define-method render_type
-  (of-object "GdaQueryJoin")
-  (c-name "gda_query_join_render_type")
-  (return-type "const-gchar*")
 )
 
-
-
-;; From gda-query-object.h
-
-(define-function gda_query_object_get_type
-  (c-name "gda_query_object_get_type")
-  (return-type "GType")
+(define-method get_parameter_index
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_get_parameter_index")
+  (return-type "gint")
 )
 
-(define-method set_int_id
-  (of-object "GdaQueryObject")
-  (c-name "gda_query_object_set_int_id")
+(define-method set_not_null
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_set_not_null")
   (return-type "none")
   (parameters
-    '("guint" "id")
+    '("gboolean" "not_null")
   )
 )
 
-(define-method get_int_id
-  (of-object "GdaQueryObject")
-  (c-name "gda_query_object_get_int_id")
-  (return-type "guint")
-)
-
-
-;; From gda-query-target.h
-
-(define-function gda_query_target_get_type
-  (c-name "gda_query_target_get_type")
-  (return-type "GType")
+(define-method get_not_null
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_get_not_null")
+  (return-type "gboolean")
 )
 
-(define-method target_new
-  (of-object "GdaQuery")
-  (c-name "gda_query_target_new")
-  (return-type "GdaQueryTarget*")
+(define-method is_value_null
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_is_value_null")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "table")
+    '("GdaParameterList*" "context")
   )
 )
 
-(define-method new_copy
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_new_copy")
-  (return-type "GdaQueryTarget*")
-)
-
-(define-method get_query
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_get_query")
-  (return-type "GdaQuery*")
-)
-
-(define-method get_represented_entity
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_get_represented_entity")
-  (return-type "GdaEntity*")
-)
-
-(define-method get_represented_table_name
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_get_represented_table_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_alias
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_set_alias")
-  (return-type "none")
+(define-method restrict
+  (of-object "GdaQueryFieldValue")
+  (c-name "gda_query_field_value_restrict")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "alias")
-  )
-)
-
-(define-method get_alias
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_get_alias")
-  (return-type "const-gchar*")
-)
-
-(define-method get_complete_name
-  (of-object "GdaQueryTarget")
-  (c-name "gda_query_target_get_complete_name")
-  (return-type "gchar*")
+    '("GdaDataModel*" "model")
+    '("gint" "col")
+    '("GError**" "error")
+  )
 )
 
 
@@ -6663,303 +6781,614 @@
   )
 )
 
-(define-method set_sql_text
+(define-method set_sql_text
+  (of-object "GdaQuery")
+  (c-name "gda_query_set_sql_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "sql")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_sql_text
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_sql_text")
+  (return-type "const-gchar*")
+)
+
+(define-method get_sub_queries
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_sub_queries")
+  (return-type "GSList*")
+)
+
+(define-method add_sub_query
+  (of-object "GdaQuery")
+  (c-name "gda_query_add_sub_query")
+  (return-type "none")
+  (parameters
+    '("GdaQuery*" "sub_query")
+  )
+)
+
+(define-method del_sub_query
+  (of-object "GdaQuery")
+  (c-name "gda_query_del_sub_query")
+  (return-type "none")
+  (parameters
+    '("GdaQuery*" "sub_query")
+  )
+)
+
+(define-method add_param_source
+  (of-object "GdaQuery")
+  (c-name "gda_query_add_param_source")
+  (return-type "none")
+  (parameters
+    '("GdaDataModel*" "param_source")
+  )
+)
+
+(define-method del_param_source
+  (of-object "GdaQuery")
+  (c-name "gda_query_del_param_source")
+  (return-type "none")
+  (parameters
+    '("GdaDataModel*" "param_source")
+  )
+)
+
+(define-method get_param_sources
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_param_sources")
+  (return-type "const-GSList*")
+)
+
+(define-method add_target
+  (of-object "GdaQuery")
+  (c-name "gda_query_add_target")
+  (return-type "gboolean")
+  (parameters
+    '("GdaQueryTarget*" "target")
+    '("GError**" "error")
+  )
+)
+
+(define-method del_target
+  (of-object "GdaQuery")
+  (c-name "gda_query_del_target")
+  (return-type "none")
+  (parameters
+    '("GdaQueryTarget*" "target")
+  )
+)
+
+(define-method get_targets
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_targets")
+  (return-type "GSList*")
+)
+
+(define-method get_target_by_xml_id
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_target_by_xml_id")
+  (return-type "GdaQueryTarget*")
+  (parameters
+    '("const-gchar*" "xml_id")
+  )
+)
+
+(define-method get_target_by_alias
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_target_by_alias")
+  (return-type "GdaQueryTarget*")
+  (parameters
+    '("const-gchar*" "alias_or_name")
+  )
+)
+
+(define-method get_target_pkfields
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_target_pkfields")
+  (return-type "GSList*")
+  (parameters
+    '("GdaQueryTarget*" "target")
+  )
+)
+
+(define-method get_joins
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_joins")
+  (return-type "GSList*")
+)
+
+(define-method get_join_by_targets
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_join_by_targets")
+  (return-type "GdaQueryJoin*")
+  (parameters
+    '("GdaQueryTarget*" "target1")
+    '("GdaQueryTarget*" "target2")
+  )
+)
+
+(define-method add_join
+  (of-object "GdaQuery")
+  (c-name "gda_query_add_join")
+  (return-type "gboolean")
+  (parameters
+    '("GdaQueryJoin*" "join")
+  )
+)
+
+(define-method del_join
+  (of-object "GdaQuery")
+  (c-name "gda_query_del_join")
+  (return-type "none")
+  (parameters
+    '("GdaQueryJoin*" "join")
+  )
+)
+
+(define-method set_condition
+  (of-object "GdaQuery")
+  (c-name "gda_query_set_condition")
+  (return-type "none")
+  (parameters
+    '("GdaQueryCondition*" "cond")
+  )
+)
+
+(define-method get_condition
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_condition")
+  (return-type "GdaQueryCondition*")
+)
+
+(define-method get_main_conditions
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_main_conditions")
+  (return-type "GSList*")
+)
+
+(define-method append_condition
+  (of-object "GdaQuery")
+  (c-name "gda_query_append_condition")
+  (return-type "none")
+  (parameters
+    '("GdaQueryCondition*" "cond")
+    '("gboolean" "append_as_and")
+  )
+)
+
+(define-method set_order_by_field
+  (of-object "GdaQuery")
+  (c-name "gda_query_set_order_by_field")
+  (return-type "none")
+  (parameters
+    '("GdaQueryField*" "field")
+    '("gint" "order")
+    '("gboolean" "ascendant")
+  )
+)
+
+(define-method get_order_by_field
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_order_by_field")
+  (return-type "gint")
+  (parameters
+    '("GdaQueryField*" "field")
+    '("gboolean*" "ascendant")
+  )
+)
+
+(define-method add_field_from_sql
+  (of-object "GdaQuery")
+  (c-name "gda_query_add_field_from_sql")
+  (return-type "GdaQueryField*")
+  (parameters
+    '("const-gchar*" "field")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_all_fields
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_all_fields")
+  (return-type "GSList*")
+)
+
+(define-method get_field_by_sql_naming
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_field_by_sql_naming")
+  (return-type "GdaQueryField*")
+  (parameters
+    '("const-gchar*" "sql_name")
+  )
+)
+
+(define-method get_field_by_param_name
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_field_by_param_name")
+  (return-type "GdaQueryField*")
+  (parameters
+    '("const-gchar*" "param_name")
+  )
+)
+
+(define-method get_field_by_ref_field
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_field_by_ref_field")
+  (return-type "GdaQueryField*")
+  (parameters
+    '("GdaQueryTarget*" "target")
+    '("GdaEntityField*" "ref_field")
+    '("GdaQueryFieldState" "field_state")
+  )
+)
+
+(define-method get_first_field_for_target
+  (of-object "GdaQuery")
+  (c-name "gda_query_get_first_field_for_target")
+  (return-type "GdaQueryField*")
+  (parameters
+    '("GdaQueryTarget*" "target")
+  )
+)
+
+(define-method expand_all_field
   (of-object "GdaQuery")
-  (c-name "gda_query_set_sql_text")
-  (return-type "none")
+  (c-name "gda_query_expand_all_field")
+  (return-type "GSList*")
   (parameters
-    '("const-gchar*" "sql")
-    '("GError**" "error")
+    '("GdaQueryTarget*" "target")
   )
 )
 
-(define-method get_sql_text
+(define-method order_fields_using_join_conds
   (of-object "GdaQuery")
-  (c-name "gda_query_get_sql_text")
-  (return-type "const-gchar*")
+  (c-name "gda_query_order_fields_using_join_conds")
+  (return-type "none")
 )
 
-(define-method get_sub_queries
+(define-method get_fields_by_target
   (of-object "GdaQuery")
-  (c-name "gda_query_get_sub_queries")
+  (c-name "gda_query_get_fields_by_target")
   (return-type "GSList*")
-)
-
-(define-method add_sub_query
-  (of-object "GdaQuery")
-  (c-name "gda_query_add_sub_query")
-  (return-type "none")
   (parameters
-    '("GdaQuery*" "sub_query")
+    '("GdaQueryTarget*" "target")
+    '("gboolean" "visible_fields_only")
   )
 )
 
-(define-method del_sub_query
+(define-method declare_condition
   (of-object "GdaQuery")
-  (c-name "gda_query_del_sub_query")
+  (c-name "gda_query_declare_condition")
   (return-type "none")
   (parameters
-    '("GdaQuery*" "sub_query")
+    '("GdaQueryCondition*" "cond")
   )
 )
 
-(define-method add_param_source
+(define-method undeclare_condition
   (of-object "GdaQuery")
-  (c-name "gda_query_add_param_source")
+  (c-name "gda_query_undeclare_condition")
   (return-type "none")
   (parameters
-    '("GdaDataModel*" "param_source")
+    '("GdaQueryCondition*" "cond")
   )
 )
 
-(define-method del_param_source
+
+
+;; From gda-query-join.h
+
+(define-function gda_query_join_get_type
+  (c-name "gda_query_join_get_type")
+  (return-type "GType")
+)
+
+(define-method join_new_with_targets
   (of-object "GdaQuery")
-  (c-name "gda_query_del_param_source")
-  (return-type "none")
+  (c-name "gda_query_join_new_with_targets")
+  (return-type "GdaQueryJoin*")
   (parameters
-    '("GdaDataModel*" "param_source")
+    '("GdaQueryTarget*" "target_1")
+    '("GdaQueryTarget*" "target_2")
   )
 )
 
-(define-method get_param_sources
+(define-method join_new_with_xml_ids
   (of-object "GdaQuery")
-  (c-name "gda_query_get_param_sources")
-  (return-type "const-GSList*")
+  (c-name "gda_query_join_new_with_xml_ids")
+  (return-type "GdaQueryJoin*")
+  (parameters
+    '("const-gchar*" "target_1_xml_id")
+    '("const-gchar*" "target_2_xml_id")
+  )
 )
 
-(define-method add_target
-  (of-object "GdaQuery")
-  (c-name "gda_query_add_target")
-  (return-type "gboolean")
+(define-method new_copy
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_new_copy")
+  (return-type "GdaQueryJoin*")
   (parameters
-    '("GdaQueryTarget*" "target")
-    '("GError**" "error")
+    '("GHashTable*" "replacements")
   )
 )
 
-(define-method del_target
-  (of-object "GdaQuery")
-  (c-name "gda_query_del_target")
+(define-method set_join_type
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_set_join_type")
   (return-type "none")
   (parameters
-    '("GdaQueryTarget*" "target")
+    '("GdaQueryJoinType" "type")
   )
 )
 
-(define-method get_targets
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_targets")
-  (return-type "GSList*")
+(define-method get_join_type
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_get_join_type")
+  (return-type "GdaQueryJoinType")
 )
 
-(define-method get_target_by_xml_id
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_target_by_xml_id")
+(define-method get_query
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_get_query")
+  (return-type "GdaQuery*")
+)
+
+(define-method get_target_1
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_get_target_1")
   (return-type "GdaQueryTarget*")
-  (parameters
-    '("const-gchar*" "xml_id")
-  )
 )
 
-(define-method get_target_by_alias
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_target_by_alias")
+(define-method get_target_2
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_get_target_2")
   (return-type "GdaQueryTarget*")
+)
+
+(define-method swap_targets
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_swap_targets")
+  (return-type "none")
+)
+
+(define-method set_condition
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_set_condition")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "alias_or_name")
+    '("GdaQueryCondition*" "cond")
   )
 )
 
-(define-method get_target_pkfields
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_target_pkfields")
-  (return-type "GSList*")
+(define-method get_condition
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_get_condition")
+  (return-type "GdaQueryCondition*")
+)
+
+(define-method set_condition_from_fkcons
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_set_condition_from_fkcons")
+  (return-type "gboolean")
+)
+
+(define-method set_condition_from_sql
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_set_condition_from_sql")
+  (return-type "gboolean")
   (parameters
-    '("GdaQueryTarget*" "target")
+    '("const-gchar*" "cond")
+    '("GError**" "error")
   )
 )
 
-(define-method get_joins
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_joins")
-  (return-type "GSList*")
+(define-method render_type
+  (of-object "GdaQueryJoin")
+  (c-name "gda_query_join_render_type")
+  (return-type "const-gchar*")
 )
 
-(define-method get_join_by_targets
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_join_by_targets")
-  (return-type "GdaQueryJoin*")
+
+
+;; From gda-query-object.h
+
+(define-function gda_query_object_get_type
+  (c-name "gda_query_object_get_type")
+  (return-type "GType")
+)
+
+(define-method set_int_id
+  (of-object "GdaQueryObject")
+  (c-name "gda_query_object_set_int_id")
+  (return-type "none")
   (parameters
-    '("GdaQueryTarget*" "target1")
-    '("GdaQueryTarget*" "target2")
+    '("guint" "id")
   )
 )
 
-(define-method add_join
-  (of-object "GdaQuery")
-  (c-name "gda_query_add_join")
-  (return-type "gboolean")
+(define-method get_int_id
+  (of-object "GdaQueryObject")
+  (c-name "gda_query_object_get_int_id")
+  (return-type "guint")
+)
+
+
+
+;; From gda-query-parsing.h
+
+(define-function parse_data_new
+  (c-name "parse_data_new")
+  (is-constructor-of "ParseData")
+  (return-type "ParseData*")
   (parameters
-    '("GdaQueryJoin*" "join")
+    '("GdaQuery*" "query")
   )
 )
 
-(define-method del_join
-  (of-object "GdaQuery")
-  (c-name "gda_query_del_join")
+(define-method destroy
+  (of-object "ParseData")
+  (c-name "parse_data_destroy")
   (return-type "none")
-  (parameters
-    '("GdaQueryJoin*" "join")
-  )
 )
 
-(define-method set_condition
-  (of-object "GdaQuery")
-  (c-name "gda_query_set_condition")
+(define-function parse_data_compute_targets_hash
+  (c-name "parse_data_compute_targets_hash")
   (return-type "none")
   (parameters
-    '("GdaQueryCondition*" "cond")
+    '("GdaQuery*" "query")
+    '("ParseData*" "pdata")
   )
 )
 
-(define-method get_condition
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_condition")
-  (return-type "GdaQueryCondition*")
+(define-function parsed_create_select_query
+  (c-name "parsed_create_select_query")
+  (return-type "gboolean")
+  (parameters
+    '("GdaQuery*" "query")
+    '("sql_select_statement*" "select")
+    '("GError**" "error")
+  )
 )
 
-(define-method get_main_conditions
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_main_conditions")
-  (return-type "GSList*")
+(define-function parsed_create_update_query
+  (c-name "parsed_create_update_query")
+  (return-type "gboolean")
+  (parameters
+    '("GdaQuery*" "query")
+    '("sql_update_statement*" "update")
+    '("GError**" "error")
+  )
 )
 
-(define-method append_condition
-  (of-object "GdaQuery")
-  (c-name "gda_query_append_condition")
-  (return-type "none")
+(define-function parsed_create_insert_query
+  (c-name "parsed_create_insert_query")
+  (return-type "gboolean")
   (parameters
-    '("GdaQueryCondition*" "cond")
-    '("gboolean" "append_as_and")
+    '("GdaQuery*" "query")
+    '("sql_insert_statement*" "insert")
+    '("GError**" "error")
   )
 )
 
-(define-method set_order_by_field
-  (of-object "GdaQuery")
-  (c-name "gda_query_set_order_by_field")
-  (return-type "none")
+(define-function parsed_create_delete_query
+  (c-name "parsed_create_delete_query")
+  (return-type "gboolean")
   (parameters
-    '("GdaQueryField*" "field")
-    '("gint" "order")
-    '("gboolean" "ascendant")
+    '("GdaQuery*" "query")
+    '("sql_delete_statement*" "del")
+    '("GError**" "error")
   )
 )
 
-(define-method get_order_by_field
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_order_by_field")
-  (return-type "gint")
+(define-function parsed_create_global_query_field
+  (c-name "parsed_create_global_query_field")
+  (return-type "GdaEntityField*")
   (parameters
-    '("GdaQueryField*" "field")
-    '("gboolean*" "ascendant")
+    '("GdaQuery*" "query")
+    '("gboolean" "add_to_query")
+    '("ParseData*" "pdata")
+    '("sql_field*" "field")
+    '("gboolean" "try_existing_field")
+    '("gboolean*" "new_field")
+    '("GdaQueryTarget**" "target_return")
+    '("GError**" "error")
   )
 )
 
-(define-method add_field_from_sql
-  (of-object "GdaQuery")
-  (c-name "gda_query_add_field_from_sql")
-  (return-type "GdaQueryField*")
+(define-function parsed_create_complex_condition
+  (c-name "parsed_create_complex_condition")
+  (return-type "GdaQueryCondition*")
   (parameters
-    '("const-gchar*" "field")
+    '("GdaQuery*" "query")
+    '("ParseData*" "pdata")
+    '("sql_where*" "where")
+    '("gboolean" "try_existing_field")
+    '("GSList**" "targets_return")
     '("GError**" "error")
   )
 )
 
-(define-method get_all_fields
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_all_fields")
-  (return-type "GSList*")
-)
-
-(define-method get_field_by_sql_naming
+(define-method get_field_by_sql_naming_fields
   (of-object "GdaQuery")
-  (c-name "gda_query_get_field_by_sql_naming")
+  (c-name "gda_query_get_field_by_sql_naming_fields")
   (return-type "GdaQueryField*")
   (parameters
     '("const-gchar*" "sql_name")
+    '("GSList*" "fields_list")
   )
 )
 
-(define-method get_field_by_param_name
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_field_by_param_name")
-  (return-type "GdaQueryField*")
-  (parameters
-    '("const-gchar*" "param_name")
-  )
+
+
+;; From gda-query-private.h
+
+
+
+;; From gda-query-target.h
+
+(define-function gda_query_target_get_type
+  (c-name "gda_query_target_get_type")
+  (return-type "GType")
 )
 
-(define-method get_field_by_ref_field
+(define-method target_new
   (of-object "GdaQuery")
-  (c-name "gda_query_get_field_by_ref_field")
-  (return-type "GdaQueryField*")
+  (c-name "gda_query_target_new")
+  (return-type "GdaQueryTarget*")
   (parameters
-    '("GdaQueryTarget*" "target")
-    '("GdaEntityField*" "ref_field")
-    '("GdaQueryFieldState" "field_state")
+    '("const-gchar*" "table")
   )
 )
 
-(define-method get_first_field_for_target
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_first_field_for_target")
-  (return-type "GdaQueryField*")
-  (parameters
-    '("GdaQueryTarget*" "target")
-  )
+(define-method new_copy
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_new_copy")
+  (return-type "GdaQueryTarget*")
 )
 
-(define-method expand_all_field
-  (of-object "GdaQuery")
-  (c-name "gda_query_expand_all_field")
-  (return-type "GSList*")
-  (parameters
-    '("GdaQueryTarget*" "target")
-  )
+(define-method get_query
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_get_query")
+  (return-type "GdaQuery*")
 )
 
-(define-method order_fields_using_join_conds
-  (of-object "GdaQuery")
-  (c-name "gda_query_order_fields_using_join_conds")
-  (return-type "none")
+(define-method get_represented_entity
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_get_represented_entity")
+  (return-type "GdaEntity*")
 )
 
-(define-method get_fields_by_target
-  (of-object "GdaQuery")
-  (c-name "gda_query_get_fields_by_target")
-  (return-type "GSList*")
-  (parameters
-    '("GdaQueryTarget*" "target")
-    '("gboolean" "visible_fields_only")
-  )
+(define-method get_represented_table_name
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_get_represented_table_name")
+  (return-type "const-gchar*")
 )
 
-(define-method declare_condition
-  (of-object "GdaQuery")
-  (c-name "gda_query_declare_condition")
+(define-method set_alias
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_set_alias")
   (return-type "none")
   (parameters
-    '("GdaQueryCondition*" "cond")
+    '("const-gchar*" "alias")
   )
 )
 
-(define-method undeclare_condition
-  (of-object "GdaQuery")
-  (c-name "gda_query_undeclare_condition")
-  (return-type "none")
-  (parameters
-    '("GdaQueryCondition*" "cond")
-  )
+(define-method get_alias
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_get_alias")
+  (return-type "const-gchar*")
+)
+
+(define-method get_complete_name
+  (of-object "GdaQueryTarget")
+  (c-name "gda_query_target_get_complete_name")
+  (return-type "gchar*")
 )
 
 
@@ -7476,6 +7905,26 @@
   )
 )
 
+(define-method find_file
+  (of-object "GdaServerProvider")
+  (c-name "gda_server_provider_find_file")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "inst_dir")
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function gda_server_provider_load_file_contents
+  (c-name "gda_server_provider_load_file_contents")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "inst_dir")
+    '("const-gchar*" "data_dir")
+    '("const-gchar*" "filename")
+  )
+)
+
 
 
 ;; From gda-server-provider.h
@@ -7789,6 +8238,10 @@
 
 
 
+;; From gda-server-provider-private.h
+
+
+
 ;; From gda-threader.h
 
 (define-function gda_threader_get_type
@@ -7844,6 +8297,77 @@
 
 
 
+;; From gda-transaction-status-private.h
+
+(define-method add_event_svp
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_add_event_svp")
+  (return-type "GdaTransactionStatusEvent*")
+  (parameters
+    '("const-gchar*" "svp_name")
+  )
+)
+
+(define-method add_event_sql
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_add_event_sql")
+  (return-type "GdaTransactionStatusEvent*")
+  (parameters
+    '("const-gchar*" "sql")
+    '("GdaConnectionEvent*" "conn_event")
+  )
+)
+
+(define-method add_event_sub
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_add_event_sub")
+  (return-type "GdaTransactionStatusEvent*")
+  (parameters
+    '("GdaTransactionStatus*" "sub_trans")
+  )
+)
+
+(define-method free_events
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_free_events")
+  (return-type "none")
+  (parameters
+    '("GdaTransactionStatusEvent*" "event")
+    '("gboolean" "free_after")
+  )
+)
+
+(define-method find
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_find")
+  (return-type "GdaTransactionStatus*")
+  (parameters
+    '("const-gchar*" "str")
+    '("GdaTransactionStatusEvent**" "destev")
+  )
+)
+
+(define-method find_current
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_find_current")
+  (return-type "GdaTransactionStatus*")
+  (parameters
+    '("GdaTransactionStatusEvent**" "destev")
+    '("gboolean" "unnamed_only")
+  )
+)
+
+(define-method dump
+  (of-object "GdaTransactionStatus")
+  (c-name "gda_transaction_status_dump")
+  (return-type "none")
+  (parameters
+    '("guint" "offset")
+  )
+)
+
+
+
 ;; From gda-util.h
 
 (define-function gda_g_type_to_string
@@ -8535,150 +9059,3 @@
 )
 
 
-
-;; From libgda.h
-
-(define-function gda_init
-  (c-name "gda_init")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "app_id")
-    '("const-gchar*" "version")
-    '("gint" "nargs")
-    '("gchar*[]" "args")
-  )
-)
-
-(define-function gda_get_default_dict
-  (c-name "gda_get_default_dict")
-  (return-type "GdaDict*")
-)
-
-(define-function gda_main_run
-  (c-name "gda_main_run")
-  (return-type "none")
-  (parameters
-    '("GdaInitFunc" "init_func")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-function gda_main_quit
-  (c-name "gda_main_quit")
-  (return-type "none")
-)
-
-(define-function gda_open_connection
-  (c-name "gda_open_connection")
-  (return-type "GdaConnection*")
-  (parameters
-    '("const-gchar*" "dsn")
-    '("const-gchar*" "username")
-    '("const-gchar*" "password")
-    '("GdaConnectionOptions" "options")
-    '("GError**" "error")
-  )
-)
-
-(define-function gda_insert_row_into_table
-  (c-name "gda_insert_row_into_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-function gda_insert_row_into_table_from_string
-  (c-name "gda_insert_row_into_table_from_string")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-function gda_update_value_in_table
-  (c-name "gda_update_value_in_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("const-gchar*" "search_for_column")
-    '("const-GValue*" "condition")
-    '("const-gchar*" "column_name")
-    '("const-GValue*" "new_value")
-    '("GError**" "error")
-  )
-)
-
-(define-function gda_update_values_in_table
-  (c-name "gda_update_values_in_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("const-gchar*" "condition_column_name")
-    '("const-GValue*" "condition")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-function gda_delete_row_from_table
-  (c-name "gda_delete_row_from_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("const-gchar*" "condition_column_name")
-    '("const-GValue*" "condition")
-    '("GError**" "error")
-  )
-)
-
-(define-function gda_execute_select_command
-  (c-name "gda_execute_select_command")
-  (return-type "GdaDataModel*")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "sql")
-    '("GError**" "error")
-  )
-)
-
-(define-function gda_execute_sql_command
-  (c-name "gda_execute_sql_command")
-  (return-type "gint")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "sql")
-    '("GError**" "error")
-  )
-)
-
-(define-function gda_create_table
-  (c-name "gda_create_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-function gda_drop_table
-  (c-name "gda_drop_table")
-  (return-type "gboolean")
-  (parameters
-    '("GdaConnection*" "cnn")
-    '("const-gchar*" "table_name")
-    '("GError**" "error")
-  )
-)
-

Modified: libgdamm/trunk/libgda/src/parameter.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/parameter.ccg	(original)
+++ libgdamm/trunk/libgda/src/parameter.ccg	Sun Mar 16 13:27:20 2008
@@ -87,7 +87,7 @@
   GdaDataModel* gda_model = 0;
   return gda_parameter_has_restrict_values(const_cast<GdaParameter*>(gobj()), &gda_model, &col);
   if(gda_model)
-    model = Glib::wrap(gda_model); //TODO ref this?
+    model = Glib::wrap(gda_model, true); //No ref is provided, so we ref this.
 }
 
 Glib::ustring Parameter::get_value_str() const

Modified: libgdamm/trunk/libgda/src/query.hg
==============================================================================
--- libgdamm/trunk/libgda/src/query.hg	(original)
+++ libgdamm/trunk/libgda/src/query.hg	Sun Mar 16 13:27:20 2008
@@ -110,7 +110,6 @@
   _WRAP_METHOD(Glib::RefPtr<ParameterList> get_parameter_list(), gda_query_get_parameter_list, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const ParameterList> get_parameter_list() const, gda_query_get_parameter_list, constversion)
 
-//TODO: Add a suitable default value for the bool - look at the docs to choose a value?
   _WRAP_METHOD(Glib::RefPtr<Object> execute(const Glib::RefPtr<ParameterList>& params, bool iter_model_only_requested = false), gda_query_execute, errthrow)
   //I don't think that an exectute() function should be const. We can add it later if necessary. murrayc: _WRAP_METHOD(Glib::RefPtr<const Object> execute(const Glib::RefPtr<ParameterList>& params, bool iter_model_only_requested) const, gda_query_execute, errthrow, constversion)
   _WRAP_METHOD(Glib::RefPtr<Query> get_parent_query(), gda_query_get_parent_query, refreturn)

Modified: libgdamm/trunk/libgda/src/querycondition.hg
==============================================================================
--- libgdamm/trunk/libgda/src/querycondition.hg	(original)
+++ libgdamm/trunk/libgda/src/querycondition.hg	Sun Mar 16 13:27:20 2008
@@ -72,8 +72,6 @@
   _WRAP_METHOD(void set_cond_type(QueryConditionType type), gda_query_condition_set_cond_type)
   _WRAP_METHOD(QueryConditionType get_cond_type() const, gda_query_condition_get_cond_type)
 
-  // TODO: I am not sure whether refcounting works correctly for the
-  // returned QueryConditions. armin.
   #m4 _CONVERSION(`GSList*', `Glib::SListHandle<Glib::RefPtr<QueryCondition> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
   #m4 _CONVERSION(`GSList*', `Glib::SListHandle<Glib::RefPtr<const QueryCondition> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<QueryCondition> > get_children(), gda_query_condition_get_children)

Modified: libgdamm/trunk/libgda/src/row.hg
==============================================================================
--- libgdamm/trunk/libgda/src/row.hg	(original)
+++ libgdamm/trunk/libgda/src/row.hg	Sun Mar 16 13:27:20 2008
@@ -74,6 +74,11 @@
   _WRAP_METHOD(bool get_is_default(int num) const, gda_row_get_is_default)
 
   //TODO: Properties.
+
+  _WRAP_PROPERTY("model", Glib::RefPtr<DataModel>)
+  //These are not sensible for libgdamm:
+  //_WRAP_PROPERTY("values", GList*)
+  //_WRAP_PROPERTY("nb_values", int)
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/serveroperation.hg
==============================================================================
--- libgdamm/trunk/libgda/src/serveroperation.hg	(original)
+++ libgdamm/trunk/libgda/src/serveroperation.hg	Sun Mar 16 13:27:20 2008
@@ -40,6 +40,7 @@
 
 //_WRAP_ENUM(ClientSpecsType, GdaClientSpecsType)
 _WRAP_ENUM(ServerOperationNodeType, GdaServerOperationNodeType)
+_WRAP_ENUM(ServerOperationNodeStatus, GdaServerOperationNodeStatus)
 
 /** @defgroup DDL Data definition (DDL) queries
  */
@@ -64,9 +65,8 @@
   void set_value_at(const Glib::ustring& path, const Glib::ustring& value, std::auto_ptr<Glib::Error>& error);
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 
-//TODO ?:
-  //_WRAP_METHOD(ServerOperationNodeType get_node_type(const Glib::ustring& path) const, gda_server_operation_get_node_type)
-//_WRAP_METHOD(ServerOperationNodeType get_node_type_v(const Glib::ustring& *path_array),  gda_server_operation_get_node_type_v)
+  _WRAP_METHOD(ServerOperationNodeType get_node_type(const Glib::ustring& path, ServerOperationNodeStatus& status) const, gda_server_operation_get_node_type)
+ //_WRAP_METHOD(ServerOperationNodeType get_node_type_v(const Glib::ustring& *path_array),  gda_server_operation_get_node_type_v)
 
   //_WRAP_METHOD(GdaParameterList* get_node_parameter_list(const Glib::ustring& path) const, gda_server_operation_get_node_plist)
   //_WRAP_METHOD(GdaParameterList *gda_server_operation_get_node_plist_v(const Glib::ustring& *path_array)

Modified: libgdamm/trunk/libgda/src/serverprovider.hg
==============================================================================
--- libgdamm/trunk/libgda/src/serverprovider.hg	(original)
+++ libgdamm/trunk/libgda/src/serverprovider.hg	Sun Mar 16 13:27:20 2008
@@ -55,7 +55,6 @@
 
   _WRAP_METHOD(Glib::ustring get_version() const, gda_server_provider_get_version)
   _WRAP_METHOD(bool open_connection(const Glib::RefPtr<Connection>& cnc, GdaQuarkList *params, const Glib::ustring& username, const Glib::ustring& password), gda_server_provider_open_connection)
-  //TODO: Not implemented: _WRAP_METHOD(bool reset_connection(const Glib::RefPtr<Connection>& cnc), gda_server_provider_reset_connection)
   _WRAP_METHOD(bool close_connection(const Glib::RefPtr<Connection>& cnc), gda_server_provider_close_connection)
 
   _WRAP_METHOD(Glib::ustring get_server_version(const Glib::RefPtr<Connection>& cnc) const, gda_server_provider_get_server_version)
@@ -87,12 +86,10 @@
 
   _WRAP_METHOD(bool supports_feature(const Glib::RefPtr<Connection>& cnc, ConnectionFeature feature) const, gda_server_provider_supports_feature)
 
-  // TODO: The libgda docs say that these functions return a new GdaDataModel.
-  // Normally, the caller should already own a reference on such a new model,
-  // but refreturn adds anotherone. We should check that it does the right
-  // thing. armin.
-  _WRAP_METHOD(Glib::RefPtr<DataModel> get_schema(const Glib::RefPtr<Connection>& cnc, ConnectionSchema schema, const Glib::RefPtr<ParameterList>& params), gda_server_provider_get_schema, retreturn, errthrow)
-  // TODO: This is not constversion because the generated code does not pass
+  // We don't use refreturn here because this returns a new object with an initial reference:
+  _WRAP_METHOD(Glib::RefPtr<DataModel> get_schema(const Glib::RefPtr<Connection>& cnc, ConnectionSchema schema, const Glib::RefPtr<ParameterList>& params), gda_server_provider_get_schema, errthrow)
+ 
+ // TODO: This is not constversion because the generated code does not pass
   // error to the non-const function if exceptions are disabled.
   _WRAP_METHOD(Glib::RefPtr<const DataModel> get_schema(const Glib::RefPtr<Connection>& cnc, ConnectionSchema schema, const Glib::RefPtr<ParameterList>& params) const, gda_server_provider_get_schema, refreturn, errthrow)
 

Modified: libgdamm/trunk/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/trunk/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/trunk/tools/m4/convert_libgdamm.m4	Sun Mar 16 13:27:20 2008
@@ -157,6 +157,9 @@
 _CONVERSION(`Glib::ustring', `const gchar*', `($3).c_str()')
 
 _CONVERSION(`DictConstraintFkAction&',`GdaDictConstraintFkAction*',`(($2) &($3))')
+_CONVERSION(`ServerOperationNodeStatus&',`GdaServerOperationNodeStatus*',`(($2) &($3))')
+
+#_CONVERSION(`GdaServerOperationNodeType' `ServerOperationNodeType',`(($2)($3))')
 
 _CONV_ENUM(Gda,CommandType)
 _CONV_ENUM(Gda,CommandOptions)
@@ -176,6 +179,7 @@
 _CONV_ENUM(Gda,ConnectionEventType)
 _CONV_ENUM(Gda,ServerOperationType)
 _CONV_ENUM(Gda,ServerOperationNodeType)
+_CONV_ENUM(Gda,ServerOperationNodeStatus)
 _CONV_ENUM(Gda,QueryType)
 _CONV_ENUM(Gda,QueryConditionType)
 _CONV_ENUM(Gda,QueryConditionOperator)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]