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

[jhs svn gnome org]

Author: jhs
Date: Sun Dec 21 17:31:02 2008
New Revision: 1899
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1899&view=rev

Log:
2008-12-21  Johannes Schmid  <jschmid openismus com>

	* libgda/src/connection.ccg:
	* libgda/src/libgda_methods.defs:
	Regenerated devs and fixed build

	* libgda/src/datamodel.hg:
	* libgda/src/datamodeliter.hg:
	Revert last change - it was wrong

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/connection.ccg
   libgdamm/trunk/libgda/src/datamodel.hg
   libgdamm/trunk/libgda/src/datamodeliter.hg
   libgdamm/trunk/libgda/src/libgda_methods.defs

Modified: libgdamm/trunk/libgda/src/connection.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.ccg	(original)
+++ libgdamm/trunk/libgda/src/connection.ccg	Sun Dec 21 17:31:02 2008
@@ -311,8 +311,8 @@
 #endif
 {
   GError* gerror = 0;
-  GdaMetaContext mcontext = {id.c_str(), 1, NULL, NULL};
-  const bool retvalue = gda_connection_update_meta_store(gobj(), mcontext, &gerror);
+  GdaMetaContext mcontext = {const_cast<gchar*>(id.c_str()), 1, NULL, NULL};
+  const bool retvalue = gda_connection_update_meta_store(gobj(), &mcontext, &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);

Modified: libgdamm/trunk/libgda/src/datamodel.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodel.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodel.hg	Sun Dec 21 17:31:02 2008
@@ -196,7 +196,7 @@
   // It is a bit strange that those are int GdaDataModel and not in GdaDataModelIter
   _WRAP_METHOD(bool iter_move_next_default(const Glib::RefPtr<DataModelIter>& iter), gda_data_model_iter_move_next_default)
   _WRAP_METHOD(bool iter_move_prev_default(const Glib::RefPtr<DataModelIter>& iter), gda_data_model_iter_move_prev_default)    
-  _WRAP_METHOD(bool iter_move_at_row_default(const Glib::RefPtr<DataModelIter>& iter, int row), gda_data_model_iter_move_at_row_default)    
+  _WRAP_METHOD(bool iter_move_to_row_default(const Glib::RefPtr<DataModelIter>& iter, int row), gda_data_model_iter_move_to_row_default)    
     
   //These are in a private header. Ignore them:
   _IGNORE(gda_data_model_changed, gda_data_model_row_inserted, gda_data_model_row_updated, gda_data_model_row_removed, 

Modified: libgdamm/trunk/libgda/src/datamodeliter.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodeliter.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodeliter.hg	Sun Dec 21 17:31:02 2008
@@ -58,7 +58,7 @@
  * move_prev() method. However if the iterator is invalid, moving backwards will 
  * not be possible (on the contrary to move_next() which moves to the first row).
  *
- * The move_at_row() method, if the iterator can be moved both forward and backwards,
+ * The move_to_row() method, if the iterator can be moved both forward and backwards,
  * can move the iterator to a specific row (sometimes faster than moving it forward or backwards a number of times).
  *
  * @ingroup DataModels
@@ -76,7 +76,7 @@
   _WRAP_METHOD(bool is_valid() const, gda_data_model_iter_is_valid)
   _WRAP_METHOD(bool move_next(), gda_data_model_iter_move_next)
   _WRAP_METHOD(bool move_prev(), gda_data_model_iter_move_prev)
-  _WRAP_METHOD(bool move_at_row(int row), gda_data_model_iter_move_at_row)
+  _WRAP_METHOD(bool move_to_row(int row), gda_data_model_iter_move_to_row)
   _WRAP_METHOD(int get_row() const, gda_data_model_iter_get_row)
   _WRAP_METHOD(void invalidate_contents(), gda_data_model_iter_invalidate_contents)
     

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Sun Dec 21 17:31:02 2008
@@ -96,13 +96,6 @@
   (gtype-id "GDA_TYPE_DATA_MODEL_IMPORT")
 )
 
-(define-object DataModelQuery
-  (in-module "Gda")
-  (parent "GObject")
-  (c-name "GdaDataModelQuery")
-  (gtype-id "GDA_TYPE_DATA_MODEL_QUERY")
-)
-
 (define-object DataProxy
   (in-module "Gda")
   (parent "GObject")
@@ -436,16 +429,6 @@
   )
 )
 
