gnomemm r1723 - in libgdamm/trunk: . libgda/src tools/extra_defs_gen

From: jhs svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r1723 - in libgdamm/trunk: . libgda/src tools/extra_defs_gen
Date: Tue, 30 Sep 2008 14:40:16 +0000 (UTC)
Author: jhs
Date: Tue Sep 30 14:40:16 2008
New Revision: 1723
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1723&view=rev

Log:
2008-09-30  Johannes Schmid  <johannes schmid openismus com>

        * tools/extra_defs_gen/extra_defs_gda.cc: Fixed build
        * libgda/src/*.defs: Regenerated defs files from latest 
libgda-4.0
        * libgda/src/*.hg: Adapted most files to changes in libgda



Removed:
   libgdamm/trunk/libgda/src/datamodelquery.ccg
   libgdamm/trunk/libgda/src/datamodelquery.hg
   libgdamm/trunk/libgda/src/datamodelrow.ccg
   libgdamm/trunk/libgda/src/datamodelrow.hg
Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/Makefile_list_of_hg.am_fragment
   libgdamm/trunk/libgda/src/column.hg
   libgdamm/trunk/libgda/src/config.ccg
   libgdamm/trunk/libgda/src/config.hg
   libgdamm/trunk/libgda/src/connection.hg
   libgdamm/trunk/libgda/src/datamodel.hg
   libgdamm/trunk/libgda/src/datamodeliter.hg
   libgdamm/trunk/libgda/src/dataproxy.hg
   libgdamm/trunk/libgda/src/holder.hg
   libgdamm/trunk/libgda/src/libgda_enums.defs
   libgdamm/trunk/libgda/src/libgda_methods.defs
   libgdamm/trunk/libgda/src/libgda_signals.defs
   libgdamm/trunk/libgda/src/metastruct.hg
   libgdamm/trunk/libgda/src/row.hg
   libgdamm/trunk/libgda/src/serveroperation.hg
   libgdamm/trunk/libgda/src/set.hg
   libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc

Modified: libgdamm/trunk/libgda/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- libgdamm/trunk/libgda/src/Makefile_list_of_hg.am_fragment	(original)
+++ libgdamm/trunk/libgda/src/Makefile_list_of_hg.am_fragment	Tue Sep 30 14:40:16 2008
@@ -4,11 +4,11 @@
 
 files_hg = connection.hg connectionevent.hg \
      datahandler.hg datamodel.hg datamodelarray.hg \
-     datamodelimport.hg datamodelrow.hg \
-	   datamodeliter.hg datamodelquery.hg \
-	   dataproxy.hg \
-	   handlerstring.hg handlerboolean.hg handlertime.hg \
-	   handlernumerical.hg handlerbin.hg handlertype.hg \
+     datamodelimport.hg \
+     datamodeliter.hg \
+     dataproxy.hg \
+     handlerstring.hg handlerboolean.hg handlertime.hg \
+     handlernumerical.hg handlerbin.hg handlertype.hg \
      serverprovider.hg serveroperation.hg transactionstatus.hg \
      set.hg row.hg column.hg holder.hg statement.hg sqlparser.hg \
      batch.hg metastore.hg metastruct.hg config.hg threader.hg \

Modified: libgdamm/trunk/libgda/src/column.hg
==============================================================================
--- libgdamm/trunk/libgda/src/column.hg	(original)
+++ libgdamm/trunk/libgda/src/column.hg	Tue Sep 30 14:40:16 2008
@@ -52,16 +52,8 @@
   _WRAP_METHOD(Glib::ustring get_title() const, gda_column_get_title)
   _WRAP_METHOD(void set_title(const Glib::ustring& title), gda_column_set_title)
 
-  _WRAP_METHOD(glong get_defined_size() const, gda_column_get_defined_size)
-  _WRAP_METHOD(void set_defined_size(glong size), gda_column_set_defined_size)
   _WRAP_METHOD(Glib::ustring get_name() const, gda_column_get_name)
   _WRAP_METHOD(void set_name(const Glib::ustring& name), gda_column_set_name)
-  _WRAP_METHOD(Glib::ustring get_table() const, gda_column_get_table)
-  _WRAP_METHOD(void set_table(const Glib::ustring& table), gda_column_set_table)
-  _WRAP_METHOD(Glib::ustring get_caption() const, gda_column_get_caption)
-  _WRAP_METHOD(void set_caption(const Glib::ustring& caption), gda_column_set_caption)
-  _WRAP_METHOD(glong get_scale() const, gda_column_get_scale)
-  _WRAP_METHOD(void set_scale(glong scale), gda_column_set_scale)
   _WRAP_METHOD(Glib::ustring get_dbms_type() const, gda_column_get_dbms_type)
   _WRAP_METHOD(void set_dbms_type(const Glib::ustring& dbms_type), gda_column_set_dbms_type)
 
@@ -69,12 +61,6 @@
   _WRAP_METHOD(void set_g_type(GType type), gda_column_set_g_type)
   _WRAP_METHOD(bool get_allow_null() const, gda_column_get_allow_null)
   _WRAP_METHOD(void set_allow_null(bool allow = true), gda_column_set_allow_null)
-  _WRAP_METHOD(bool get_primary_key() const, gda_column_get_primary_key)
-  _WRAP_METHOD(void set_primary_key(bool pk = true), gda_column_set_primary_key)
-  _WRAP_METHOD(bool get_unique_key() const, gda_column_get_unique_key)
-  _WRAP_METHOD(void set_unique_key(bool uk = true), gda_column_set_unique_key)
-  _WRAP_METHOD(Glib::ustring get_references() const, gda_column_get_references)
-  _WRAP_METHOD(void set_references(const Glib::ustring& ref), gda_column_set_references)
   _WRAP_METHOD(bool get_auto_increment() const, gda_column_get_auto_increment)
   _WRAP_METHOD(void set_auto_increment(bool is_auto = true), gda_column_set_auto_increment)
   _WRAP_METHOD(gint get_position() const, gda_column_get_position)
@@ -87,7 +73,7 @@
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void name_changed(const Glib::ustring& old_name), "name-changed")
-  _WRAP_SIGNAL(void g_type_changed(GType old_type, GType new_type), "g-type-changed")
+  _WRAP_SIGNAL(void g_type_changed(int old_type, int new_type), "g-type-changed")
 
   _WRAP_PROPERTY("id", Glib::ustring)
 };

Modified: libgdamm/trunk/libgda/src/config.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/config.ccg	(original)
+++ libgdamm/trunk/libgda/src/config.ccg	Tue Sep 30 14:40:16 2008
@@ -48,11 +48,6 @@
   return gda_config_get_nb_dsn();
 }
 
-int Config::get_dsn_index(const Glib::ustring& dsn_name)
-{
-  return gda_config_get_dsn_index(dsn_name.c_str());
-}
-
 bool Config::can_modify_system_config()
 {
   return gda_config_can_modify_system_config();

Modified: libgdamm/trunk/libgda/src/config.hg
==============================================================================
--- libgdamm/trunk/libgda/src/config.hg	(original)
+++ libgdamm/trunk/libgda/src/config.hg	Tue Sep 30 14:40:16 2008
@@ -55,13 +55,8 @@
   static Glib::RefPtr<DataModel> list_providers();
   _WRAP_METHOD_DOCS_ONLY(gda_config_get_nb_dsn)
   static int get_nb_dsn();
-  _WRAP_METHOD_DOCS_ONLY(gda_config_get_dsn_index)
-  static int get_dsn_index(const Glib::ustring& dsn_name);
   _WRAP_METHOD_DOCS_ONLY(gda_config_can_modify_system_config)
   static bool can_modify_system_config();
-
-  _WRAP_PROPERTY("system-file", std::string);
-  _WRAP_PROPERTY("user-file", std::string);
   
   #m4 _EQUAL(GdaDataSourceInfo*, DataSourceInfo*)
   #m4 _CONVERSION(`gpointer',`DataSourceInfo*',`(DataSourceInfo*)($3)')

Modified: libgdamm/trunk/libgda/src/connection.hg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.hg	(original)
+++ libgdamm/trunk/libgda/src/connection.hg	Tue Sep 30 14:40:16 2008
@@ -107,15 +107,11 @@
   _WRAP_METHOD(ConnectionOptions get_options() const, gda_connection_get_options)
 
   _WRAP_METHOD(Glib::ustring get_dsn() const, gda_connection_get_dsn)
-  _WRAP_METHOD(bool set_dsn(const Glib::ustring& datasource), gda_connection_set_dsn)
   _WRAP_METHOD(Glib::ustring get_cnc_string() const, gda_connection_get_cnc_string)
 
   _WRAP_METHOD(void add_event(const Glib::RefPtr<ConnectionEvent>& event), gda_connection_add_event)
   _WRAP_METHOD(Glib::RefPtr<ConnectionEvent> add_event_string(const Glib::ustring& str), gda_connection_add_event_string)
 
-  #m4 //Use deep ownership because we own both the list and its elements;
-  _WRAP_METHOD(void add_events_list (const Glib::ListHandle< Glib::RefPtr<ConnectionEvent> >& events_list), gda_connection_add_events_list)
-
   _WRAP_METHOD(void clear_events_list(), gda_connection_clear_events_list)
 
   _WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute)
@@ -168,7 +164,6 @@
   _WRAP_METHOD(Glib::RefPtr<SqlParser> create_parser(), gda_connection_create_parser)
 
   _WRAP_METHOD(Glib::ustring get_provider_name() const, gda_connection_get_provider_name)
-  _WRAP_METHOD(Glib::RefPtr<ServerProvider> get_provider_obj() const, gda_connection_get_provider_obj)
   _WRAP_METHOD(bool update_meta_store (GdaMetaContext* context), gda_connection_update_meta_store, errthrow)
   
   _WRAP_METHOD(bool statement_prepare (const Glib::RefPtr<Statement>& stmt), gda_connection_statement_prepare, errthrow)
@@ -196,7 +191,6 @@
   _WRAP_PROPERTY("dsn", Glib::ustring)
   _WRAP_PROPERTY("meta-store", Glib::RefPtr<MetaStore>)
   _WRAP_PROPERTY("options", ConnectionOptions)
-  _WRAP_PROPERTY("provider-obj", Glib::RefPtr<ServerProvider>)
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/datamodel.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodel.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodel.hg	Tue Sep 30 14:40:16 2008
@@ -112,7 +112,6 @@
   _WRAP_METHOD(Glib::RefPtr<Column> describe_column(int col), gda_data_model_describe_column, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Column> describe_column(int col) const, gda_data_model_describe_column, refreturn, constversion)
 
-  _WRAP_METHOD(int get_column_index(const Glib::ustring& name) const, gda_data_model_get_column_index_by_name)
   _WRAP_METHOD(Glib::ustring get_column_title(int col) const, gda_data_model_get_column_title)
   _WRAP_METHOD(void set_column_title(int col, const Glib::ustring& title), gda_data_model_set_column_title)
 
@@ -139,7 +138,6 @@
   #m4 _CONVERSION(`const ValueList&',`GList*',`$3.data()')
   _WRAP_METHOD(bool set_values(int row, const ValueList& values), gda_data_model_set_values, errthrow)
 
-  _WRAP_METHOD(bool is_updatable() const, gda_data_model_is_updatable)
   _WRAP_METHOD(DataModelAccessFlags get_access_flags() const, gda_data_model_get_access_flags)
 
   _WRAP_METHOD(int append_values(const ValueList& values), gda_data_model_append_values, errthrow)
@@ -214,11 +212,6 @@
   _WRAP_METHOD(void row_updated(int row), gda_data_model_row_updated)
   _WRAP_METHOD(void row_removed(int row), gda_data_model_row_removed)
   */
