gnomemm r1555 - in libgdamm/branches/libgdamm-4-0: libgda/src tools/extra_defs_gen tools/m4
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: gnomemm r1555 - in libgdamm/branches/libgdamm-4-0: libgda/src tools/extra_defs_gen tools/m4
- Date: Tue, 10 Jun 2008 10:24:13 +0000 (UTC)
Author: jhs
Date: Tue Jun 10 10:24:12 2008
New Revision: 1555
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1555&view=rev
Log:
2008-06-10 Johannes Schmid <johannes schmid openismus com>
* libgda/src/config.hg:
* libgda/src/connection.hg:
* libgda/src/datamodelarray.hg:
* libgda/src/datamodelimport.hg:
* libgda/src/datamodelquery.hg:
* libgda/src/dataproxy.hg:
* libgda/src/holder.hg:
* libgda/src/libgda_enums.defs:
* libgda/src/libgda_methods.defs:
* libgda/src/libgda_signals.defs:
* libgda/src/metastore.hg:
* libgda/src/metastruct.ccg:
* libgda/src/metastruct.hg:
* libgda/src/serveroperation.hg:
* libgda/src/set.ccg:
* libgda/src/set.hg:
* tools/extra_defs_gen/generate_defs_gda.cc:
* tools/m4/convert_libgdamm.m4:
Added all missing properties and wrapped missing methods
Modified:
libgdamm/branches/libgdamm-4-0/libgda/src/config.hg
libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg
libgdamm/branches/libgdamm-4-0/libgda/src/datamodelarray.hg
libgdamm/branches/libgdamm-4-0/libgda/src/datamodelimport.hg
libgdamm/branches/libgdamm-4-0/libgda/src/datamodelquery.hg
libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg
libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg
libgdamm/branches/libgdamm-4-0/libgda/src/libgda_enums.defs
libgdamm/branches/libgdamm-4-0/libgda/src/libgda_methods.defs
libgdamm/branches/libgdamm-4-0/libgda/src/libgda_signals.defs
libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg
libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg
libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg
libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg
libgdamm/branches/libgdamm-4-0/libgda/src/set.ccg
libgdamm/branches/libgdamm-4-0/libgda/src/set.hg
libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc
libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/config.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/config.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/config.hg Tue Jun 10 10:24:12 2008
@@ -56,6 +56,11 @@
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);
+
+ // TODO: Signal -> marshallers
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/connection.hg Tue Jun 10 10:24:12 2008
@@ -98,17 +98,11 @@
_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)
- //TODO: Use ListHandle, and watch out because the C function frees the input list parameter.
- //However, this is not high-priority because this is apparently just a convenience function.
- //You canuse add_event() repeatedly instead.
- //_WRAP_METHOD(void add_events_list(GList *error_list), gda_connection_add_events_list)
- _IGNORE(gda_connection_add_events_list)
+ #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)
- #m4 //Use deep ownership because we own both the list and its elements;
- #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<DataModel> >',`$2($3, Glib::OWNERSHIP_SHALLOW)')
-
_WRAP_METHOD_DOCS_ONLY(gda_connection_statement_execute)
#ifdef GLIBMM_EXCEPTIONS_ENABLED
Glib::RefPtr<Glib::Object> statement_execute(const Glib::RefPtr<Statement>& cmd, const Glib::RefPtr<Set>& params, StatementModelUsage model_usage, Glib::RefPtr<Set>& last_inserted_row);
@@ -180,6 +174,13 @@
_WRAP_SIGNAL(void conn_closed(), "conn_closed")
_WRAP_SIGNAL(void dsn_changed(), "dsn_changed")
_WRAP_SIGNAL(void transaction_status_changed(), "transaction_status_changed")
+
+ _WRAP_PROPERTY("auth-string", Glib::ustring)
+ _WRAP_PROPERTY("cnc-string", Glib::ustring)
+ _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/branches/libgdamm-4-0/libgda/src/datamodelarray.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/datamodelarray.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/datamodelarray.hg Tue Jun 10 10:24:12 2008
@@ -48,9 +48,7 @@
_WRAP_METHOD(void set_n_columns(int cols), gda_data_model_array_set_n_columns)
_WRAP_METHOD(void clear(), gda_data_model_array_clear)
-//TODO: gmmproc can't handle the errthrow with a static, it seems, so hand code:
-//#m4 _CONVERSION(`GdaDataModel*',`Glib::RefPtr<DataModelArray>',`Glib::wrap((GdaDataModelArray*)$3)')
-// _WRAP_METHOD(static Glib::RefPtr<DataModelArray> copy(const Glib::RefPtr<const DataModel>& src) const, gda_data_model_array_copy_model, errthrow)
+ _WRAP_PROPERTY("n-columns", guint);
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/datamodelimport.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/datamodelimport.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/datamodelimport.hg Tue Jun 10 10:24:12 2008
@@ -21,6 +21,7 @@
#include <glibmm/object.h>
#include <libgdamm/datamodelrow.h>
+#include <libgdamm/set.h>
_DEFS(libgdamm,libgda)
_PINCLUDE(libgdamm/private/datamodelrow_p.h)
@@ -77,6 +78,13 @@
_WRAP_METHOD(GSList* get_errors(), gda_data_model_import_get_errors)
_WRAP_METHOD(void clean_errors(), gda_data_model_import_clean_errors)
+
+ _WRAP_PROPERTY("data-string", Glib::ustring)
+ _WRAP_PROPERTY("filename", std::string)
+ _WRAP_PROPERTY("options", Glib::RefPtr<Set>)
+ _WRAP_PROPERTY("random-access", bool)
+ #m4 _EQUAL(gpointer, xmlNodePtr)
+ _WRAP_PROPERTY("xml-node", xmlNodePtr)
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/datamodelquery.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/datamodelquery.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/datamodelquery.hg Tue Jun 10 10:24:12 2008
@@ -67,6 +67,12 @@
_WRAP_METHOD(bool refresh(), gda_data_model_query_refresh, errthrow)
_WRAP_METHOD(bool set_modification_query(const Glib::RefPtr<Statement>& query), gda_data_model_query_set_modification_query, errthrow)
_WRAP_METHOD(bool compute_modification_queries(const Glib::ustring& target, DataModelQueryOptions options), gda_data_model_query_compute_modification_queries, errthrow)
+
+ _WRAP_PROPERTY("connection", Glib::RefPtr<Connection>)
+ _WRAP_PROPERTY("delete-query", Glib::RefPtr<Statement>)
+ _WRAP_PROPERTY("insert-query", Glib::RefPtr<Statement>)
+ _WRAP_PROPERTY("update-query", Glib::RefPtr<Statement>)
+ _WRAP_PROPERTY("use-transaction", bool)
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg Tue Jun 10 10:24:12 2008
@@ -106,6 +106,8 @@
_WRAP_PROPERTY("model", Glib::RefPtr<DataModel>)
_WRAP_PROPERTY("prepend-null-entry", bool)
+ _WRAP_PROPERTY("defer-sync", bool)
+ _WRAP_PROPERTY("sample-size", int)
_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")
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/holder.hg Tue Jun 10 10:24:12 2008
@@ -71,8 +71,7 @@
_WRAP_METHOD(void set_bind (const Glib::RefPtr<Holder>& bind_to), gda_holder_set_bind)
_WRAP_METHOD(Glib::RefPtr<Holder> get_bind(), gda_holder_get_bind)
- // TODO:
- /*_WRAP_PROPERTY("description", Glib::ustring)
+ _WRAP_PROPERTY("description", Glib::ustring)
_WRAP_PROPERTY("full-bind", Glib::RefPtr<Holder>)
_WRAP_PROPERTY("g-type", gulong)
_WRAP_PROPERTY("id", Glib::ustring)
@@ -80,9 +79,8 @@
_WRAP_PROPERTY("not-null", bool)
_WRAP_PROPERTY("simple-bind", Glib::RefPtr<Holder>)
_WRAP_PROPERTY("plugin", Glib::ustring)
- _WRAP_PROPERTY("simple-bind", Glib::RefPtr<Holder>)
_WRAP_PROPERTY("source-column", int)
- _WRAP_PROPERTY("source-model", Glib::RefPtr<DataModel)*/
+ _WRAP_PROPERTY("source-model", Glib::RefPtr<DataModel>)
_WRAP_SIGNAL(void changed(), "changed")
_WRAP_SIGNAL(void source_changed(), "source-changed")
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/libgda_enums.defs
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/libgda_enums.defs (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/libgda_enums.defs Tue Jun 10 10:24:12 2008
@@ -133,7 +133,8 @@
'("updatable-cursor" "GDA_CONNECTION_FEATURE_UPDATABLE_CURSOR" "12")
'("users" "GDA_CONNECTION_FEATURE_USERS" "13")
'("views" "GDA_CONNECTION_FEATURE_VIEWS" "14")
- '("last" "GDA_CONNECTION_FEATURE_LAST" "15")
+ '("xa-transactions" "GDA_CONNECTION_FEATURE_XA_TRANSACTIONS" "15")
+ '("last" "GDA_CONNECTION_FEATURE_LAST" "16")
)
)
@@ -460,7 +461,7 @@
'("drop-index" "GDA_SERVER_OPERATION_DROP_INDEX" "8")
'("create-view" "GDA_SERVER_OPERATION_CREATE_VIEW" "9")
'("drop-view" "GDA_SERVER_OPERATION_DROP_VIEW" "10")
- '("nb" "GDA_SERVER_OPERATION_NB" "11")
+ '("last" "GDA_SERVER_OPERATION_LAST" "11")
)
)
@@ -503,6 +504,7 @@
'("internal-error" "GDA_SERVER_PROVIDER_INTERNAL_ERROR" "6")
'("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")
)
)
@@ -587,6 +589,17 @@
)
)
+;; From /usr/include/libgda-4.0/libgda/gda-xa-transaction.h
+
+(define-enum-extended XaTransactionError
+ (in-module "Gda")
+ (c-name "GdaXaTransactionError")
+ (values
+ '("already-registered-error" "GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR" "0")
+ '("dtp-not-supported-error" "GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR" "1")
+ )
+)
+
;; From /usr/include/libgda-4.0/sql-parser/gda-sql-parser.h
(define-enum-extended SqlParserError
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/libgda_methods.defs (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/libgda_methods.defs Tue Jun 10 10:24:12 2008
@@ -215,6 +215,13 @@
(gtype-id "GDA_TYPE_TRANSACTION_STATUS")
)
+(define-object XaTransaction
+ (in-module "Gda")
+ (parent "GObject")
+ (c-name "GdaXaTransaction")
+ (gtype-id "GDA_TYPE_XA_TRANSACTION")
+)
+
;; Enumerations and flags ...
(define-enum ClientEvent
@@ -351,6 +358,7 @@
'("updatable-cursor" "GDA_CONNECTION_FEATURE_UPDATABLE_CURSOR")
'("users" "GDA_CONNECTION_FEATURE_USERS")
'("views" "GDA_CONNECTION_FEATURE_VIEWS")
+ '("xa-transactions" "GDA_CONNECTION_FEATURE_XA_TRANSACTIONS")
'("last" "GDA_CONNECTION_FEATURE_LAST")
)
)
@@ -682,7 +690,7 @@
'("drop-index" "GDA_SERVER_OPERATION_DROP_INDEX")
'("create-view" "GDA_SERVER_OPERATION_CREATE_VIEW")
'("drop-view" "GDA_SERVER_OPERATION_DROP_VIEW")
- '("nb" "GDA_SERVER_OPERATION_NB")
+ '("last" "GDA_SERVER_OPERATION_LAST")
)
)
@@ -726,6 +734,7 @@
'("internal-error" "GDA_SERVER_PROVIDER_INTERNAL_ERROR")
'("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")
)
)
@@ -811,6 +820,16 @@
)
)
+(define-enum XaTransactionError
+ (in-module "Gda")
+ (c-name "GdaXaTransactionError")
+ (gtype-id "GDA_TYPE_XA_TRANSACTION_ERROR")
+ (values
+ '("already-registered-error" "GDA_XA_TRANSACTION_ALREADY_REGISTERED_ERROR")
+ '("dtp-not-supported-error" "GDA_XA_TRANSACTION_DTP_NOT_SUPPORTED_ERROR")
+ )
+)
+
;; From gda-batch.h
@@ -3866,6 +3885,11 @@
(return-type "GType")
)
+(define-function gda_xa_transaction_error_get_type
+ (c-name "gda_xa_transaction_error_get_type")
+ (return-type "GType")
+)
+
;; From gda-holder.h
@@ -6134,6 +6158,97 @@
+;; From gda-xa-transaction.h
+
+(define-function gda_xa_transaction_get_type
+ (c-name "gda_xa_transaction_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_xa_transaction_new
+ (c-name "gda_xa_transaction_new")
+ (is-constructor-of "GdaXaTransaction")
+ (return-type "GdaXaTransaction*")
+ (parameters
+ '("guint32" "format")
+ '("const-gchar*" "global_transaction_id")
+ )
+)
+
+(define-method register_connection
+ (of-object "GdaXaTransaction")
+ (c-name "gda_xa_transaction_register_connection")
+ (return-type "gboolean")
+ (parameters
+ '("GdaConnection*" "cnc")
+ '("const-gchar*" "branch")
+ '("GError**" "error")
+ )
+)
+
+(define-method unregister_connection
+ (of-object "GdaXaTransaction")
+ (c-name "gda_xa_transaction_unregister_connection")
+ (return-type "none")
+ (parameters
+ '("GdaConnection*" "cnc")
+ )
+)
+
+(define-method begin
+ (of-object "GdaXaTransaction")
+ (c-name "gda_xa_transaction_begin")
+ (return-type "gboolean")
+ (parameters
+ '("GError**" "error")
+ )
+)
+
+(define-method commit
+ (of-object "GdaXaTransaction")
+ (c-name "gda_xa_transaction_commit")
+ (return-type "gboolean")
+ (parameters
+ '("GSList**" "cnc_to_recover")
+ '("GError**" "error")
+ )
+)
+
+(define-method rollback
+ (of-object "GdaXaTransaction")
+ (c-name "gda_xa_transaction_rollback")
+ (return-type "gboolean")
+ (parameters
+ '("GError**" "error")
+ )
+)
+
+(define-method commit_recovered
+ (of-object "GdaXaTransaction")
+ (c-name "gda_xa_transaction_commit_recovered")
+ (return-type "gboolean")
+ (parameters
+ '("GSList**" "cnc_to_recover")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_string
+ (of-object "GdaXaTransactionId")
+ (c-name "gda_xa_transaction_id_to_string")
+ (return-type "const-gchar*")
+)
+
+(define-function gda_xa_transaction_string_to_id
+ (c-name "gda_xa_transaction_string_to_id")
+ (return-type "GdaXaTransactionId*")
+ (parameters
+ '("const-gchar*" "str")
+ )
+)
+
+
+
;; From libgda.h
(define-function gda_init
@@ -6318,6 +6433,55 @@
)
+;; From gda-sql-parser-enum-types.h
+
+(define-function gda_sql_parser_error_get_type
+ (c-name "gda_sql_parser_error_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_parser_mode_get_type
+ (c-name "gda_sql_parser_mode_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_parser_flavour_get_type
+ (c-name "gda_sql_parser_flavour_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_error_type_get_type
+ (c-name "gda_sql_error_type_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_statement_type_get_type
+ (c-name "gda_sql_statement_type_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_any_part_type_get_type
+ (c-name "gda_sql_any_part_type_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_statement_compound_type_get_type
+ (c-name "gda_sql_statement_compound_type_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_operator_type_get_type
+ (c-name "gda_sql_operator_type_get_type")
+ (return-type "GType")
+)
+
+(define-function gda_sql_select_join_type_get_type
+ (c-name "gda_sql_select_join_type_get_type")
+ (return-type "GType")
+)
+
+
+
;; From gda-sql-parser.h
(define-function gda_sql_parser_get_type
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/libgda_signals.defs
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/libgda_signals.defs (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/libgda_signals.defs Tue Jun 10 10:24:12 2008
@@ -1,3 +1,14 @@
+;; From GdaBatch
+
+(define-signal changed
+ (of-object "GdaBatch")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("GObject*" "p0")
+ )
+)
+
;; From GdaColumn
(define-signal name-changed
@@ -28,12 +39,57 @@
(construct-only #f)
)
-;; From GdaConnectionEvent
+;; From GdaConfig
-(define-property type
- (of-object "GdaConnectionEvent")
- (prop-type "GParamInt")
- (docs "Connection event type")
+(define-signal dsn-changed
+ (of-object "GdaConfig")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("gpointer" "p0")
+ )
+)
+
+(define-signal dsn-added
+ (of-object "GdaConfig")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("gpointer" "p0")
+ )
+)
+
+(define-signal dsn-to-be-removed
+ (of-object "GdaConfig")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("gpointer" "p0")
+ )
+)
+
+(define-signal dsn-removed
+ (of-object "GdaConfig")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("gpointer" "p0")
+ )
+)
+
+(define-property user-file
+ (of-object "GdaConfig")
+ (prop-type "GParamString")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property system-file
+ (of-object "GdaConfig")
+ (prop-type "GParamString")
+ (docs "")
(readable #t)
(writable #t)
(construct-only #f)
@@ -134,6 +190,28 @@
(construct-only #f)
)
+;; From GdaConnectionEvent
+
+(define-property type
+ (of-object "GdaConnectionEvent")
+ (prop-type "GParamInt")
+ (docs "Connection event type")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GdaDataAccessWrapper
+
+(define-property model
+ (of-object "GdaDataAccessWrapper")
+ (prop-type "GParamObject")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
;; From GdaDataComparator
(define-signal diff-computed
@@ -163,6 +241,8 @@
(construct-only #f)
)
+;; From GdaDataHandler
+
;; From GdaDataModelArray
(define-property read-only
@@ -203,62 +283,17 @@
(construct-only #t)
)
-;; From GdaDataModelQuery
+;; From GdaDataModelDir
-(define-property query
- (of-object "GdaDataModelQuery")
- (prop-type "GParamObject")
- (docs "SELECT Query to be executed to populate the model with data")
+(define-property basedir
+ (of-object "GdaDataModelDir")
+ (prop-type "GParamString")
+ (docs "")
(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 GdaDataModel
(define-signal reset
@@ -300,6 +335,53 @@
)
)
+;; From GdaDataModelImport
+
+(define-property random-access
+ (of-object "GdaDataModelImport")
+ (prop-type "GParamBoolean")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property filename
+ (of-object "GdaDataModelImport")
+ (prop-type "GParamString")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property data-string
+ (of-object "GdaDataModelImport")
+ (prop-type "GParamString")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property xml-node
+ (of-object "GdaDataModelImport")
+ (prop-type "GParamPointer")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property options
+ (of-object "GdaDataModelImport")
+ (prop-type "GParamObject")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
;; From GdaDataModelIter
(define-signal row-to-change
@@ -398,62 +480,60 @@
(construct-only #f)
)
-;; From GdaDataModelImport
+;; From GdaDataModelQuery
-(define-property random-access
- (of-object "GdaDataModelImport")
- (prop-type "GParamBoolean")
- (docs "")
+(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 filename
- (of-object "GdaDataModelImport")
- (prop-type "GParamString")
- (docs "")
+(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 #t)
+ (construct-only #f)
)
-(define-property data-string
- (of-object "GdaDataModelImport")
- (prop-type "GParamString")
- (docs "")
+(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 #t)
+ (construct-only #f)
)
-(define-property xml-node
- (of-object "GdaDataModelImport")
- (prop-type "GParamPointer")
- (docs "")
+(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 #t)
+ (construct-only #f)
)
-(define-property options
- (of-object "GdaDataModelImport")
- (prop-type "GParamObject")
- (docs "")
+(define-property use-transaction
+ (of-object "GdaDataModelQuery")
+ (prop-type "GParamBoolean")
+ (docs "Run modification statements within a transaction")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-;; From GdaDataModelDir
-
-(define-property basedir
- (of-object "GdaDataModelDir")
- (prop-type "GParamString")
- (docs "")
+(define-property connection
+ (of-object "GdaDataModelQuery")
+ (prop-type "GParamObject")
+ (docs "Connection to use to execute statements")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
;; From GdaDataModelRow
@@ -467,17 +547,6 @@
(construct-only #f)
)
-;; From GdaDataAccessWrapper
-
-(define-property model
- (of-object "GdaDataAccessWrapper")
- (prop-type "GParamObject")
- (docs "")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
;; From GdaDataProxy
(define-signal row-delete-changed
@@ -571,143 +640,110 @@
(construct-only #f)
)
-;; From GdaRow
+;; From GdaHolder
-(define-signal value-changed
- (of-object "GdaRow")
+(define-signal source-changed
+ (of-object "GdaHolder")
(return-type "void")
- (when "last")
- (parameters
- '("gint" "p0")
- '("GValue*" "p1")
- '("GValue*" "p2")
- )
+ (when "first")
)
-(define-signal value-to-change
- (of-object "GdaRow")
- (return-type "gboolean")
- (when "last")
- (parameters
- '("gint" "p0")
- '("GValue*" "p1")
- '("GValue*" "p2")
- )
+(define-signal changed
+ (of-object "GdaHolder")
+ (return-type "void")
+ (when "first")
)
-(define-property model
- (of-object "GdaRow")
- (prop-type "GParamObject")
+(define-property id
+ (of-object "GdaHolder")
+ (prop-type "GParamString")
(docs "")
(readable #t)
(writable #t)
(construct-only #f)
)
-(define-property values
- (of-object "GdaRow")
- (prop-type "GParamPointer")
+(define-property name
+ (of-object "GdaHolder")
+ (prop-type "GParamString")
(docs "")
- (readable #f)
+ (readable #t)
(writable #t)
(construct-only #f)
)
-(define-property nb-values
- (of-object "GdaRow")
- (prop-type "GParamInt")
+(define-property description
+ (of-object "GdaHolder")
+ (prop-type "GParamString")
(docs "")
- (readable #f)
+ (readable #t)
(writable #t)
(construct-only #f)
)
-;; From GdaServerOperation
-
-(define-signal sequence-item-added
- (of-object "GdaServerOperation")
- (return-type "void")
- (when "first")
- (parameters
- '("const-gchar*" "p0")
- '("gint" "p1")
- )
+(define-property plugin
+ (of-object "GdaHolder")
+ (prop-type "GParamString")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
)
-(define-signal sequence-item-remove
- (of-object "GdaServerOperation")
- (return-type "void")
- (when "first")
- (parameters
- '("const-gchar*" "p0")
- '("gint" "p1")
- )
+(define-property simple-bind
+ (of-object "GdaHolder")
+ (prop-type "GParamObject")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
)
-(define-property connection
- (of-object "GdaServerOperation")
+(define-property full-bind
+ (of-object "GdaHolder")
(prop-type "GParamObject")
(docs "")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-(define-property provider-obj
- (of-object "GdaServerOperation")
+(define-property source-model
+ (of-object "GdaHolder")
(prop-type "GParamObject")
(docs "")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-(define-property op-type
- (of-object "GdaServerOperation")
+(define-property source-column
+ (of-object "GdaHolder")
(prop-type "GParamInt")
(docs "")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-(define-property spec-file
- (of-object "GdaServerOperation")
- (prop-type "GParamString")
+(define-property g-type
+ (of-object "GdaHolder")
+ (prop-type "GParamULong")
(docs "")
- (readable #f)
+ (readable #t)
(writable #t)
(construct-only #t)
)
-;; From GdaServerProvider
-
-;; From GdaThreader
-
-(define-signal finished
- (of-object "GdaThreader")
- (return-type "void")
- (when "first")
- (parameters
- '("guint" "p0")
- '("gpointer" "p1")
- )
-)
-
-(define-signal cancelled
- (of-object "GdaThreader")
- (return-type "void")
- (when "first")
- (parameters
- '("guint" "p0")
- '("gpointer" "p1")
- )
+(define-property not-null
+ (of-object "GdaHolder")
+ (prop-type "GParamBoolean")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
)
-;; From GdaTransactionStatus
-
-;; From GdaDataHandler
-
;; From GdaMetaStore
(define-signal suggest-update
@@ -781,147 +817,116 @@
(construct-only #t)
)
-;; From GdaStatement
-
-(define-signal reset
- (of-object "GdaStatement")
- (return-type "void")
- (when "first")
-)
+;; From GdaRow
-(define-signal checked
- (of-object "GdaStatement")
+(define-signal value-changed
+ (of-object "GdaRow")
(return-type "void")
- (when "first")
+ (when "last")
(parameters
- '("GdaConnection*" "p0")
- '("gboolean" "p1")
+ '("gint" "p0")
+ '("GValue*" "p1")
+ '("GValue*" "p2")
)
)
-(define-property structure
- (of-object "GdaStatement")
- (prop-type "GParamPointer")
- (docs "")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-;; From GdaBatch
-
-(define-signal changed
- (of-object "GdaBatch")
- (return-type "void")
- (when "first")
+(define-signal value-to-change
+ (of-object "GdaRow")
+ (return-type "gboolean")
+ (when "last")
(parameters
- '("GObject*" "p0")
+ '("gint" "p0")
+ '("GValue*" "p1")
+ '("GValue*" "p2")
)
)
-;; From GdaHolder
-
-(define-signal source-changed
- (of-object "GdaHolder")
- (return-type "void")
- (when "first")
-)
-
-(define-signal changed
- (of-object "GdaHolder")
- (return-type "void")
- (when "first")
-)
-
-(define-property id
- (of-object "GdaHolder")
- (prop-type "GParamString")
+(define-property model
+ (of-object "GdaRow")
+ (prop-type "GParamObject")
(docs "")
(readable #t)
(writable #t)
(construct-only #f)
)
-(define-property name
- (of-object "GdaHolder")
- (prop-type "GParamString")
+(define-property values
+ (of-object "GdaRow")
+ (prop-type "GParamPointer")
(docs "")
- (readable #t)
+ (readable #f)
(writable #t)
(construct-only #f)
)
-(define-property description
- (of-object "GdaHolder")
- (prop-type "GParamString")
+(define-property nb-values
+ (of-object "GdaRow")
+ (prop-type "GParamInt")
(docs "")
- (readable #t)
+ (readable #f)
(writable #t)
(construct-only #f)
)
-(define-property plugin
- (of-object "GdaHolder")
- (prop-type "GParamString")
- (docs "")
- (readable #t)
- (writable #t)
- (construct-only #f)
+;; From GdaServerOperation
+
+(define-signal sequence-item-added
+ (of-object "GdaServerOperation")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("const-gchar*" "p0")
+ '("gint" "p1")
+ )
)
-(define-property simple-bind
- (of-object "GdaHolder")
- (prop-type "GParamObject")
- (docs "")
- (readable #t)
- (writable #t)
- (construct-only #f)
+(define-signal sequence-item-remove
+ (of-object "GdaServerOperation")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("const-gchar*" "p0")
+ '("gint" "p1")
+ )
)
-(define-property full-bind
- (of-object "GdaHolder")
+(define-property connection
+ (of-object "GdaServerOperation")
(prop-type "GParamObject")
(docs "")
(readable #t)
(writable #t)
- (construct-only #f)
+ (construct-only #t)
)
-(define-property source-model
- (of-object "GdaHolder")
+(define-property provider-obj
+ (of-object "GdaServerOperation")
(prop-type "GParamObject")
(docs "")
(readable #t)
(writable #t)
- (construct-only #f)
+ (construct-only #t)
)
-(define-property source-column
- (of-object "GdaHolder")
+(define-property op-type
+ (of-object "GdaServerOperation")
(prop-type "GParamInt")
(docs "")
(readable #t)
(writable #t)
- (construct-only #f)
+ (construct-only #t)
)
-(define-property g-type
- (of-object "GdaHolder")
- (prop-type "GParamULong")
+(define-property spec-file
+ (of-object "GdaServerOperation")
+ (prop-type "GParamString")
(docs "")
- (readable #t)
+ (readable #f)
(writable #t)
(construct-only #t)
)
-(define-property not-null
- (of-object "GdaHolder")
- (prop-type "GParamBoolean")
- (docs "")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
+;; From GdaServerProvider
;; From GdaSet
@@ -994,6 +999,57 @@
(construct-only #t)
)
+;; From GdaStatement
+
+(define-signal reset
+ (of-object "GdaStatement")
+ (return-type "void")
+ (when "first")
+)
+
+(define-signal checked
+ (of-object "GdaStatement")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("GdaConnection*" "p0")
+ '("gboolean" "p1")
+ )
+)
+
+(define-property structure
+ (of-object "GdaStatement")
+ (prop-type "GParamPointer")
+ (docs "")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+;; From GdaThreader
+
+(define-signal finished
+ (of-object "GdaThreader")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("guint" "p0")
+ '("gpointer" "p1")
+ )
+)
+
+(define-signal cancelled
+ (of-object "GdaThreader")
+ (return-type "void")
+ (when "first")
+ (parameters
+ '("guint" "p0")
+ '("gpointer" "p1")
+ )
+)
+
+;; From GdaTransactionStatus
+
;; From GdaSqlParser
(define-property tokenizer-flavour
@@ -1032,31 +1088,4 @@
(construct-only #f)
)
-;; From GdaStatement
-
-(define-signal reset
- (of-object "GdaStatement")
- (return-type "void")
- (when "first")
-)
-
-(define-signal checked
- (of-object "GdaStatement")
- (return-type "void")
- (when "first")
- (parameters
- '("GdaConnection*" "p0")
- '("gboolean" "p1")
- )
-)
-
-(define-property structure
- (of-object "GdaStatement")
- (prop-type "GParamPointer")
- (docs "")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/metastore.hg Tue Jun 10 10:24:12 2008
@@ -69,9 +69,11 @@
_WRAP_METHOD(bool schema_remove_custom_object(const Glib::ustring& obj_name), gda_meta_store_schema_remove_custom_object, errthrow)
_WRAP_METHOD(Glib::RefPtr<Connection> get_internal_connection(), gda_meta_store_get_internal_connection)
- //TODO Properties
+ // The rest of the properties is Write / Construct Only
+ _WRAP_PROPERTY("cnc", Glib::RefPtr<Connection>)
- //TODO Signals
+ _WRAP_SIGNAL(void meta_reset(), "meta-reset")
+ // TODO: meta-changed and suggest-update => marshallers
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.ccg Tue Jun 10 10:24:12 2008
@@ -20,6 +20,7 @@
*/
#include <libgdamm/metastruct.h>
+#include <libgdamm/metastore.h>
#include <libgda/gda-enum-types.h>
namespace Gnome
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/metastruct.hg Tue Jun 10 10:24:12 2008
@@ -31,6 +31,15 @@
{
_WRAP_ENUM(MetaStructFeature, GdaMetaStructFeature)
+_WRAP_ENUM(MetaDbObjectType, GdaMetaDbObjectType)
+_WRAP_ENUM(MetaSortType, GdaMetaSortType)
+_WRAP_ENUM(MetaGraphInfo, GdaMetaGraphInfo)
+
+typedef GdaMetaDbObject MetaDbObject;
+typedef GdaMetaTable MetaTable;
+typedef GdaMetaTableColumn MetaTableColumn;
+
+class MetaStore;
/** Container for several values
*
@@ -45,7 +54,18 @@
public:
_WRAP_CREATE(MetaStructFeature features)
- // TODO
+ _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(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)
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg Tue Jun 10 10:24:12 2008
@@ -33,6 +33,7 @@
class Connection;
+class ServerProvider;
//_WRAP_ENUM(ClientSpecsType, GdaClientSpecsType)
_WRAP_ENUM(ServerOperationNodeType, GdaServerOperationNodeType)
@@ -82,9 +83,13 @@
_WRAP_METHOD(guint add_item_to_sequence(const std::string& item_path), gda_server_operation_add_item_to_sequence)
_WRAP_METHOD(Glib::StringArrayHandle get_root_nodes(), gda_server_operation_get_root_nodes);
+ //TODO: marshallers
//_WRAP_SIGNAL(void signal_sequence_item_added(const Glib::ustring& arg1, int arg2), "sequence-item-added")
//_WRAP_SIGNAL(void signal_sequence_item_remove(const Glib::ustring& arg1, int arg2), "sequence-item-remove")
+ _WRAP_PROPERTY("connection", Glib::RefPtr<Connection>)
+ _WRAP_PROPERTY("op-type", gint)
+ _WRAP_PROPERTY("provider-obj", Glib::RefPtr<ServerProvider>)
//TODO: vfuncs.
};
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/set.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/set.ccg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/set.ccg Tue Jun 10 10:24:12 2008
@@ -37,6 +37,11 @@
return retval;
}
+template<class T> bool Set::set_holder_value(const Glib::ustring& id, T value)
+{
+ return gda_set_set_holder_value (gobj(), id.c_str(), value);
+}
+
} /* namespace Gda */
} /* namespace Gnome */
Modified: libgdamm/branches/libgdamm-4-0/libgda/src/set.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/set.hg (original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/set.hg Tue Jun 10 10:24:12 2008
@@ -54,8 +54,8 @@
_WRAP_METHOD(Glib::ustring get_spec(), gda_set_get_spec)
_WRAP_METHOD_DOCS_ONLY(gda_set_get_holder_value)
Glib::ValueBase get_holder_value(const Glib::ustring& holder_id);
- // TODO:
- //_WRAP_METHOD(bool set_holder_value())
+ _WRAP_METHOD_DOCS_ONLY(gda_set_set_holder_value)
+ template<class T> bool set_holder_value(const Glib::ustring& id, T value);
_WRAP_METHOD(Glib::RefPtr<Holder> get_holder (const Glib::ustring& holder_id), gda_set_get_holder)
_WRAP_METHOD(void add_holder (const Glib::RefPtr<Holder>& holder), gda_set_add_holder)
@@ -74,6 +74,10 @@
_WRAP_SIGNAL(void holder_changed (const Glib::RefPtr<Holder>& holder), "holder-changed")
_WRAP_SIGNAL(void holder_plugin_changed (const Glib::RefPtr<Holder>& holder), "holder-plugin-changed")
_WRAP_SIGNAL(void public_data_changed (), "public-data-changed")
+
+ _WRAP_PROPERTY("description", Glib::ustring)
+ _WRAP_PROPERTY("id", Glib::ustring)
+ _WRAP_PROPERTY("name", Glib::ustring)
};
} // namespace Gda
Modified: libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc
==============================================================================
--- libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc (original)
+++ libgdamm/branches/libgdamm-4-0/tools/extra_defs_gen/generate_defs_gda.cc Tue Jun 10 10:24:12 2008
@@ -28,34 +28,35 @@
{
gda_init();
- std::cout << get_defs (GDA_TYPE_COLUMN)
- << get_defs (GDA_TYPE_CONNECTION_EVENT)
+ std::cout
+ << get_defs (GDA_TYPE_BATCH)
+ << get_defs (GDA_TYPE_COLUMN)
+ << get_defs (GDA_TYPE_CONFIG)
<< get_defs (GDA_TYPE_CONNECTION)
- << get_defs (GDA_TYPE_DATA_COMPARATOR)
+ << get_defs (GDA_TYPE_CONNECTION_EVENT)
+ << get_defs (GDA_TYPE_DATA_ACCESS_WRAPPER)
+ << get_defs (GDA_TYPE_DATA_COMPARATOR)
+ << get_defs (GDA_TYPE_DATA_HANDLER)
<< get_defs (GDA_TYPE_DATA_MODEL_ARRAY)
<< get_defs (GDA_TYPE_DATA_MODEL_BDB)
- << get_defs (GDA_TYPE_DATA_MODEL_QUERY)
+ << get_defs (GDA_TYPE_DATA_MODEL_DIR)
<< get_defs (GDA_TYPE_DATA_MODEL)
- << get_defs (GDA_TYPE_DATA_MODEL_ITER)
<< get_defs (GDA_TYPE_DATA_MODEL_IMPORT)
- << get_defs (GDA_TYPE_DATA_MODEL_DIR)
+ << 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_ACCESS_WRAPPER)
<< get_defs (GDA_TYPE_DATA_PROXY)
+ << get_defs (GDA_TYPE_HOLDER)
+ << get_defs (GDA_TYPE_META_STORE)
+ << get_defs (GDA_TYPE_META_STRUCT)
<< get_defs (GDA_TYPE_ROW)
<< get_defs (GDA_TYPE_SERVER_OPERATION)
<< get_defs (GDA_TYPE_SERVER_PROVIDER)
+ << get_defs (GDA_TYPE_SET)
+ << get_defs (GDA_TYPE_STATEMENT)
<< get_defs (GDA_TYPE_THREADER)
<< get_defs (GDA_TYPE_TRANSACTION_STATUS)
- << get_defs (GDA_TYPE_DATA_HANDLER)
- << get_defs (GDA_TYPE_META_STORE)
- << get_defs (GDA_TYPE_META_STRUCT)
- << get_defs (GDA_TYPE_STATEMENT)
- << get_defs (GDA_TYPE_BATCH)
- << get_defs (GDA_TYPE_HOLDER)
- << get_defs (GDA_TYPE_SET)
<< get_defs (GDA_TYPE_SQL_PARSER)
- << get_defs (GDA_TYPE_STATEMENT)
<< std::endl;
return 0;
}
Modified: libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4 (original)
+++ libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4 Tue Jun 10 10:24:12 2008
@@ -1,15 +1,20 @@
_EQUAL(glong,long)
_EQUAL(GdaMetaContext*, MetaContext*)
+_EQUAL(GdaMetaDbObject*, MetaDbObject*)
+_EQUAL(GdaMetaTable*, MetaTable*)
+_EQUAL(GdaMetaTableColumn*, MetaTableColumn*)
_EQUAL(GdaServerOperationNode*, ServerOperationNode*)
_EQUAL(GdaSetGroup*, SetGroup*)
_EQUAL(GdaSetSource*, SetSource*)
_EQUAL(GdaSetNode*, SetNode*)
+
_CONVERSION(`GdaConnectionEvent*',`Glib::RefPtr<ConnectionEvent>',`Glib::wrap($3)')
_CONVERSION(`const Glib::RefPtr<ConnectionEvent>&', `GdaConnectionEvent*', __CONVERT_REFPTR_TO_P)
_CONVERSION(`GdaDataModel*',`Glib::RefPtr<DataModel>',`Glib::wrap($3)')
_CONVERSION(`GdaDataModel*',`Glib::RefPtr<const DataModel>',`Glib::wrap($3)')
_CONVERSION(`GdaDataModelIter*',`Glib::RefPtr<DataModelIter>',`Glib::wrap($3)')
+_CONVERSION(`GdaDataModelArray*',`Glib::RefPtr<DataModelArray>',`Glib::wrap($3)')
_CONVERSION(`GdaConnection*',`Glib::RefPtr<Connection>',`Glib::wrap($3)')
_CONVERSION(`GdaStatement*',`Glib::RefPtr<Statement>',`Glib::wrap($3)')
@@ -82,6 +87,7 @@
_CONV_ENUM(Gda,ConnectionFeature)
_CONV_ENUM(Gda,ConnectionSchema)
+_CONV_ENUM(Gda,ConnectionOptions)
_CONV_ENUM(Gda,ClientEvent)
_CONV_ENUM(Gda,ClientSpecsType)
_CONV_ENUM(Gda,DataModelAccessFlags)
@@ -104,15 +110,13 @@
_CONV_ENUM(Gda,StatementSqlFlag)
_CONV_ENUM(Gda,SqlParserMode)
_CONV_ENUM(Gda,MetaStructFeature)
+_CONV_ENUM(Gda,MetaDbObjectType)
+_CONV_ENUM(Gda,MetaSortType)
+_CONV_ENUM(Gda,MetaGraphInfo)
# Lists
-_CONVERSION(`GSList*',`Glib::SListHandle<Parameter>',__FL2H_SHALLOW)
_CONVERSION(`GSList*',`Glib::SListHandle<Glib::ustring>',__FL2H_SHALLOW)
-_CONVERSION(`const Glib::SListHandle<Parameter>&',`GSList*',`$3.data()')
-_CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<QueryField> >',__FL2H_SHALLOW)
-_CONVERSION(`const Glib::SListHandle< Glib::RefPtr<QueryField> >&',`GSList*',`$3.data()')
-_CONVERSION(`const GSList*',`Glib::SListHandle<const DictType>',__FL2H_SHALLOW)
-_CONVERSION(`const Glib::SListHandle<DictType>&',`const GSList*',`$3.data()')
+_CONVERSION(`const Glib::ListHandle< Glib::RefPtr<ConnectionEvent> >&',`GList*',`$3.data()')
# Arrays
_CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