-(define-enum DataModelQueryError
-  (in-module "Gda")
-  (c-name "GdaDataModelQueryError")
-  (gtype-id "GDA_TYPE_DATA_MODEL_QUERY_ERROR")
-  (values
-    '("select-statement-error" "GDA_DATA_MODEL_QUERY_SELECT_STATEMENT_ERROR")
-    '("connection-error" "GDA_DATA_MODEL_QUERY_CONNECTION_ERROR")
-  )
-)
-
 (define-enum DataProxyError
   (in-module "Gda")
   (c-name "GdaDataProxyError")
@@ -475,10 +458,12 @@
   (c-name "GdaEasyCreateTableFlag")
   (gtype-id "GDA_TYPE_EASY_CREATE_TABLE_FLAG")
   (values
+    '("nothing-flag" "GDA_EASY_CREATE_TABLE_NOTHING_FLAG")
     '("pkey-flag" "GDA_EASY_CREATE_TABLE_PKEY_FLAG")
     '("not-null-flag" "GDA_EASY_CREATE_TABLE_NOT_NULL_FLAG")
     '("unique-flag" "GDA_EASY_CREATE_TABLE_UNIQUE_FLAG")
     '("autoinc-flag" "GDA_EASY_CREATE_TABLE_AUTOINC_FLAG")
+    '("fkey-flag" "GDA_EASY_CREATE_TABLE_FKEY_FLAG")
     '("pkey-autoinc-flag" "GDA_EASY_CREATE_TABLE_PKEY_AUTOINC_FLAG")
   )
 )
@@ -1134,6 +1119,7 @@
   (parameters
     '("const-gchar*" "attribute")
     '("const-GValue*" "value")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -2645,93 +2631,6 @@
 
 
 
-;; 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 "GdaDataModelQuery*")
-  (parameters
-    '("GdaConnection*" "cnc")
-    '("GdaStatement*" "select_stmt")
-    '("GdaSet*" "params")
-  )
-)
-
-(define-method refresh
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_refresh")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
-)
-
-(define-method set_row_selection_condition
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_set_row_selection_condition")
-  (return-type "gboolean")
-  (parameters
-    '("GdaSqlExpr*" "expr")
-    '("GError**" "error")
-  )
-)
-
-(define-method set_row_selection_condition_sql
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_set_row_selection_condition_sql")
-  (return-type "gboolean")
-  (parameters
-    '("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")
-  )
-)
-
-(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 compute_modification_statements
-  (of-object "GdaDataModelQuery")
-  (c-name "gda_data_model_query_compute_modification_statements")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
-)
-
-
-
 ;; From gda-data-proxy.h
 
 (define-function gda_data_proxy_get_type
@@ -3055,6 +2954,12 @@
   )
 )
 
+(define-method get_connection
+  (of-object "GdaDataSelect")
+  (c-name "gda_data_select_get_connection")
+  (return-type "GdaConnection*")
+)
+
 
 
 ;; From gda-debug-macros.h
@@ -3109,6 +3014,7 @@
   (c-name "gda_perform_create_database")
   (return-type "gboolean")
   (parameters
+    '("const-gchar*" "provider")
     '("GdaServerOperation*" "op")
     '("GError**" "error")
   )
@@ -3128,6 +3034,7 @@
   (c-name "gda_perform_drop_database")
   (return-type "gboolean")
   (parameters
+    '("const-gchar*" "provider")
     '("GdaServerOperation*" "op")
     '("GError**" "error")
   )
@@ -3649,6 +3556,7 @@
   (parameters
     '("const-gchar*" "attribute")
     '("const-GValue*" "value")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -3888,6 +3796,7 @@
   (parameters
     '("const-gchar*" "att_name")
     '("const-GValue*" "value")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -3949,6 +3858,15 @@
   )
 )
 
+(define-method complement_all
+  (of-object "GdaMetaStruct")
+  (c-name "gda_meta_struct_complement_all")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
 (define-method complement_depend
   (of-object "GdaMetaStruct")
   (c-name "gda_meta_struct_complement_depend")
@@ -4564,7 +4482,7 @@
   (parameters
     '("GdaConnection*" "cnc")
     '("const-gchar*" "string")
-    '("GType" "prefered_type")
+    '("GType" "preferred_type")
     '("gchar**" "dbms_type")
   )
 )
@@ -5287,6 +5205,14 @@
   )
 )
 
+(define-function gda_value_new_blob_from_file
+  (c-name "gda_value_new_blob_from_file")
+  (return-type "GValue*")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
 (define-function gda_value_new_timestamp_from_timet
   (c-name "gda_value_new_timestamp_from_timet")
   (return-type "GValue*")