-
-  _WRAP_METHOD(bool move_iter_at_row_default(const Glib::RefPtr<DataModelIter>& iter, int row), gda_data_model_move_iter_at_row_default)
-  _WRAP_METHOD(bool move_iter_next_default(const Glib::RefPtr<DataModelIter>& iter), gda_data_model_move_iter_next_default)
-  _WRAP_METHOD(bool move_iter_prev_default(const Glib::RefPtr<DataModelIter>& iter), gda_data_model_move_iter_prev_default)
-
   _WRAP_METHOD(void signal_emit_changed(), gda_data_model_signal_emit_changed)
 
   _WRAP_METHOD(void set_column_name (int col, const Glib::ustring& name), gda_data_model_set_column_name)

Modified: libgdamm/trunk/libgda/src/datamodeliter.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodeliter.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodeliter.hg	Tue Sep 30 14:40:16 2008
@@ -45,7 +45,6 @@
   _WRAP_CREATE(const Glib::RefPtr<DataModel>& data_model)
 
   _WRAP_METHOD(bool is_valid() const, gda_data_model_iter_is_valid)
-  _WRAP_METHOD(bool set_at_row(int row), gda_data_model_iter_set_at_row)
   _WRAP_METHOD(bool move_next(), gda_data_model_iter_move_next)
   _WRAP_METHOD(bool move_prev(), gda_data_model_iter_move_prev)
   _WRAP_METHOD(int get_row() const, gda_data_model_iter_get_row)
@@ -63,7 +62,6 @@
 
   _WRAP_SIGNAL(void end_of_data(), "end-of-data")
   _WRAP_SIGNAL(void row_changed(int row), "row-changed")
-  _WRAP_SIGNAL(bool row_to_change(int row), "row-to-change")
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/dataproxy.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dataproxy.hg	(original)
+++ libgdamm/trunk/libgda/src/dataproxy.hg	Tue Sep 30 14:40:16 2008
@@ -82,9 +82,6 @@
   _WRAP_METHOD(bool row_is_deleted(int proxy_row) const, gda_data_proxy_row_is_deleted)
   _WRAP_METHOD(bool row_is_inserted(int proxy_row) const, gda_data_proxy_row_is_inserted)
 
-  #m4 _CONVERSION(`const ValueSList&', `GSList*', `($3).data()')
-  #m4 _CONVERSION(`const Glib::ArrayHandle<int>&', `gint*', `const_cast<gint*>(($3).data())')
-  _WRAP_METHOD(int find_row_from_values(const ValueSList& values, const Glib::ArrayHandle<int>& cols_index) const, gda_data_proxy_find_row_from_values)
   _WRAP_METHOD(void cancel_row_changes(int proxy_row, int col), gda_data_proxy_cancel_row_changes)
   _WRAP_METHOD(void apply_row_changes(int proxy_row), gda_data_proxy_apply_row_changes, errthrow)
   _WRAP_METHOD(bool has_changed() const, gda_data_proxy_has_changed)
@@ -112,8 +109,6 @@
   _WRAP_SIGNAL(void row_delete_changed(int row, bool to_be_deleted), "row-delete-changed")
   _WRAP_SIGNAL(void sample_changed(int sample_start, int sample_end), "sample-changed")
   _WRAP_SIGNAL(void sample_size_changed(int sample_size), "sample-size-changed")
-  _WRAP_SIGNAL(bool pre_changes_applied(int row, int proxied_row), "pre-changes-applied")
-  _WRAP_SIGNAL(void post_changes_applied(int row, int proxied_row), "post-changes-applied")
   _WRAP_SIGNAL(void filter_changed(), "filter-changed")
 };
 

Modified: libgdamm/trunk/libgda/src/holder.hg
==============================================================================
--- libgdamm/trunk/libgda/src/holder.hg	(original)
+++ libgdamm/trunk/libgda/src/holder.hg	Tue Sep 30 14:40:16 2008
@@ -50,9 +50,9 @@
   _WRAP_METHOD_DOCS_ONLY(gda_holder_get_value)
   Glib::ValueBase get_value();
   _WRAP_METHOD(Glib::ustring get_value_str(const Glib::RefPtr<DataHandler>& dh), gda_holder_get_value_str)
-  _WRAP_METHOD(bool set_value(const Glib::ValueBase& value), gda_holder_set_value)
-  _WRAP_METHOD(bool set_value_str (const Glib::RefPtr<DataHandler>& dh, const Glib::ustring& value), gda_holder_set_value_str)
-  _WRAP_METHOD(bool take_value (Glib::ValueBase& value), gda_holder_take_value)
+  _WRAP_METHOD(bool set_value(const Glib::ValueBase& value), gda_holder_set_value, errthrow)
+  _WRAP_METHOD(bool set_value_str (const Glib::RefPtr<DataHandler>& dh, const Glib::ustring& value), gda_holder_set_value_str, errthrow)
+  _WRAP_METHOD(bool take_value (Glib::ValueBase& value), gda_holder_take_value, errthrow)
 
   _WRAP_METHOD_DOCS_ONLY(gda_holder_get_default_value)
   Glib::ValueBase get_default_value();
@@ -68,7 +68,7 @@
   _WRAP_METHOD(Glib::RefPtr<DataModel> get_source_model (int& col) const, gda_holder_get_source_model)
   _WRAP_METHOD(bool set_source_model (const Glib::RefPtr<DataModel>& model, int col), gda_holder_set_source_model, errthrow)
 
-  _WRAP_METHOD(void set_bind (const Glib::RefPtr<Holder>& bind_to), gda_holder_set_bind)
+  _WRAP_METHOD(void set_bind (const Glib::RefPtr<Holder>& bind_to), gda_holder_set_bind, errthrow)
   _WRAP_METHOD(Glib::RefPtr<Holder> get_bind(), gda_holder_get_bind)
 
   _WRAP_PROPERTY("description", Glib::ustring)

Modified: libgdamm/trunk/libgda/src/libgda_enums.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_enums.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_enums.defs	Tue Sep 30 14:40:16 2008
@@ -1,38 +1,3 @@
-;; From /usr/include/libgda-4.0/libgda/gda-client.h
-
-(define-enum-extended ClientEvent
-  (in-module "Gda")
-  (c-name "GdaClientEvent")
-  (values
-    '("invalid" "GDA_CLIENT_EVENT_INVALID" "0")
-    '("error" "GDA_CLIENT_EVENT_ERROR" "1")
-    '("connection-opened" "GDA_CLIENT_EVENT_CONNECTION_OPENED" "2")
-    '("connection-closed" "GDA_CLIENT_EVENT_CONNECTION_CLOSED" "3")
-    '("transaction-started" "GDA_CLIENT_EVENT_TRANSACTION_STARTED" "4")
-    '("transaction-committed" "GDA_CLIENT_EVENT_TRANSACTION_COMMITTED" "5")
-    '("transaction-cancelled" "GDA_CLIENT_EVENT_TRANSACTION_CANCELLED" "6")
-  )
-)
-
-(define-enum-extended ClientError
-  (in-module "Gda")
-  (c-name "GdaClientError")
-  (values
-    '("r" "GDA_CLIENT_GENERAL_ERROR" "0")
-  )
-)
-
-;; From /usr/include/libgda-4.0/libgda/gda-column-index.h
-
-(define-enum-extended Sorting
-  (in-module "Gda")
-  (c-name "GdaSorting")
-  (values
-    '("ascending" "GDA_SORTING_ASCENDING" "0")
-    '("descending" "GDA_SORTING_DESCENDING" "1")
-  )
-)
-
 ;; From /usr/include/libgda-4.0/libgda/gda-config.h
 
 (define-enum-extended ConfigError
@@ -238,7 +203,7 @@
   (in-module "Gda")
   (c-name "GdaDataModelIterError")
   (values
-    '("r" "GDA_DATA_MODEL_ITER_WHAT_ERROR" "0")
+    '("r" "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR" "0")
   )
 )
 
@@ -248,18 +213,8 @@
   (in-module "Gda")
   (c-name "GdaDataModelQueryError")
   (values
-    '("xml-load-error" "GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR" "0")
-    '("compute-modif-statements-error" "GDA_DATA_MODEL_QUERY_COMPUTE_MODIF_STATEMENTS_ERROR" "1")
-    '("modif-statement-error" "GDA_DATA_MODEL_QUERY_MODIF_STATEMENT_ERROR" "2")
-    '("connection-error" "GDA_DATA_MODEL_QUERY_CONNECTION_ERROR" "3")
-  )
-)
-
-(define-flags-extended DataModelQueryOptions
-  (in-module "Gda")
-  (c-name "GdaDataModelQueryOptions")
-  (values
-    '("k" "GDA_DATA_MODEL_QUERY_OPTION_USE_ALL_FIELDS_IF_NO_PK" "1 << 0")
+    '("select-statement-error" "GDA_DATA_MODEL_QUERY_SELECT_STATEMENT_ERROR" "0")
+    '("connection-error" "GDA_DATA_MODEL_QUERY_CONNECTION_ERROR" "1")
   )
 )
 
@@ -359,7 +314,9 @@
   (in-module "Gda")
   (c-name "GdaHolderError")
   (values
-    '("r" "GDA_HOLDER_QUERY_LIMIT_ERROR" "0")
+    '("string-conversion-error" "GDA_HOLDER_STRING_CONVERSION_ERROR" "0")
+    '("value-type-error" "GDA_HOLDER_VALUE_TYPE_ERROR" "1")
+    '("value-null-error" "GDA_HOLDER_VALUE_NULL_ERROR" "2")
   )
 )
 
@@ -369,8 +326,8 @@
   (in-module "Gda")
   (c-name "GdaMetaStoreError")
   (values
-    '("incorrect-schema" "GDA_META_STORE_INCORRECT_SCHEMA" "0")
-    '("unsupported-provider" "GDA_META_STORE_UNSUPPORTED_PROVIDER" "1")
+    '("incorrect-schema-error" "GDA_META_STORE_INCORRECT_SCHEMA_ERROR" "0")
+    '("unsupported-provider-error" "GDA_META_STORE_UNSUPPORTED_PROVIDER_ERROR" "1")
     '("internal-error" "GDA_META_STORE_INTERNAL_ERROR" "2")
     '("meta-context-error" "GDA_META_STORE_META_CONTEXT_ERROR" "3")
     '("modify-contents-error" "GDA_META_STORE_MODIFY_CONTENTS_ERROR" "4")
@@ -505,6 +462,7 @@
     '("busy-error" "GDA_SERVER_PROVIDER_BUSY_ERROR" "7")
     '("non-supported-error" "GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR" "8")
     '("server-version-error" "GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR" "9")
+    '("data-error" "GDA_SERVER_PROVIDER_DATA_ERROR" "10")
   )
 )
 
@@ -514,7 +472,9 @@
   (in-module "Gda")
   (c-name "GdaSetError")
   (values
-    '("r" "GDA_SET_XML_SPEC_ERROR" "0")
+    '("xml-spec-error" "GDA_SET_XML_SPEC_ERROR" "0")
+    '("holder-not-found-error" "GDA_SET_HOLDER_NOT_FOUND_ERROR" "1")
+    '("invalid-error" "GDA_SET_INVALID_ERROR" "2")
   )
 )
 
@@ -551,6 +511,7 @@
     '("cursor-forward" "GDA_STATEMENT_MODEL_CURSOR_FORWARD" "1 << 1")
     '("cursor-backward" "GDA_STATEMENT_MODEL_CURSOR_BACKWARD" "1 << 2")
     '("cursor" "GDA_STATEMENT_MODEL_CURSOR" "0x2")
+    '("allow-noparam" "GDA_STATEMENT_MODEL_ALLOW_NOPARAM" "1 << 3")
   )
 )
 

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Tue Sep 30 14:40:16 2008
@@ -14,13 +14,6 @@
   (gtype-id "GDA_TYPE_BLOB_OP")
 )
 
-(define-object Client
-  (in-module "Gda")
-  (parent "GObject")
-  (c-name "GdaClient")
-  (gtype-id "GDA_TYPE_CLIENT")
-)
-
 (define-object Column
   (in-module "Gda")
   (parent "GObject")
@@ -28,13 +21,6 @@
   (gtype-id "GDA_TYPE_COLUMN")
 )
 
-(define-object ColumnIndex
-  (in-module "Gda")
-  (parent "GObject")
-  (c-name "GdaColumnIndex")
-  (gtype-id "GDA_TYPE_COLUMN_INDEX")
-)
-
 (define-object Config
   (in-module "Gda")
   (parent "GObject")
@@ -82,6 +68,13 @@
   (gtype-id "GDA_TYPE_DATA_MODEL")
 )
 
+(define-object DataModelArray
+  (in-module "Gda")
+  (parent "GObject")
+  (c-name "GdaDataModelArray")
+  (gtype-id "GDA_TYPE_DATA_MODEL_ARRAY")
+)
+
 (define-object DataModelBdb
   (in-module "Gda")
   (parent "GObject")
@@ -110,32 +103,18 @@
   (gtype-id "GDA_TYPE_DATA_MODEL_QUERY")
 )
 
-(define-object DataModelRow
+(define-object DataProxy
   (in-module "Gda")
   (parent "GObject")
-  (c-name "GdaDataModelRow")
-  (gtype-id "GDA_TYPE_DATA_MODEL_ROW")
-)
-
-(define-object DataModelHash
-  (in-module "Gda")
-  (parent "GdaDataModelRow")
-  (c-name "GdaDataModelHash")
-  (gtype-id "GDA_TYPE_DATA_MODEL_HASH")
-)
-
-(define-object DataModelArray
-  (in-module "Gda")
-  (parent "GdaDataModelRow")
-  (c-name "GdaDataModelArray")
-  (gtype-id "GDA_TYPE_DATA_MODEL_ARRAY")
+  (c-name "GdaDataProxy")
+  (gtype-id "GDA_TYPE_DATA_PROXY")
 )
 
-(define-object DataProxy
+(define-object DataSelect
   (in-module "Gda")
   (parent "GObject")
-  (c-name "GdaDataProxy")
-  (gtype-id "GDA_TYPE_DATA_PROXY")
+  (c-name "GdaDataSelect")
+  (gtype-id "GDA_TYPE_DATA_SELECT")
 )
 
 (define-object Holder
@@ -145,6 +124,12 @@
   (gtype-id "GDA_TYPE_HOLDER")
 )
 
+(define-object Lockable
+  (in-module "Gda")
+  (c-name "GdaLockable")
+  (gtype-id "GDA_TYPE_LOCKABLE")
+)
+
 (define-object MetaStore
   (in-module "Gda")
   (parent "GObject")
@@ -224,40 +209,6 @@
 
 ;; Enumerations and flags ...
 
-(define-enum ClientEvent
-  (in-module "Gda")
-  (c-name "GdaClientEvent")
-  (gtype-id "GDA_TYPE_CLIENT_EVENT")
-  (values
-    '("invalid" "GDA_CLIENT_EVENT_INVALID")
-    '("error" "GDA_CLIENT_EVENT_ERROR")
-    '("connection-opened" "GDA_CLIENT_EVENT_CONNECTION_OPENED")
-    '("connection-closed" "GDA_CLIENT_EVENT_CONNECTION_CLOSED")
-    '("transaction-started" "GDA_CLIENT_EVENT_TRANSACTION_STARTED")
-    '("transaction-committed" "GDA_CLIENT_EVENT_TRANSACTION_COMMITTED")
-    '("transaction-cancelled" "GDA_CLIENT_EVENT_TRANSACTION_CANCELLED")
-  )
-)
-
-(define-enum ClientError
-  (in-module "Gda")
-  (c-name "GdaClientError")
-  (gtype-id "GDA_TYPE_CLIENT_ERROR")
-  (values
-    '("r" "GDA_CLIENT_GENERAL_ERROR")
-  )
-)
-
-(define-enum Sorting
-  (in-module "Gda")
-  (c-name "GdaSorting")
-  (gtype-id "GDA_TYPE_SORTING")
-  (values
-    '("ascending" "GDA_SORTING_ASCENDING")
-    '("descending" "GDA_SORTING_DESCENDING")
-  )
-)
-
 (define-enum ConfigError
   (in-module "Gda")
   (c-name "GdaConfigError")
@@ -465,7 +416,7 @@
   (c-name "GdaDataModelIterError")
   (gtype-id "GDA_TYPE_DATA_MODEL_ITER_ERROR")
   (values
-    '("r" "GDA_DATA_MODEL_ITER_WHAT_ERROR")
+    '("r" "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR")
   )
 )
 
@@ -474,22 +425,11 @@
   (c-name "GdaDataModelQueryError")
   (gtype-id "GDA_TYPE_DATA_MODEL_QUERY_ERROR")
   (values
-    '("xml-load-error" "GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR")
-    '("compute-modif-statements-error" "GDA_DATA_MODEL_QUERY_COMPUTE_MODIF_STATEMENTS_ERROR")
-    '("modif-statement-error" "GDA_DATA_MODEL_QUERY_MODIF_STATEMENT_ERROR")
+    '("select-statement-error" "GDA_DATA_MODEL_QUERY_SELECT_STATEMENT_ERROR")
     '("connection-error" "GDA_DATA_MODEL_QUERY_CONNECTION_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")
@@ -586,7 +526,9 @@
   (c-name "GdaHolderError")
   (gtype-id "GDA_TYPE_HOLDER_ERROR")
   (values
-    '("r" "GDA_HOLDER_QUERY_LIMIT_ERROR")
+    '("string-conversion-error" "GDA_HOLDER_STRING_CONVERSION_ERROR")
+    '("value-type-error" "GDA_HOLDER_VALUE_TYPE_ERROR")
+    '("value-null-error" "GDA_HOLDER_VALUE_NULL_ERROR")
   )
 )
 
@@ -595,8 +537,8 @@
   (c-name "GdaMetaStoreError")
   (gtype-id "GDA_TYPE_META_STORE_ERROR")
   (values
-    '("incorrect-schema" "GDA_META_STORE_INCORRECT_SCHEMA")
-    '("unsupported-provider" "GDA_META_STORE_UNSUPPORTED_PROVIDER")
+    '("incorrect-schema-error" "GDA_META_STORE_INCORRECT_SCHEMA_ERROR")
+    '("unsupported-provider-error" "GDA_META_STORE_UNSUPPORTED_PROVIDER_ERROR")
     '("internal-error" "GDA_META_STORE_INTERNAL_ERROR")
     '("meta-context-error" "GDA_META_STORE_META_CONTEXT_ERROR")
     '("modify-contents-error" "GDA_META_STORE_MODIFY_CONTENTS_ERROR")
@@ -735,6 +677,7 @@
     '("busy-error" "GDA_SERVER_PROVIDER_BUSY_ERROR")
     '("non-supported-error" "GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR")
     '("server-version-error" "GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR")
+    '("data-error" "GDA_SERVER_PROVIDER_DATA_ERROR")
   )
 )
 
@@ -743,7 +686,9 @@
   (c-name "GdaSetError")
   (gtype-id "GDA_TYPE_SET_ERROR")
   (values
-    '("r" "GDA_SET_XML_SPEC_ERROR")
+    '("xml-spec-error" "GDA_SET_XML_SPEC_ERROR")
+    '("holder-not-found-error" "GDA_SET_HOLDER_NOT_FOUND_ERROR")
+    '("invalid-error" "GDA_SET_INVALID_ERROR")
   )
 )
 
@@ -781,6 +726,7 @@
     '("cursor-forward" "GDA_STATEMENT_MODEL_CURSOR_FORWARD")
     '("cursor-backward" "GDA_STATEMENT_MODEL_CURSOR_BACKWARD")
     '("cursor" "GDA_STATEMENT_MODEL_CURSOR")
+    '("allow-noparam" "GDA_STATEMENT_MODEL_ALLOW_NOPARAM")
   )
 )
 
@@ -946,178 +892,6 @@
 
 
 
-;; From gda-client.h
-
-(define-function gda_client_get_type
-  (c-name "gda_client_get_type")
-  (return-type "GType")
-)
-
-(define-function gda_client_new
-  (c-name "gda_client_new")
-  (is-constructor-of "GdaClient")
-  (return-type "GdaClient*")
-)
-
-(define-method open_connection
-  (of-object "GdaClient")
-  (c-name "gda_client_open_connection")
-  (return-type "GdaConnection*")
-  (parameters
-    '("const-gchar*" "dsn")
-    '("const-gchar*" "auth_string")
-    '("GdaConnectionOptions" "options")
-    '("GError**" "error")
-  )
-)
-
-(define-method open_connection_from_string
-  (of-object "GdaClient")
-  (c-name "gda_client_open_connection_from_string")
-  (return-type "GdaConnection*")
-  (parameters
-    '("const-gchar*" "provider_id")
-    '("const-gchar*" "cnc_string")
-    '("const-gchar*" "auth_string")
-    '("GdaConnectionOptions" "options")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_connections
-  (of-object "GdaClient")
-  (c-name "gda_client_get_connections")
-  (return-type "const-GList*")
-)
-
-(define-method find_connection
-  (of-object "GdaClient")
-  (c-name "gda_client_find_connection")
-  (return-type "GdaConnection*")
-  (parameters
-    '("const-gchar*" "dsn")
-    '("const-gchar*" "auth_string")
-  )
-)
-
-(define-method close_all_connections
-  (of-object "GdaClient")
-  (c-name "gda_client_close_all_connections")
-  (return-type "none")
-)
-
-(define-method notify_event
-  (of-object "GdaClient")
-  (c-name "gda_client_notify_event")
-  (return-type "none")
-  (parameters
-    '("GdaConnection*" "cnc")
-    '("GdaClientEvent" "event")
-    '("GdaSet*" "params")
-  )
-)
-
-(define-method notify_error_event
-  (of-object "GdaClient")
-  (c-name "gda_client_notify_error_event")
-  (return-type "none")
-  (parameters
-    '("GdaConnection*" "cnc")
-    '("GdaConnectionEvent*" "error")
-  )
-)
-
-(define-method notify_connection_opened_event
-  (of-object "GdaClient")
-  (c-name "gda_client_notify_connection_opened_event")
-  (return-type "none")
-  (parameters
-    '("GdaConnection*" "cnc")
-  )
-)
-
-(define-method notify_connection_closed_event
-  (of-object "GdaClient")
-  (c-name "gda_client_notify_connection_closed_event")
-  (return-type "none")
-  (parameters
-    '("GdaConnection*" "cnc")
-  )
-)
-
-(define-method prepare_create_database
-  (of-object "GdaClient")
-  (c-name "gda_client_prepare_create_database")
-  (return-type "GdaServerOperation*")
-  (parameters
-    '("const-gchar*" "db_name")
-    '("const-gchar*" "provider")
-  )
-)
-
-(define-method perform_create_database
-  (of-object "GdaClient")
-  (c-name "gda_client_perform_create_database")
-  (return-type "gboolean")
-  (parameters
-    '("GdaServerOperation*" "op")
-    '("GError**" "error")
-  )
-)
-
-(define-method prepare_drop_database
-  (of-object "GdaClient")
-  (c-name "gda_client_prepare_drop_database")
-  (return-type "GdaServerOperation*")
-  (parameters
-    '("const-gchar*" "db_name")
-    '("const-gchar*" "provider")
-  )
-)
-
-(define-method perform_drop_database
-  (of-object "GdaClient")
-  (c-name "gda_client_perform_drop_database")
-  (return-type "gboolean")
-  (parameters
-    '("GdaServerOperation*" "op")
-    '("GError**" "error")
-  )
-)
-
-(define-method begin_transaction
-  (of-object "GdaClient")
-  (c-name "gda_client_begin_transaction")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "name")
-    '("GdaTransactionIsolation" "level")
-    '("GError**" "error")
-  )
-)
-
-(define-method commit_transaction
-  (of-object "GdaClient")
-  (c-name "gda_client_commit_transaction")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "name")
-    '("GError**" "error")
-  )
-)
-
-(define-method rollback_transaction
-  (of-object "GdaClient")
-  (c-name "gda_client_rollback_transaction")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "name")
-    '("GError**" "error")
-  )
-)
-
-
-
 ;; From gda-column.h
 
 (define-function gda_column_get_type
@@ -1152,21 +926,6 @@
   )
 )
 
-(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")
@@ -1182,51 +941,6 @@
   )
 )
 
-(define-method get_table
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_table")
-  (return-type "const-gchar*")
-)
-
-(define-method set_table
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_table")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "table")
-  )
-)
-
-(define-method get_caption
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_caption")
-  (return-type "const-gchar*")
-)
-
-(define-method set_caption
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_caption")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "caption")
-  )
-)
-
-(define-method get_scale
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_scale")
-  (return-type "glong")
-)
-
-(define-method set_scale
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_scale")
-  (return-type "none")
-  (parameters
-    '("glong" "scale")
-  )
-)
-
 (define-method get_dbms_type
   (of-object "GdaColumn")
   (c-name "gda_column_get_dbms_type")
@@ -1272,51 +986,6 @@
   )
 )
 
-(define-method get_primary_key
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_primary_key")
-  (return-type "gboolean")
-)
-
-(define-method set_primary_key
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_primary_key")
-  (return-type "none")
-  (parameters
-    '("gboolean" "pk")
-  )
-)
-
-(define-method get_unique_key
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_unique_key")
-  (return-type "gboolean")
-)
-
-(define-method set_unique_key
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_unique_key")
-  (return-type "none")
-  (parameters
-    '("gboolean" "uk")
-  )
-)
-
-(define-method get_references
-  (of-object "GdaColumn")
-  (c-name "gda_column_get_references")
-  (return-type "const-gchar*")
-)
-
-(define-method set_references
-  (of-object "GdaColumn")
-  (c-name "gda_column_set_references")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "ref")
-  )
-)
-
 (define-method get_auto_increment
   (of-object "GdaColumn")
   (c-name "gda_column_get_auto_increment")
@@ -1364,96 +1033,6 @@
 
 
 
-;; 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-config.h
 
 (define-function gda_config_get_type
@@ -1466,9 +1045,9 @@
   (return-type "GdaConfig*")
 )
 
-(define-function gda_config_get_dsn
-  (c-name "gda_config_get_dsn")
-  (return-type "GdaDataSourceInfo*")
+(define-function gda_config_get_dsn_info
+  (c-name "gda_config_get_dsn_info")
+  (return-type "GdaDsnInfo*")
   (parameters
     '("const-gchar*" "dsn_name")
   )
@@ -1478,7 +1057,7 @@
   (c-name "gda_config_define_dsn")
   (return-type "gboolean")
   (parameters
-    '("const-GdaDataSourceInfo*" "info")
+    '("const-GdaDsnInfo*" "info")
     '("GError**" "error")
   )
 )
@@ -1515,17 +1094,17 @@
   (return-type "gint")
 )
 
-(define-function gda_config_get_dsn_index
-  (c-name "gda_config_get_dsn_index")
+(define-function gda_config_get_dsn_info_index
+  (c-name "gda_config_get_dsn_info_index")
   (return-type "gint")
   (parameters
     '("const-gchar*" "dsn_name")
   )
 )
 
-(define-function gda_config_get_dsn_at_index
-  (c-name "gda_config_get_dsn_at_index")
-  (return-type "GdaDataSourceInfo*")
+(define-function gda_config_get_dsn_info_at_index
+  (c-name "gda_config_get_dsn_info_at_index")
+  (return-type "GdaDsnInfo*")
   (parameters
     '("gint" "index")
   )
@@ -1539,8 +1118,8 @@
   )
 )
 
-(define-function gda_config_get_provider_object
-  (c-name "gda_config_get_provider_object")
+(define-function gda_config_get_provider
+  (c-name "gda_config_get_provider")
   (return-type "GdaServerProvider*")
   (parameters
     '("const-gchar*" "provider_name")
@@ -1726,9 +1305,9 @@
   (return-type "GdaConnectionOptions")
 )
 
-(define-method get_provider_obj
+(define-method get_provider
   (of-object "GdaConnection")
-  (c-name "gda_connection_get_provider_obj")
+  (c-name "gda_connection_get_provider")
   (return-type "GdaServerProvider*")
 )
 
@@ -1754,70 +1333,27 @@
   (c-name "gda_connection_perform_operation")
   (return-type "gboolean")
   (parameters
-    '("GdaServerOperation*" "op")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_dsn
-  (of-object "GdaConnection")
-  (c-name "gda_connection_get_dsn")
-  (return-type "const-gchar*")
-)
-
-(define-method set_dsn
-  (of-object "GdaConnection")
-  (c-name "gda_connection_set_dsn")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "datasource")
-  )
-)
-
-(define-method get_cnc_string
-  (of-object "GdaConnection")
-  (c-name "gda_connection_get_cnc_string")
-  (return-type "const-gchar*")
-)
-
-(define-method get_authentication
-  (of-object "GdaConnection")
-  (c-name "gda_connection_get_authentication")
-  (return-type "const-gchar*")
-)
-
-(define-method add_event
-  (of-object "GdaConnection")
-  (c-name "gda_connection_add_event")
-  (return-type "none")
-  (parameters
-    '("GdaConnectionEvent*" "event")
-  )
-)
-
-(define-method add_event_string
-  (of-object "GdaConnection")
-  (c-name "gda_connection_add_event_string")
-  (return-type "GdaConnectionEvent*")
-  (parameters
-    '("const-gchar*" "str")
+    '("GdaServerOperation*" "op")
+    '("GError**" "error")
   )
-  (varargs #t)
 )
 
-(define-method add_events_list
+(define-method get_dsn
   (of-object "GdaConnection")
-  (c-name "gda_connection_add_events_list")
-  (return-type "none")
-  (parameters
-    '("GList*" "events_list")
-  )
+  (c-name "gda_connection_get_dsn")
+  (return-type "const-gchar*")
 )
 
-(define-method clear_events_list
+(define-method get_cnc_string
   (of-object "GdaConnection")
-  (c-name "gda_connection_clear_events_list")
-  (return-type "none")
+  (c-name "gda_connection_get_cnc_string")
+  (return-type "const-gchar*")
+)
+
+(define-method get_authentication
+  (of-object "GdaConnection")
+  (c-name "gda_connection_get_authentication")
+  (return-type "const-gchar*")
 )
 
 (define-method get_events
@@ -2062,6 +1598,31 @@
   (return-type "gpointer")
 )
 
+(define-method add_event
+  (of-object "GdaConnection")
+  (c-name "gda_connection_add_event")
+  (return-type "none")
+  (parameters
+    '("GdaConnectionEvent*" "event")
+  )
+)
+
+(define-method add_event_string
+  (of-object "GdaConnection")
+  (c-name "gda_connection_add_event_string")
+  (return-type "GdaConnectionEvent*")
+  (parameters
+    '("const-gchar*" "str")
+  )
+  (varargs #t)
+)
+
+(define-method clear_events_list
+  (of-object "GdaConnection")
+  (c-name "gda_connection_clear_events_list")
+  (return-type "none")
+)
+
 (define-method internal_transaction_started
   (of-object "GdaConnection")
   (c-name "gda_connection_internal_transaction_started")
@@ -2145,7 +1706,7 @@
   (return-type "none")
   (parameters
     '("GdaStatement*" "gda_stmt")
-    '("gpointer" "prepared_stmt")
+    '("GdaPStmt*" "prepared_stmt")
   )
 )
 
@@ -2161,18 +1722,12 @@
 (define-method get_prepared_statement
   (of-object "GdaConnection")
   (c-name "gda_connection_get_prepared_statement")
-  (return-type "gpointer")
+  (return-type "GdaPStmt*")
   (parameters
     '("GdaStatement*" "gda_stmt")
   )
 )
 
-(define-method get_meta_store
-  (of-object "GdaConnection")
-  (c-name "gda_connection_get_meta_store")
-  (return-type "GdaMetaStore*")
-)
-
 
 
 ;; From gda-data-access-wrapper.h
@@ -2191,15 +1746,6 @@
   )
 )
 
-(define-method row_exists
-  (of-object "GdaDataAccessWrapper")
-  (c-name "gda_data_access_wrapper_row_exists")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "row")
-  )
-)
-
 
 
 ;; From gda-data-comparator.h
@@ -2375,6 +1921,16 @@
   )
 )
 
+(define-method get_row
+  (of-object "GdaDataModelArray")
+  (c-name "gda_data_model_array_get_row")
+  (return-type "GdaRow*")
+  (parameters
+    '("gint" "row")
+    '("GError**" "error")
+  )
+)
+
 (define-method set_n_columns
   (of-object "GdaDataModelArray")
   (c-name "gda_data_model_array_set_n_columns")
@@ -2494,34 +2050,6 @@
   (return-type "none")
 )
 
-(define-method move_iter_at_row_default
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_move_iter_at_row_default")
-  (return-type "gboolean")
-  (parameters
-    '("GdaDataModelIter*" "iter")
-    '("gint" "row")
-  )
-)
-
-(define-method move_iter_next_default
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_move_iter_next_default")
-  (return-type "gboolean")
-  (parameters
-    '("GdaDataModelIter*" "iter")
-  )
-)
-
-(define-method move_iter_prev_default
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_move_iter_prev_default")
-  (return-type "gboolean")
-  (parameters
-    '("GdaDataModelIter*" "iter")
-  )
-)
-
 
 
 ;; From gda-data-model.h
@@ -2531,12 +2059,6 @@
   (return-type "GType")
 )
 
-(define-method is_updatable
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_is_updatable")
-  (return-type "gboolean")
-)
-
 (define-method get_access_flags
   (of-object "GdaDataModel")
   (c-name "gda_data_model_get_access_flags")
@@ -2564,9 +2086,9 @@
   )
 )
 
-(define-method get_column_index_by_name
+(define-method get_column_index
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_column_index_by_name")
+  (c-name "gda_data_model_get_column_index")
   (return-type "gint")
   (parameters
     '("const-gchar*" "name")
@@ -2618,16 +2140,20 @@
   (parameters
     '("gint" "col")
     '("gint" "row")
+    '("GError**" "error")
   )
 )
 
-(define-method get_value_at_col_name
+(define-method get_typed_value_at
   (of-object "GdaDataModel")
-  (c-name "gda_data_model_get_value_at_col_name")
+  (c-name "gda_data_model_get_typed_value_at")
   (return-type "const-GValue*")
   (parameters
-    '("const-gchar*" "column_name")
+    '("gint" "col")
     '("gint" "row")
+    '("GType" "expected_type")
+    '("gboolean" "nullok")
+    '("GError**" "error")
   )
 )
 
@@ -2814,49 +2340,6 @@
 
 
 
-;; From gda-data-model-hash.h
-
-(define-function gda_data_model_hash_get_type
-  (c-name "gda_data_model_hash_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 clear
-  (of-object "GdaDataModelHash")
-  (c-name "gda_data_model_hash_clear")
-  (return-type "none")
-)
-
-(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 insert_row
-  (of-object "GdaDataModelHash")
-  (c-name "gda_data_model_hash_insert_row")
-  (return-type "none")
-  (parameters
-    '("gint" "rownum")
-    '("GdaRow*" "row")
-  )
-)
-
-
-
 ;; From gda-data-model-import.h
 
 (define-function gda_data_model_import_get_type
@@ -2906,127 +2389,33 @@
 
 
 
-;; 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-function gda_data_model_index_new
-  (c-name "gda_data_model_index_new")
-  (is-constructor-of "GdaDataModelIndex")
-  (return-type "GdaDataModelIndex*")
-)
-
-(define-method copy
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_copy")
-  (return-type "GdaDataModelIndex*")
-)
-
-(define-method free
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_free")
-  (return-type "none")
-)
+;; From gda-data-model-iter-extra.h
 
-(define-method equal
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_equal")
+(define-method iter_move_at_row_default
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_iter_move_at_row_default")
   (return-type "gboolean")
   (parameters
-    '("const-GdaDataModelIndex*" "rhs")
-  )
-)
-
-(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_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")
-  (parameters
-    '("const-gchar*" "name")
+    '("GdaDataModelIter*" "iter")
+    '("gint" "row")
   )
 )
 
-(define-method get_primary_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_primary_key")
+(define-method iter_move_next_default
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_iter_move_next_default")
   (return-type "gboolean")
-)
-
-(define-method set_primary_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_set_primary_key")
-  (return-type "none")
   (parameters
-    '("gboolean" "pk")
+    '("GdaDataModelIter*" "iter")
   )
 )
 
-(define-method get_unique_key
-  (of-object "GdaDataModelIndex")
-  (c-name "gda_data_model_index_get_unique_key")
+(define-method iter_move_prev_default
+  (of-object "GdaDataModel")
+  (c-name "gda_data_model_iter_move_prev_default")
   (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")
-  )
-)
-
-(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
-    '("const-gchar*" "ref")
-  )
-)
-
-(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")
-  (return-type "none")
   (parameters
-    '("GList*" "col_idx_list")
+    '("GdaDataModelIter*" "iter")
   )
 )
 
@@ -3057,9 +2446,20 @@
   )
 )
 
-(define-method set_at_row
+(define-method set_value_at
+  (of-object "GdaDataModelIter")
+  (c-name "gda_data_model_iter_set_value_at")
+  (return-type "gboolean")
+  (parameters
+    '("gint" "col")
+    '("const-GValue*" "value")
+    '("GError**" "error")
+  )
+)
+
+(define-method move_at_row
   (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_set_at_row")
+  (c-name "gda_data_model_iter_move_at_row")
   (return-type "gboolean")
   (parameters
     '("gint" "row")
@@ -3084,12 +2484,6 @@
   (return-type "gint")
 )
 
-(define-method can_be_moved
-  (of-object "GdaDataModelIter")
-  (c-name "gda_data_model_iter_can_be_moved")
-  (return-type "gboolean")
-)
-
 (define-method invalidate_contents
   (of-object "GdaDataModelIter")
   (c-name "gda_data_model_iter_invalidate_contents")
@@ -3138,34 +2532,6 @@
   )
 )
 
-(define-method move_iter_at_row
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_move_iter_at_row")
-  (return-type "gboolean")
-  (parameters
-    '("GdaDataModelIter*" "iter")
-    '("gint" "row")
-  )
-)
-
-(define-method move_iter_next
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_move_iter_next")
-  (return-type "gboolean")
-  (parameters
-    '("GdaDataModelIter*" "iter")
-  )
-)
-
-(define-method move_iter_prev
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_move_iter_prev")
-  (return-type "gboolean")
-  (parameters
-    '("GdaDataModelIter*" "iter")
-  )
-)
-
 
 
 ;; From gda-data-model-query.h
@@ -3178,19 +2544,14 @@
 (define-function gda_data_model_query_new
   (c-name "gda_data_model_query_new")
   (is-constructor-of "GdaDataModelQuery")
-  (return-type "GdaDataModel*")
+  (return-type "GdaDataModelQuery*")
   (parameters
     '("GdaConnection*" "cnc")
     '("GdaStatement*" "select_stmt")
+    '("GdaSet*" "params")
   )
 )
 
-(define-method get_parameter_list
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_get_parameter_list")
-  (return-type "GdaSet*")
-)
-
 (define-method refresh
   (of-object "GdaDataModelQuery")
   (c-name "gda_data_model_query_refresh")
@@ -3200,42 +2561,60 @@
   )
 )
 
-(define-method set_modification_query
+(define-method set_row_selection_condition
   (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_set_modification_query")
+  (c-name "gda_data_model_query_set_row_selection_condition")
   (return-type "gboolean")
   (parameters
-    '("GdaStatement*" "mod_stmt")
+    '("GdaSqlExpr*" "expr")
     '("GError**" "error")
   )
 )
 
-(define-method compute_modification_queries
+(define-method set_row_selection_condition_sql
   (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_compute_modification_queries")
+  (c-name "gda_data_model_query_set_row_selection_condition_sql")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "target")
-    '("GdaDataModelQueryOptions" "options")
+    '("const-gchar*" "sql_where")
     '("GError**" "error")
   )
 )
 
+(define-method compute_row_selection_condition
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_compute_row_selection_condition")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
 
+(define-method set_modification_statement
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_set_modification_statement")
+  (return-type "gboolean")
+  (parameters
+    '("GdaStatement*" "mod_stmt")
+    '("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 set_modification_statement_sql
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_set_modification_statement_sql")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "sql")
+    '("GError**" "error")
+  )
 )
 
-(define-method get_row
-  (of-object "GdaDataModelRow")
-  (c-name "gda_data_model_row_get_row")
-  (return-type "GdaRow*")
+(define-method compute_modification_statements
+  (of-object "GdaDataModelQuery")
+  (c-name "gda_data_model_query_compute_modification_statements")
+  (return-type "gboolean")
   (parameters
-    '("gint" "row")
     '("GError**" "error")
   )
 )
@@ -3359,16 +2738,6 @@
   )
 )
 
-(define-method find_row_from_values
-  (of-object "GdaDataProxy")
-  (c-name "gda_data_proxy_find_row_from_values")
-  (return-type "gint")
-  (parameters
-    '("GSList*" "values")
-    '("gint*" "cols_index")
-  )
-)
-
 (define-method row_has_changed
   (of-object "GdaDataProxy")
   (c-name "gda_data_proxy_row_has_changed")
@@ -3501,6 +2870,73 @@
 
 
 
+;; From gda-data-select.h
+
+(define-function gda_data_select_get_type
+  (c-name "gda_data_select_get_type")
+  (return-type "GType")
+)
+
+(define-method set_row_selection_condition
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_set_row_selection_condition")
+  (return-type "gboolean")
+  (parameters
+    '("GdaSqlExpr*" "expr")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_row_selection_condition_sql
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_set_row_selection_condition_sql")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "sql_where")
+    '("GError**" "error")
+  )
+)
+
+(define-method compute_row_selection_condition
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_compute_row_selection_condition")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
+(define-method set_modification_statement
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_set_modification_statement")
+  (return-type "gboolean")
+  (parameters
+    '("GdaStatement*" "mod_stmt")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_modification_statement_sql
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_set_modification_statement_sql")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "sql")
+    '("GError**" "error")
+  )
+)
+
+(define-method compute_modification_statements
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_compute_modification_statements")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
+
+
 ;; From gda-debug-macros.h
 
 
@@ -3755,16 +3191,6 @@
   (return-type "GType")
 )
 
-(define-function gda_data_model_query_error_get_type
-  (c-name "gda_data_model_query_error_get_type")
-  (return-type "GType")
-)
-
-(define-function gda_data_model_query_options_get_type
-  (c-name "gda_data_model_query_options_get_type")
-  (return-type "GType")
-)
-
 (define-function gda_data_proxy_error_get_type
   (c-name "gda_data_proxy_error_get_type")
   (return-type "GType")
@@ -3967,6 +3393,7 @@
   (return-type "gboolean")
   (parameters
     '("const-GValue*" "value")
+    '("GError**" "error")
   )
 )
 
@@ -3976,6 +3403,17 @@
   (return-type "gboolean")
   (parameters
     '("GValue*" "value")
+    '("GError**" "error")
+  )
+)
+
+(define-method take_static_value
+  (of-object "GdaHolder")
+  (c-name "gda_holder_take_static_value")
+  (return-type "GValue*")
+  (parameters
+    '("const-GValue*" "value")
+    '("GError**" "error")
   )
 )
 
@@ -3986,6 +3424,7 @@
   (parameters
     '("GdaDataHandler*" "dh")
     '("const-gchar*" "value")
+    '("GError**" "error")
   )
 )
 
@@ -4066,9 +3505,10 @@
 (define-method set_bind
   (of-object "GdaHolder")
   (c-name "gda_holder_set_bind")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("GdaHolder*" "bind_to")
+    '("GError**" "error")
   )
 )
 
@@ -4080,6 +3520,33 @@
 
 
 
+;; From gda-lockable.h
+
+(define-function gda_lockable_get_type
+  (c-name "gda_lockable_get_type")
+  (return-type "GType")
+)
+
+(define-method lock
+  (of-object "GdaLockable")
+  (c-name "gda_lockable_lock")
+  (return-type "none")
+)
+
+(define-method trylock
+  (of-object "GdaLockable")
+  (c-name "gda_lockable_trylock")
+  (return-type "gboolean")
+)
+
+(define-method unlock
+  (of-object "GdaLockable")
+  (c-name "gda_lockable_unlock")
+  (return-type "none")
+)
+
+
+
 ;; From gda-log.h
 
 (define-function gda_log_enable
@@ -4281,6 +3748,7 @@
   (is-constructor-of "GdaMetaStruct")
   (return-type "GdaMetaStruct*")
   (parameters
+    '("GdaMetaStore*" "store")
     '("GdaMetaStructFeature" "features")
   )
 )
@@ -4290,7 +3758,6 @@
   (c-name "gda_meta_struct_complement")
   (return-type "GdaMetaDbObject*")
   (parameters
-    '("GdaMetaStore*" "store")
     '("GdaMetaDbObjectType" "type")
     '("const-GValue*" "catalog")
     '("const-GValue*" "schema")
@@ -4304,7 +3771,6 @@
   (c-name "gda_meta_struct_complement_schema")
   (return-type "gboolean")
   (parameters
-    '("GdaMetaStore*" "store")
     '("const-GValue*" "catalog")
     '("const-GValue*" "schema")
     '("GError**" "error")
@@ -4316,7 +3782,6 @@
   (c-name "gda_meta_struct_complement_default")
   (return-type "gboolean")
   (parameters
-    '("GdaMetaStore*" "store")
     '("GError**" "error")
   )
 )
@@ -4326,7 +3791,6 @@
   (c-name "gda_meta_struct_complement_depend")
   (return-type "gboolean")
   (parameters
-    '("GdaMetaStore*" "store")
     '("GdaMetaDbObject*" "dbo")
     '("GError**" "error")
   )
@@ -4342,6 +3806,12 @@
   )
 )
 
+(define-method get_all_db_objects
+  (of-object "GdaMetaStruct")
+  (c-name "gda_meta_struct_get_all_db_objects")
+  (return-type "GSList*")
+)
+
 (define-method get_db_object
   (of-object "GdaMetaStruct")
   (c-name "gda_meta_struct_get_db_object")
@@ -4375,6 +3845,40 @@
 
 
 
+;; From gda-mutex.h
+
+(define-function gda_mutex_new
+  (c-name "gda_mutex_new")
+  (is-constructor-of "GdaMutex")
+  (return-type "GdaMutex*")
+)
+
+(define-method lock
+  (of-object "GdaMutex")
+  (c-name "gda_mutex_lock")
+  (return-type "none")
+)
+
+(define-method trylock
+  (of-object "GdaMutex")
+  (c-name "gda_mutex_trylock")
+  (return-type "gboolean")
+)
+
+(define-method unlock
+  (of-object "GdaMutex")
+  (c-name "gda_mutex_unlock")
+  (return-type "none")
+)
+
+(define-method free
+  (of-object "GdaMutex")
+  (c-name "gda_mutex_free")
+  (return-type "none")
+)
+
+
+
 ;; From gda-quark-list.h
 
 (define-function gda_quark_list_get_type
@@ -4466,77 +3970,16 @@
   (is-constructor-of "GdaRow")
   (return-type "GdaRow*")
   (parameters
-    '("GdaDataModel*" "model")
     '("gint" "count")
   )
 )
 
-(define-function gda_row_new_from_list
-  (c-name "gda_row_new_from_list")
-  (return-type "GdaRow*")
-  (parameters
-    '("GdaDataModel*" "model")
-    '("const-GList*" "values")
-  )
-)
-
-(define-method copy
-  (of-object "GdaRow")
-  (c-name "gda_row_copy")
-  (return-type "GdaRow*")
-)
-
-(define-method set_model
-  (of-object "GdaRow")
-  (c-name "gda_row_set_model")
-  (return-type "none")
-  (parameters
-    '("GdaDataModel*" "model")
-  )
-)
-
-(define-method get_model
-  (of-object "GdaRow")
-  (c-name "gda_row_get_model")
-  (return-type "GdaDataModel*")
-)
-
 (define-method get_length
   (of-object "GdaRow")
   (c-name "gda_row_get_length")
   (return-type "gint")
 )
 
-(define-method get_number
-  (of-object "GdaRow")
-  (c-name "gda_row_get_number")
-  (return-type "gint")
-)
-
-(define-method set_number
-  (of-object "GdaRow")
-  (c-name "gda_row_set_number")
-  (return-type "none")
-  (parameters
-    '("gint" "number")
-  )
-)
-
-(define-method get_id
-  (of-object "GdaRow")
-  (c-name "gda_row_get_id")
-  (return-type "const-gchar*")
-)
-
-(define-method set_id
-  (of-object "GdaRow")
-  (c-name "gda_row_set_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "id")
-  )
-)
-
 (define-method get_value
   (of-object "GdaRow")
   (c-name "gda_row_get_value")
@@ -4546,35 +3989,6 @@
   )
 )
 
-(define-method set_value
-  (of-object "GdaRow")
-  (c-name "gda_row_set_value")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "num")
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method set_is_default
-  (of-object "GdaRow")
-  (c-name "gda_row_set_is_default")
-  (return-type "none")
-  (parameters
-    '("gint" "num")
-    '("gboolean" "is_default")
-  )
-)
-
-(define-method get_is_default
-  (of-object "GdaRow")
-  (c-name "gda_row_get_is_default")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "num")
-  )
-)
-
 
 
 ;; From gda-server-operation.h
@@ -4825,6 +4239,15 @@
   )
 )
 
+(define-function gda_select_alter_select_for_empty
+  (c-name "gda_select_alter_select_for_empty")
+  (return-type "GdaStatement*")
+  (parameters
+    '("GdaStatement*" "stmt")
+    '("GError**" "error")
+  )
+)
+
 (define-method handler_find
   (of-object "GdaServerProvider")
   (c-name "gda_server_provider_handler_find")
@@ -5143,6 +4566,7 @@
   (c-name "gda_set_set_holder_value")
   (return-type "gboolean")
   (parameters
+    '("GError**" "error")
     '("const-gchar*" "holder_id")
   )
   (varargs #t)
@@ -5197,6 +4621,9 @@
   (of-object "GdaSet")
   (c-name "gda_set_is_valid")
   (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
 )
 
 (define-method get_node
@@ -5551,7 +4978,7 @@
 
 (define-function gda_utility_data_model_dump_data_to_xml
   (c-name "gda_utility_data_model_dump_data_to_xml")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("GdaDataModel*" "model")
     '("xmlNodePtr" "parent")
@@ -5565,11 +4992,12 @@
 
 (define-function gda_utility_holder_load_attributes
   (c-name "gda_utility_holder_load_attributes")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("GdaHolder*" "holder")
     '("xmlNodePtr" "node")
     '("GSList*" "sources")
+    '("GError**" "error")
   )
 )
 
@@ -5589,6 +5017,17 @@
   )
 )
 
+(define-function gda_compute_unique_table_row_condition
+  (c-name "gda_compute_unique_table_row_condition")
+  (return-type "GdaSqlExpr*")
+  (parameters
+    '("GdaSqlStatementSelect*" "stsel")
+    '("GdaMetaTable*" "mtable")
+    '("gboolean" "require_pk")
+    '("GError**" "error")
+  )
+)
+
 (define-function gda_compute_dml_statements
   (c-name "gda_compute_dml_statements")
   (return-type "gboolean")
@@ -5642,6 +5081,33 @@
   )
 )
 
+(define-function gda_parse_iso8601_date
+  (c-name "gda_parse_iso8601_date")
+  (return-type "gboolean")
+  (parameters
+    '("GDate*" "gdate")
+    '("const-gchar*" "value")
+  )
+)
+
+(define-function gda_parse_iso8601_time
+  (c-name "gda_parse_iso8601_time")
+  (return-type "gboolean")
+  (parameters
+    '("GdaTime*" "timegda")
+    '("const-gchar*" "value")
+  )
+)
+
+(define-function gda_parse_iso8601_timestamp
+  (c-name "gda_parse_iso8601_timestamp")
+  (return-type "gboolean")
+  (parameters
+    '("GdaTimestamp*" "timestamp")
+    '("const-gchar*" "value")
+  )
+)
+
 
 
 ;; From gda-value.h
@@ -5937,8 +5403,8 @@
   )
 )
 
-(define-function gda_value_bcompare
-  (c-name "gda_value_bcompare")
+(define-function gda_value_differ
+  (c-name "gda_value_differ")
   (return-type "gint")
   (parameters
     '("const-GValue*" "value1")
@@ -5955,15 +5421,6 @@
   )
 )
 
-(define-function gda_value_compare_ext
-  (c-name "gda_value_compare_ext")
-  (return-type "gint")
-  (parameters
-    '("const-GValue*" "value1")
-    '("const-GValue*" "value2")
-  )
-)
-
 (define-function gda_value_stringify
   (c-name "gda_value_stringify")
   (return-type "gchar*")
@@ -6246,7 +5703,7 @@
 (define-method to_string
   (of-object "GdaXaTransactionId")
   (c-name "gda_xa_transaction_id_to_string")
-  (return-type "const-gchar*")
+  (return-type "gchar*")
 )
 
 (define-function gda_xa_transaction_string_to_id
@@ -6266,6 +5723,14 @@
   (return-type "none")
 )
 
+(define-function gda_get_application_exec_path
+  (c-name "gda_get_application_exec_path")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "app_name")
+  )
+)
+
 
 ;; -*- scheme -*-
 ; object definitions ...
@@ -7607,6 +7072,30 @@
 
 ;; From gda-statement-struct-util.h
 
+(define-function gda_sql_identifier_add_quotes
+  (c-name "gda_sql_identifier_add_quotes")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
+(define-function gda_sql_identifier_needs_quotes
+  (c-name "gda_sql_identifier_needs_quotes")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
+(define-function gda_sql_identifier_remove_quotes
+  (c-name "gda_sql_identifier_remove_quotes")
+  (return-type "gchar*")
+  (parameters
+    '("gchar*" "str")
+  )
+)
+
 (define-function gda_sql_value_stringify
   (c-name "gda_sql_value_stringify")
   (return-type "gchar*")

Modified: libgdamm/trunk/libgda/src/libgda_signals.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_signals.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_signals.defs	Tue Sep 30 14:40:16 2008
@@ -25,8 +25,8 @@
   (return-type "void")
   (when "last")
   (parameters
-    '("GType" "p0")
-    '("GType" "p1")
+    '("gint" "p0")
+    '("gint" "p1")
   )
 )
 
@@ -77,7 +77,7 @@
   )
 )
 
-(define-property user-file
+(define-property system-filename
   (of-object "GdaConfig")
   (prop-type "GParamString")
   (docs "")
@@ -86,7 +86,7 @@
   (construct-only #f)
 )
 
-(define-property system-file
+(define-property user-filename
   (of-object "GdaConfig")
   (prop-type "GParamString")
   (docs "")
@@ -139,7 +139,7 @@
 (define-property dsn
   (of-object "GdaConnection")
   (prop-type "GParamString")
-  (docs "")
+  (docs "DSN to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -148,16 +148,16 @@
 (define-property cnc-string
   (of-object "GdaConnection")
   (prop-type "GParamString")
-  (docs "")
+  (docs "Connection string to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property provider-obj
+(define-property provider
   (of-object "GdaConnection")
   (prop-type "GParamObject")
-  (docs "")
+  (docs "Provider to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -166,7 +166,7 @@
 (define-property auth-string
   (of-object "GdaConnection")
   (prop-type "GParamString")
-  (docs "")
+  (docs "Authentication string to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -175,7 +175,7 @@
 (define-property options
   (of-object "GdaConnection")
   (prop-type "GParamFlags")
-  (docs "")
+  (docs "Options (connection sharing)")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -184,7 +184,16 @@
 (define-property meta-store
   (of-object "GdaConnection")
   (prop-type "GParamObject")
-  (docs "")
+  (docs "GdaMetaStore used by the connection")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property thread-owner
+  (of-object "GdaConnection")
+  (prop-type "GParamPointer")
+  (docs "Unique GThread from which the connection will be available.This should only be modified by the database providers' implementation")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -248,7 +257,7 @@
 (define-property read-only
   (of-object "GdaDataModelArray")
   (prop-type "GParamBoolean")
-  (docs "")
+  (docs "Whether data model can be modified")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -384,15 +393,6 @@
 
 ;; From GdaDataModelIter
 
-(define-signal row-to-change
-  (of-object "GdaDataModelIter")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-  )
-)
-
 (define-signal row-changed
   (of-object "GdaDataModelIter")
   (return-type "void")
@@ -480,73 +480,6 @@
   (construct-only #f)
 )
 
-;; From GdaDataModelQuery
-
-(define-property query
-  (of-object "GdaDataModelQuery")
-  (prop-type "GParamObject")
-  (docs "SELECT Query to be executed to populate the model with data")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property insert-query
-  (of-object "GdaDataModelQuery")
-  (prop-type "GParamObject")
-  (docs "INSERT Query to be executed to add data")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property update-query
-  (of-object "GdaDataModelQuery")
-  (prop-type "GParamObject")
-  (docs "UPDATE Query to be executed to update data")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property delete-query
-  (of-object "GdaDataModelQuery")
-  (prop-type "GParamObject")
-  (docs "DELETE Query to be executed to remove data")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property use-transaction
-  (of-object "GdaDataModelQuery")
-  (prop-type "GParamBoolean")
-  (docs "Run modification statements within a transaction")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property connection
-  (of-object "GdaDataModelQuery")
-  (prop-type "GParamObject")
-  (docs "Connection to use to execute statements")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GdaDataModelRow
-
-(define-property read-only
-  (of-object "GdaDataModelRow")
-  (prop-type "GParamBoolean")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GdaDataProxy
 
 (define-signal row-delete-changed
@@ -578,9 +511,9 @@
   )
 )
 
-(define-signal pre-changes-applied
+(define-signal validate-row-changes
   (of-object "GdaDataProxy")
-  (return-type "gboolean")
+  (return-type "gpointer")
   (when "last")
   (parameters
     '("gint" "p0")
@@ -588,7 +521,7 @@
   )
 )
 
-(define-signal post-changes-applied
+(define-signal row-changes-applied
   (of-object "GdaDataProxy")
   (return-type "void")
   (when "first")
@@ -654,6 +587,15 @@
   (when "first")
 )
 
+(define-signal validate-change
+  (of-object "GdaHolder")
+  (return-type "gpointer")
+  (when "last")
+  (parameters
+    '("gpointer" "p0")
+  )
+)
+
 (define-property id
   (of-object "GdaHolder")
   (prop-type "GParamString")
@@ -732,7 +674,7 @@
   (docs "")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
 (define-property not-null
@@ -773,7 +715,7 @@
 (define-property cnc-string
   (of-object "GdaMetaStore")
   (prop-type "GParamString")
-  (docs "")
+  (docs "Connection string for the internal connection to use")
   (readable #f)
   (writable #t)
   (construct-only #t)
@@ -782,7 +724,7 @@
 (define-property cnc
   (of-object "GdaMetaStore")
   (prop-type "GParamObject")
-  (docs "")
+  (docs "Connection object internally used")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -791,7 +733,7 @@
 (define-property catalog
   (of-object "GdaMetaStore")
   (prop-type "GParamString")
-  (docs "")
+  (docs "Catalog in which the database objects will be created")
   (readable #f)
   (writable #t)
   (construct-only #t)
@@ -800,7 +742,7 @@
 (define-property schema
   (of-object "GdaMetaStore")
   (prop-type "GParamString")
-  (docs "")
+  (docs "Schema in which the database objects will be created")
   (readable #f)
   (writable #t)
   (construct-only #t)
@@ -808,56 +750,25 @@
 
 ;; From GdaMetaStruct
 
-(define-property features
+(define-property meta-store
   (of-object "GdaMetaStruct")
-  (prop-type "GParamUInt")
-  (docs "")
+  (prop-type "GParamObject")
+  (docs "GdaMetaStore object to fetch information from")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GdaRow
-
-(define-signal value-changed
-  (of-object "GdaRow")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("GValue*" "p1")
-    '("GValue*" "p2")
-  )
-)
-
-(define-signal value-to-change
-  (of-object "GdaRow")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("GValue*" "p1")
-    '("GValue*" "p2")
-  )
-)
-
-(define-property model
-  (of-object "GdaRow")
-  (prop-type "GParamObject")
+(define-property features
+  (of-object "GdaMetaStruct")
+  (prop-type "GParamUInt")
   (docs "")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property values
-  (of-object "GdaRow")
-  (prop-type "GParamPointer")
-  (docs "")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
+;; From GdaRow
 
 (define-property nb-values
   (of-object "GdaRow")
@@ -899,7 +810,7 @@
   (construct-only #t)
 )
 
-(define-property provider-obj
+(define-property provider
   (of-object "GdaServerOperation")
   (prop-type "GParamObject")
   (docs "")
@@ -917,7 +828,7 @@
   (construct-only #t)
 )
 
-(define-property spec-file
+(define-property spec-filename
   (of-object "GdaServerOperation")
   (prop-type "GParamString")
   (docs "")
@@ -939,6 +850,22 @@
   )
 )
 
+(define-signal validate-holder-change
+  (of-object "GdaSet")
+  (return-type "gpointer")
+  (when "last")
+  (parameters
+    '("GdaHolder*" "p0")
+    '("gpointer" "p1")
+  )
+)
+
+(define-signal validate-set
+  (of-object "GdaSet")
+  (return-type "gpointer")
+  (when "last")
+)
+
 (define-signal holder-plugin-changed
   (of-object "GdaSet")
   (return-type "void")

Modified: libgdamm/trunk/libgda/src/metastruct.hg
==============================================================================
--- libgdamm/trunk/libgda/src/metastruct.hg	(original)
+++ libgdamm/trunk/libgda/src/metastruct.hg	Tue Sep 30 14:40:16 2008
@@ -49,22 +49,20 @@
 {
   _CLASS_GOBJECT(MetaStruct, GdaMetaStruct, GDA_META_STRUCT, Glib::Object, GObject)
 protected:
-  _WRAP_CTOR(MetaStruct(MetaStructFeature features), gda_meta_struct_new)
+  _WRAP_CTOR(MetaStruct(const Glib::RefPtr<MetaStore>& meta_store, MetaStructFeature features), gda_meta_struct_new)
 
 public:
-  _WRAP_CREATE(MetaStructFeature features)
+  _WRAP_CREATE(const Glib::RefPtr<MetaStore>& store, MetaStructFeature features)
   
-  _WRAP_METHOD(MetaDbObject* complement (const Glib::RefPtr<MetaStore>& store, MetaDbObjectType type, const Glib::ValueBase& catalog, const Glib::ValueBase& schema, const Glib::ValueBase& name), gda_meta_struct_complement, errthrow)
-  _WRAP_METHOD(bool complement_schema (const Glib::RefPtr<MetaStore>& store, const Glib::ValueBase& catalog, const Glib::ValueBase& schema), gda_meta_struct_complement_schema, errthrow)
-  _WRAP_METHOD(bool complement_default (const Glib::RefPtr<MetaStore>& store), gda_meta_struct_complement_default, errthrow)
-  _IGNORE(gda_meta_struct_complement_depend) // private API
+  _WRAP_METHOD(MetaDbObject* complement (MetaDbObjectType type, const Glib::ValueBase& catalog, const Glib::ValueBase& schema, const Glib::ValueBase& name), gda_meta_struct_complement, errthrow)
+  _WRAP_METHOD(bool complement_schema (const Glib::ValueBase& catalog, const Glib::ValueBase& schema), gda_meta_struct_complement_schema, errthrow)
+  _WRAP_METHOD(bool complement_default (), gda_meta_struct_complement_default, errthrow)
+  _IGNORE(gda_meta_struct_complement_depend) // private API   
 
   _WRAP_METHOD(bool sort_db_object (MetaSortType type), gda_meta_struct_sort_db_objects, errthrow)
   _WRAP_METHOD(MetaDbObject* get_db_object(const Glib::ValueBase& catalog, const Glib::ValueBase& schema, const Glib::ValueBase& name), gda_meta_struct_get_db_object)
   _WRAP_METHOD(MetaTableColumn* get_table_column(MetaTable* table, const Glib::ValueBase& col_name), gda_meta_struct_get_table_column)
-
   _WRAP_METHOD(Glib::ustring dump_as_graph(MetaGraphInfo info), gda_meta_struct_dump_as_graph, errthrow)
-
   _WRAP_PROPERTY("features", guint)
 };
 

Modified: libgdamm/trunk/libgda/src/row.hg
==============================================================================
--- libgdamm/trunk/libgda/src/row.hg	(original)
+++ libgdamm/trunk/libgda/src/row.hg	Tue Sep 30 14:40:16 2008
@@ -31,53 +31,17 @@
 namespace Gda
 {
 
-class DataModel;
-
-//TODO:
 class Row : public Glib::Object
 {
 protected:
   _CLASS_GOBJECT(Row, GdaRow, GDA_ROW, Glib::Object, GObject)
 
-  _WRAP_CTOR(Row(const Glib::RefPtr<DataModel>& model, int count), gda_row_new)
-
-//TODO: Use C++ type:
-  _WRAP_CTOR(Row(const Glib::RefPtr<DataModel>& model, const GList *values), gda_row_new_from_list)
+  _WRAP_CTOR(Row(int count), gda_row_new)
 
 public:
-  _WRAP_METHOD(Glib::RefPtr<Row> copy() const, gda_row_copy)
-  
-  _WRAP_CREATE(const Glib::RefPtr<DataModel>& model, int count)
-  _WRAP_CREATE(const Glib::RefPtr<DataModel>& model, const GList *values)
-
-  _WRAP_METHOD(int get_number() const, gda_row_get_number)
-  _WRAP_METHOD(void set_number(int number), gda_row_set_number)
-  _WRAP_METHOD(Glib::ustring get_id() const, gda_row_get_id)
-  _WRAP_METHOD(void set_id(const Glib::ustring& id), gda_row_set_id)
+  _WRAP_CREATE(int count)
 
   Glib::ValueBase get_value(int num) const;
-  _IGNORE(gda_row_get_value)
-
-  _WRAP_METHOD(bool set_value(int num, const Glib::ValueBase& value), gda_row_set_value)
-
-  _WRAP_METHOD(Glib::RefPtr<DataModel> get_model(), gda_row_get_model, refreturn)  
-  _WRAP_METHOD(Glib::RefPtr<const DataModel> get_model() const, gda_row_get_model, constversion) 
-
-  _WRAP_METHOD(void set_model(const Glib::RefPtr<DataModel>& model), gda_row_set_model)
-
-  _WRAP_METHOD(int get_length() const, gda_row_get_length)
-
-  _WRAP_METHOD(void set_is_default(int num, bool is_default = true), gda_row_set_is_default)
-  _WRAP_METHOD(bool get_is_default(int num) const, gda_row_get_is_default)
-
-  _WRAP_PROPERTY("model", Glib::RefPtr<DataModel>)
-  //These are not sensible for libgdamm:
-  //_WRAP_PROPERTY("values", GList*)
-  //_WRAP_PROPERTY("nb_values", int)
-  
-  // TODO: Check how to pass the GValue to this signal    
-  //_WRAP_SIGNAL(bool value_to_change(int num, const Glib::ValueBase& current, const Glib::ValueBase& proposed), "value-to-change", no_default_handler)
-  //_WRAP_SIGNAL(void value_changed(int num, const Glib::ValueBase& current, const Glib::ValueBase& proposed), "value-changed", no_default_handler)
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/serveroperation.hg
==============================================================================
--- libgdamm/trunk/libgda/src/serveroperation.hg	(original)
+++ libgdamm/trunk/libgda/src/serveroperation.hg	Tue Sep 30 14:40:16 2008
@@ -88,7 +88,6 @@
 
   _WRAP_PROPERTY("connection", Glib::RefPtr<Connection>)
   _WRAP_PROPERTY("op-type", gint)
-  _WRAP_PROPERTY("provider-obj", Glib::RefPtr<ServerProvider>)
 
  //TODO: vfuncs.
 };

Modified: libgdamm/trunk/libgda/src/set.hg
==============================================================================
--- libgdamm/trunk/libgda/src/set.hg	(original)
+++ libgdamm/trunk/libgda/src/set.hg	Tue Sep 30 14:40:16 2008
@@ -63,7 +63,7 @@
 
   _WRAP_METHOD(void merge_with_set (const Glib::RefPtr<Set>& set_to_merge), gda_set_merge_with_set)
   
-  _WRAP_METHOD(bool is_valid() const, gda_set_is_valid)
+  _WRAP_METHOD(bool is_valid() const, gda_set_is_valid, errthrow)
 
   _WRAP_METHOD(SetSource* get_source_for_model (const Glib::RefPtr<DataModel>& model), gda_set_get_source_for_model)
   _WRAP_METHOD(SetSource* get_source (const Glib::RefPtr<Holder>& param), gda_set_get_source)

Modified: libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc
==============================================================================
--- libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc	(original)
+++ libgdamm/trunk/tools/extra_defs_gen/generate_defs_gda.cc	Tue Sep 30 14:40:16 2008
@@ -31,7 +31,7 @@
     std::cout 
     << get_defs (GDA_TYPE_BATCH)
     << get_defs (GDA_TYPE_COLUMN)
-		<< get_defs (GDA_TYPE_CONFIG)
+    << get_defs (GDA_TYPE_CONFIG)
     << get_defs (GDA_TYPE_CONNECTION) 
     << get_defs (GDA_TYPE_CONNECTION_EVENT)
     << get_defs (GDA_TYPE_DATA_ACCESS_WRAPPER)
@@ -43,8 +43,6 @@
     << get_defs (GDA_TYPE_DATA_MODEL) 
     << get_defs (GDA_TYPE_DATA_MODEL_IMPORT) 
     << get_defs (GDA_TYPE_DATA_MODEL_ITER) 
-    << get_defs (GDA_TYPE_DATA_MODEL_QUERY) 
-    << get_defs (GDA_TYPE_DATA_MODEL_ROW)
     << get_defs (GDA_TYPE_DATA_PROXY) 
     << get_defs (GDA_TYPE_HOLDER)
     << get_defs (GDA_TYPE_META_STORE)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]