gda-column.h   gda-column.h 
skipping to change at line 48 skipping to change at line 48
#define GDA_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYP E_COLUMN, GdaColumnClass)) #define GDA_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYP E_COLUMN, GdaColumnClass))
#define GDA_IS_COLUMN(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TY PE_COLUMN)) #define GDA_IS_COLUMN(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TY PE_COLUMN))
#define GDA_IS_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_T YPE_COLUMN)) #define GDA_IS_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_T YPE_COLUMN))
struct _GdaColumn { struct _GdaColumn {
GObject object; GObject object;
GdaColumnPrivate *priv; GdaColumnPrivate *priv;
}; };
struct _GdaColumnClass { struct _GdaColumnClass {
GObjectClass parent_class; GObjectClass parent_class;
/* signals */ /* signals */
void (* name_changed) (GdaColumn *column, const gchar *old_name) ; void (* name_changed) (GdaColumn *column, const gchar *old_name);
void (* g_type_changed) (GdaColumn *column, GType old_type, GType ne w_type); void (* g_type_changed) (GdaColumn *column, GType old_type, GType ne w_type);
}; };
GType gda_column_get_type (void) G_GNUC_CONST; GType gda_column_get_type (void) G_GNUC_CONST;
GdaColumn *gda_column_new (void); GdaColumn *gda_column_new (void);
GdaColumn *gda_column_copy (GdaColumn *column); GdaColumn *gda_column_copy (GdaColumn *column);
const gchar *gda_column_get_title (GdaColumn *column); const gchar *gda_column_get_description (GdaColumn *column);
void gda_column_set_title (GdaColumn *column, const gch void gda_column_set_description (GdaColumn *column, con
ar *title); st gchar *title);
glong gda_column_get_defined_size (GdaColumn *column);
void gda_column_set_defined_size (GdaColumn *column, glong siz
e);
const gchar *gda_column_get_name (GdaColumn *column); const gchar *gda_column_get_name (GdaColumn *column);
void gda_column_set_name (GdaColumn *column, const gch ar *name); void gda_column_set_name (GdaColumn *column, const gch ar *name);
const gchar *gda_column_get_table (GdaColumn *column);
void gda_column_set_table (GdaColumn *column, const gch
ar *table);
const gchar *gda_column_get_caption (GdaColumn *column);
void gda_column_set_caption (GdaColumn *column, const gch
ar *caption);
glong gda_column_get_scale (GdaColumn *column);
void gda_column_set_scale (GdaColumn *column, glong sca
le);
const gchar* gda_column_get_dbms_type (GdaColumn *column); const gchar* gda_column_get_dbms_type (GdaColumn *column);
void gda_column_set_dbms_type (GdaColumn *column, const gch ar *dbms_type); void gda_column_set_dbms_type (GdaColumn *column, const gch ar *dbms_type);
GType gda_column_get_g_type (GdaColumn *column); GType gda_column_get_g_type (GdaColumn *column);
void gda_column_set_g_type (GdaColumn *column, GType typ e); void gda_column_set_g_type (GdaColumn *column, GType typ e);
gboolean gda_column_get_allow_null (GdaColumn *column); gboolean gda_column_get_allow_null (GdaColumn *column);
void gda_column_set_allow_null (GdaColumn *column, gboolean allow); void gda_column_set_allow_null (GdaColumn *column, gboolean allow);
gboolean gda_column_get_primary_key (GdaColumn *column);
void gda_column_set_primary_key (GdaColumn *column, gboolean
pk);
gboolean gda_column_get_unique_key (GdaColumn *column);
void gda_column_set_unique_key (GdaColumn *column, gboolean
uk);
const gchar *gda_column_get_references (GdaColumn *column);
void gda_column_set_references (GdaColumn *column, const gch
ar *ref);
gboolean gda_column_get_auto_increment (GdaColumn *column); gboolean gda_column_get_auto_increment (GdaColumn *column);
void gda_column_set_auto_increment (GdaColumn *column, gboolean is_auto); void gda_column_set_auto_increment (GdaColumn *column, gboolean is_auto);
gint gda_column_get_position (GdaColumn *column); gint gda_column_get_position (GdaColumn *column);
void gda_column_set_position (GdaColumn *column, gint posi tion); void gda_column_set_position (GdaColumn *column, gint posi tion);
const GValue *gda_column_get_default_value (GdaColumn *column); const GValue *gda_column_get_default_value (GdaColumn *column);
void gda_column_set_default_value (GdaColumn *column, const GVa lue *default_value); void gda_column_set_default_value (GdaColumn *column, const GVa lue *default_value);
const GValue *gda_column_get_attribute (GdaColumn *column, const gch
ar *attribute);
void gda_column_set_attribute (GdaColumn *column, const gch
ar *attribute, const GValue *value);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 6 change blocks. 
33 lines changed or deleted 10 lines changed or added


 gda-config.h   gda-config.h 
skipping to change at line 38 skipping to change at line 38
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_CONFIG (gda_config_get_type()) #define GDA_TYPE_CONFIG (gda_config_get_type())
#define GDA_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TY PE_CONFIG, GdaConfig)) #define GDA_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TY PE_CONFIG, GdaConfig))
#define GDA_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYP E_CONFIG, GdaConfigClass)) #define GDA_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYP E_CONFIG, GdaConfigClass))
#define GDA_IS_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYP E_CONFIG)) #define GDA_IS_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYP E_CONFIG))
#define GDA_IS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TY PE_CONFIG)) #define GDA_IS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TY PE_CONFIG))
typedef struct _GdaConfigPrivate GdaConfigPrivate; typedef struct _GdaConfigPrivate GdaConfigPrivate;
typedef struct _GdaDataSourceInfo GdaDataSourceInfo; typedef struct _GdaDsnInfo GdaDsnInfo;
typedef struct _GdaProviderInfo GdaProviderInfo; typedef struct _GdaProviderInfo GdaProviderInfo;
/* error reporting */ /* error reporting */
extern GQuark gda_config_error_quark (void); extern GQuark gda_config_error_quark (void);
#define GDA_CONFIG_ERROR gda_config_error_quark () #define GDA_CONFIG_ERROR gda_config_error_quark ()
typedef enum { typedef enum {
GDA_CONFIG_DSN_NOT_FOUND_ERROR, GDA_CONFIG_DSN_NOT_FOUND_ERROR,
GDA_CONFIG_PERMISSION_ERROR, GDA_CONFIG_PERMISSION_ERROR,
GDA_CONFIG_PROVIDER_NOT_FOUND_ERROR, GDA_CONFIG_PROVIDER_NOT_FOUND_ERROR,
GDA_CONFIG_PROVIDER_CREATION_ERROR GDA_CONFIG_PROVIDER_CREATION_ERROR
} GdaConfigError; } GdaConfigError;
struct _GdaDataSourceInfo { struct _GdaDsnInfo {
gchar *name; /* plain text, not RFC 1738 encoded */ gchar *name; /* plain text, not RFC 1738 encoded */
gchar *provider; /* plain text, not RFC 1738 encoded */ gchar *provider; /* plain text, not RFC 1738 encoded */
gchar *description; /* plain text, not RFC 1738 encoded */ gchar *description; /* plain text, not RFC 1738 encoded */
gchar *cnc_string; /* semi-colon separated <key>=<value> list w here <key> and <value> are RFC 1738 encoded */ gchar *cnc_string; /* semi-colon separated <key>=<value> list w here <key> and <value> are RFC 1738 encoded */
gchar *auth_string; /* semi-colon separated <key>=<value> list w here <key> and <value> are RFC 1738 encoded */ gchar *auth_string; /* semi-colon separated <key>=<value> list w here <key> and <value> are RFC 1738 encoded */
gboolean is_system; gboolean is_system;
}; };
struct _GdaProviderInfo { struct _GdaProviderInfo {
gchar *id; gchar *id;
skipping to change at line 78 skipping to change at line 78
struct _GdaConfig { struct _GdaConfig {
GObject object; GObject object;
GdaConfigPrivate *priv; GdaConfigPrivate *priv;
}; };
struct _GdaConfigClass { struct _GdaConfigClass {
GObjectClass object_class; GObjectClass object_class;
/* signals */ /* signals */
void (*dsn_added) (GdaConfig *conf, GdaDataSourceI void (*dsn_added) (GdaConfig *conf, GdaDsnInfo *ne
nfo *new_dsn); w_dsn);
void (*dsn_to_be_removed) (GdaConfig *conf, GdaDataSourceI void (*dsn_to_be_removed) (GdaConfig *conf, GdaDsnInfo *ol
nfo *old_dsn); d_dsn);
void (*dsn_removed) (GdaConfig *conf, GdaDataSourceI void (*dsn_removed) (GdaConfig *conf, GdaDsnInfo *ol
nfo *old_dsn); d_dsn);
void (*dsn_changed) (GdaConfig *conf, GdaDataSourceI void (*dsn_changed) (GdaConfig *conf, GdaDsnInfo *ds
nfo *dsn); n);
}; };
GType gda_config_get_type (void) G_GNUC_CONST; GType gda_config_get_type (void) G_GNUC_CONST;
GdaConfig* gda_config_get (void); GdaConfig* gda_config_get (void);
GdaDataSourceInfo *gda_config_get_dsn (const gchar *dsn_name); GdaDsnInfo *gda_config_get_dsn_info (const gchar *dsn_na
gboolean gda_config_define_dsn (const GdaDataSourceInfo me);
*info, GError **error); gboolean gda_config_define_dsn (const GdaDsnInfo *i
gboolean gda_config_remove_dsn (const gchar *dsn_name, G nfo, GError **error);
Error **error); gboolean gda_config_remove_dsn (const gchar *dsn_na
me, GError **error);
gboolean gda_config_dsn_needs_authentication (const gchar *dsn_na me); gboolean gda_config_dsn_needs_authentication (const gchar *dsn_na me);
GdaDataModel *gda_config_list_dsn (void); GdaDataModel *gda_config_list_dsn (void);
gboolean gda_config_can_modify_system_config (void); gboolean gda_config_can_modify_system_config (void);
gint gda_config_get_nb_dsn (void); gint gda_config_get_nb_dsn (void);
gint gda_config_get_dsn_index (const gchar *dsn_name); gint gda_config_get_dsn_info_index (const gchar *dsn_na
GdaDataSourceInfo *gda_config_get_dsn_at_index (gint index); me);
GdaDsnInfo *gda_config_get_dsn_info_at_index (gint index);
GdaProviderInfo *gda_config_get_provider_info (const gchar *provider_na GdaProviderInfo *gda_config_get_provider_info (const gchar *provid
me); er_name);
GdaServerProvider *gda_config_get_provider_object (const gchar *provider_na GdaServerProvider *gda_config_get_provider (const gchar *provid
me, GError **error); er_name, GError **error);
GdaDataModel *gda_config_list_providers (void); GdaDataModel *gda_config_list_providers (void);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 8 change blocks. 
26 lines changed or deleted 28 lines changed or added


 gda-connection-private.h   gda-connection-private.h 
skipping to change at line 27 skipping to change at line 27
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this Library; see the file COPYING.LIB. If not, * License along with this Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 , * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GDA_CONNECTION_PRIVATE_H_ #ifndef __GDA_CONNECTION_PRIVATE_H_
#define __GDA_CONNECTION_PRIVATE_H_ #define __GDA_CONNECTION_PRIVATE_H_
#include <libgda/gda-meta-store.h> #include <libgda/gda-meta-store.h>
#include <providers-support/gda-pstmt.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* /*
* Provider's specific connection data management * Provider's specific connection data management
*/ */
void gda_connection_internal_set_provider_data (GdaConnection *cnc, gpo inter data, GDestroyNotify destroy_func); void gda_connection_internal_set_provider_data (GdaConnection *cnc, gpo inter data, GDestroyNotify destroy_func);
gpointer gda_connection_internal_get_provider_data (GdaConnection *cnc); gpointer gda_connection_internal_get_provider_data (GdaConnection *cnc);
/* /*
* Connection's events
*/
void gda_connection_add_event (GdaConnection *cn
c, GdaConnectionEvent *event);
GdaConnectionEvent *gda_connection_add_event_string (GdaConnection *cn
c, const gchar *str, ...);
void gda_connection_clear_events_list (GdaConnection *cn
c);
/*
* Transaction related * Transaction related
*/ */
void gda_connection_internal_transaction_started (GdaConnection *cnc, const gchar *parent_trans, const gchar *trans_name, void gda_connection_internal_transaction_started (GdaConnection *cnc, const gchar *parent_trans, const gchar *trans_name,
GdaTransactionIsolation is ol_level); GdaTransactionIsolation is ol_level);
void gda_connection_internal_transaction_rolledback (GdaConnection *cnc, co nst gchar *trans_name); void gda_connection_internal_transaction_rolledback (GdaConnection *cnc, co nst gchar *trans_name);
void gda_connection_internal_transaction_committed (GdaConnection *cnc, con st gchar *trans_name); void gda_connection_internal_transaction_committed (GdaConnection *cnc, con st gchar *trans_name);
void gda_connection_internal_statement_executed (GdaConnection *cnc, GdaSta tement *stmt, GdaSet *params, GdaConnectionEvent *error); void gda_connection_internal_statement_executed (GdaConnection *cnc, GdaSta tement *stmt, GdaSet *params, GdaConnectionEvent *error);
void gda_connection_internal_savepoint_added (GdaConnection *cnc, const gch ar *parent_trans, const gchar *svp_name); void gda_connection_internal_savepoint_added (GdaConnection *cnc, const gch ar *parent_trans, const gchar *svp_name);
void gda_connection_internal_savepoint_rolledback (GdaConnection *cnc, cons t gchar *svp_name); void gda_connection_internal_savepoint_rolledback (GdaConnection *cnc, cons t gchar *svp_name);
void gda_connection_internal_savepoint_removed (GdaConnection *cnc, const g char *svp_name); void gda_connection_internal_savepoint_removed (GdaConnection *cnc, const g char *svp_name);
void gda_connection_internal_change_transaction_state (GdaConnection *cnc, void gda_connection_internal_change_transaction_state (GdaConnection *cnc,
GdaTransactionStatusS tate newstate); GdaTransactionStatusS tate newstate);
/* /*
* prepared statements support * prepared statements support
*/ */
void gda_connection_add_prepared_statement (GdaConnection *cnc, GdaStat void gda_connection_add_prepared_statement (GdaConnection *cnc, GdaSta
ement *gda_stmt, gpointer prepared_stmt); tement *gda_stmt, GdaPStmt *prepared_stmt);
void gda_connection_del_prepared_statement (GdaConnection *cnc, GdaStat void gda_connection_del_prepared_statement (GdaConnection *cnc, GdaSta
ement *gda_stmt); tement *gda_stmt);
gpointer gda_connection_get_prepared_statement (GdaConnection *cnc, GdaStat GdaPStmt *gda_connection_get_prepared_statement (GdaConnection *cnc, GdaSta
ement *gda_stmt); tement *gda_stmt);
/*
* GdaMetaStore handling
*/
GdaMetaStore *gda_connection_get_meta_store (GdaConnection *cnc);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
11 lines changed or deleted 17 lines changed or added


 gda-connection.h   gda-connection.h 
skipping to change at line 146 skipping to change at line 146
GdaConnection *gda_connection_open_from_string (const gchar *prov ider_name, GdaConnection *gda_connection_open_from_string (const gchar *prov ider_name,
const gchar *cnc_s tring, const gchar *auth_string, const gchar *cnc_s tring, const gchar *auth_string,
GdaConnectionOptio ns options, GError **error); GdaConnectionOptio ns options, GError **error);
gboolean gda_connection_open (GdaConnection *cn c, GError **error); gboolean gda_connection_open (GdaConnection *cn c, GError **error);
void gda_connection_close (GdaConnection *cn c); void gda_connection_close (GdaConnection *cn c);
void gda_connection_close_no_warning (GdaConnection *cn c); void gda_connection_close_no_warning (GdaConnection *cn c);
gboolean gda_connection_is_opened (GdaConnection *cn c); gboolean gda_connection_is_opened (GdaConnection *cn c);
GdaConnectionOptions gda_connection_get_options (GdaConnection *cn c); GdaConnectionOptions gda_connection_get_options (GdaConnection *cn c);
GdaServerProvider *gda_connection_get_provider_obj (GdaConnection *cn c); GdaServerProvider *gda_connection_get_provider (GdaConnection *cn c);
const gchar *gda_connection_get_provider_name (GdaConnection *cn c); const gchar *gda_connection_get_provider_name (GdaConnection *cn c);
GdaServerOperation *gda_connection_create_operation (GdaConnection *cn c, GdaServerOperationType type, GdaServerOperation *gda_connection_create_operation (GdaConnection *cn c, GdaServerOperationType type,
GdaSet *options, GError **error); GdaSet *options, GError **error);
gboolean gda_connection_perform_operation (GdaConnection *cn c, GdaServerOperation *op, GError **error); gboolean gda_connection_perform_operation (GdaConnection *cn c, GdaServerOperation *op, GError **error);
const gchar *gda_connection_get_dsn (GdaConnection *cn c); const gchar *gda_connection_get_dsn (GdaConnection *cn c);
gboolean gda_connection_set_dsn (GdaConnection *cn c, const gchar *datasource);
const gchar *gda_connection_get_cnc_string (GdaConnection *cn c); const gchar *gda_connection_get_cnc_string (GdaConnection *cn c);
const gchar *gda_connection_get_authentication (GdaConnection *cn c); const gchar *gda_connection_get_authentication (GdaConnection *cn c);
void gda_connection_add_event (GdaConnection *cn
c, GdaConnectionEvent *event);
GdaConnectionEvent *gda_connection_add_event_string (GdaConnection *cn
c, const gchar *str, ...);
void gda_connection_add_events_list (GdaConnection *cn
c, GList *events_list);
void gda_connection_clear_events_list (GdaConnection *cn
c);
const GList *gda_connection_get_events (GdaConnection *cn c); const GList *gda_connection_get_events (GdaConnection *cn c);
GdaSqlParser *gda_connection_create_parser (GdaConnection *cn c); GdaSqlParser *gda_connection_create_parser (GdaConnection *cn c);
GSList *gda_connection_batch_execute (GdaConnection *cn c, GSList *gda_connection_batch_execute (GdaConnection *cn c,
GdaBatch *batch, G daSet *params, GdaBatch *batch, G daSet *params,
GdaStatementModelU sage model_usage, GError **error); GdaStatementModelU sage model_usage, GError **error);
gchar *gda_connection_statement_to_sql (GdaConnection *cn c, gchar *gda_connection_statement_to_sql (GdaConnection *cn c,
GdaStatement *stmt , GdaSet *params, GdaStatementSqlFlag flags, GdaStatement *stmt , GdaSet *params, GdaStatementSqlFlag flags,
GSList **params_us ed, GError **error); GSList **params_us ed, GError **error);
skipping to change at line 206 skipping to change at line 201
GdaTransactionStatus *gda_connection_get_transaction_status (GdaConnection *cnc); GdaTransactionStatus *gda_connection_get_transaction_status (GdaConnection *cnc);
gchar *gda_connection_value_to_sql_string (GdaConnection *cn c, GValue *from); gchar *gda_connection_value_to_sql_string (GdaConnection *cn c, GValue *from);
gboolean gda_connection_supports_feature (GdaConnection *cn c, GdaConnectionFeature feature); gboolean gda_connection_supports_feature (GdaConnection *cn c, GdaConnectionFeature feature);
GdaMetaStore *gda_connection_get_meta_store (GdaConnection *cn c); GdaMetaStore *gda_connection_get_meta_store (GdaConnection *cn c);
gboolean gda_connection_update_meta_store (GdaConnection *cn c, GdaMetaContext *context, GError **error); gboolean gda_connection_update_meta_store (GdaConnection *cn c, GdaMetaContext *context, GError **error);
GdaDataModel *gda_connection_get_meta_store_data (GdaConnection *cn c, GdaConnectionMetaType meta_type, GdaDataModel *gda_connection_get_meta_store_data (GdaConnection *cn c, GdaConnectionMetaType meta_type,
GError **error, gi nt nb_filters, ...); GError **error, gi nt nb_filters, ...);
GdaDataModel *gda_connection_get_meta_store_data_v(GdaConnection *cn
c, GdaConnectionMetaType meta_type,
GList* filters, GE
rror **error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 4 change blocks. 
11 lines changed or deleted 5 lines changed or added


 gda-data-access-wrapper.h   gda-data-access-wrapper.h 
skipping to change at line 52 skipping to change at line 52
GObject object; GObject object;
GdaDataAccessWrapperPrivate *priv; GdaDataAccessWrapperPrivate *priv;
}; };
struct _GdaDataAccessWrapperClass { struct _GdaDataAccessWrapperClass {
GObjectClass parent_class; GObjectClass parent_class;
}; };
GType gda_data_access_wrapper_get_type (void) G_GNUC_CONST; GType gda_data_access_wrapper_get_type (void) G_GNUC_CONST;
GdaDataModel *gda_data_access_wrapper_new (GdaDataModel *model); GdaDataModel *gda_data_access_wrapper_new (GdaDataModel *model);
gboolean gda_data_access_wrapper_row_exists (GdaDataAccessWrapper *wr apper, gint row);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 gda-data-model-array.h   gda-data-model-array.h 
skipping to change at line 28 skipping to change at line 28
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this Library; see the file COPYING.LIB. If not, * License along with this Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 , * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GDA_DATA_MODEL_ARRAY_H__ #ifndef __GDA_DATA_MODEL_ARRAY_H__
#define __GDA_DATA_MODEL_ARRAY_H__ #define __GDA_DATA_MODEL_ARRAY_H__
#include <libgda/gda-data-model.h> #include <libgda/gda-data-model.h>
#include <libgda/gda-data-model-row.h> #include <libgda/gda-row.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_DATA_MODEL_ARRAY (gda_data_model_array_get_type ()) #define GDA_TYPE_DATA_MODEL_ARRAY (gda_data_model_array_get_type ())
#define GDA_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArray)) #define GDA_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArray))
#define GDA_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArrayClass)) #define GDA_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArrayClass))
#define GDA_IS_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_DATA_MODEL_ARRAY)) #define GDA_IS_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_DATA_MODEL_ARRAY))
#define GDA_IS_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_DATA_MODEL_ARRAY)) #define GDA_IS_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_DATA_MODEL_ARRAY))
typedef struct _GdaDataModelArray GdaDataModelArray; typedef struct _GdaDataModelArray GdaDataModelArray;
typedef struct _GdaDataModelArrayClass GdaDataModelArrayClass; typedef struct _GdaDataModelArrayClass GdaDataModelArrayClass;
typedef struct _GdaDataModelArrayPrivate GdaDataModelArrayPrivate; typedef struct _GdaDataModelArrayPrivate GdaDataModelArrayPrivate;
struct _GdaDataModelArray { struct _GdaDataModelArray {
GdaDataModelRow model; GObject object;
GdaDataModelArrayPrivate *priv; GdaDataModelArrayPrivate *priv;
}; };
struct _GdaDataModelArrayClass { struct _GdaDataModelArrayClass {
GdaDataModelRowClass parent_class; GObjectClass parent_class;
}; };
GType gda_data_model_array_get_type (void) G_GNUC_CON ST; GType gda_data_model_array_get_type (void) G_GNUC_CON ST;
GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...); GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...);
GdaDataModel *gda_data_model_array_new (gint cols); GdaDataModel *gda_data_model_array_new (gint cols);
GdaDataModelArray *gda_data_model_array_copy_model (GdaDataModel *sr c, GError **error); GdaDataModelArray *gda_data_model_array_copy_model (GdaDataModel *sr c, GError **error);
GdaRow *gda_data_model_array_get_row (GdaDataModelArra
y *model, gint row, GError **error);
void gda_data_model_array_set_n_columns (GdaDataModelArra y *model, gint cols); void gda_data_model_array_set_n_columns (GdaDataModelArra y *model, gint cols);
void gda_data_model_array_clear (GdaDataModelArra y *model); void gda_data_model_array_clear (GdaDataModelArra y *model);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 4 change blocks. 
3 lines changed or deleted 6 lines changed or added


 gda-data-model-extra.h   gda-data-model-extra.h 
skipping to change at line 38 skipping to change at line 38
G_BEGIN_DECLS G_BEGIN_DECLS
void gda_data_model_signal_emit_changed (GdaDataModel *mode l); void gda_data_model_signal_emit_changed (GdaDataModel *mode l);
void gda_data_model_row_inserted (GdaDataModel *model, gint row) ; void gda_data_model_row_inserted (GdaDataModel *model, gint row) ;
void gda_data_model_row_updated (GdaDataModel *model, gint row) ; void gda_data_model_row_updated (GdaDataModel *model, gint row) ;
void gda_data_model_row_removed (GdaDataModel *model, gint row) ; void gda_data_model_row_removed (GdaDataModel *model, gint row) ;
void gda_data_model_reset (GdaDataModel *model); void gda_data_model_reset (GdaDataModel *model);
gboolean gda_data_model_move_iter_at_row_default (GdaDataModel *model, GdaD
ataModelIter *iter, gint row);
gboolean gda_data_model_move_iter_next_default (GdaDataModel *model, GdaD
ataModelIter *iter);
gboolean gda_data_model_move_iter_prev_default (GdaDataModel *model, GdaD
ataModelIter *iter);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
6 lines changed or deleted 0 lines changed or added


 gda-data-model-iter.h   gda-data-model-iter.h 
skipping to change at line 40 skipping to change at line 40
#define GDA_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_data_model_iter_get_type(), GdaDataModelIter) #define GDA_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_data_model_iter_get_type(), GdaDataModelIter)
#define GDA_DATA_MODEL_ITER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, g da_data_model_iter_get_type (), GdaDataModelIterClass) #define GDA_DATA_MODEL_ITER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, g da_data_model_iter_get_type (), GdaDataModelIterClass)
#define GDA_IS_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_data_model_iter_get_type ()) #define GDA_IS_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_data_model_iter_get_type ())
/* error reporting */ /* error reporting */
extern GQuark gda_data_model_iter_error_quark (void); extern GQuark gda_data_model_iter_error_quark (void);
#define GDA_DATA_MODEL_ITER_ERROR gda_data_model_iter_error_quark () #define GDA_DATA_MODEL_ITER_ERROR gda_data_model_iter_error_quark ()
typedef enum typedef enum
{ {
GDA_DATA_MODEL_ITER_WHAT_ERROR GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR
} GdaDataModelIterError; } GdaDataModelIterError;
/* struct for the object's data */ /* struct for the object's data */
struct _GdaDataModelIter struct _GdaDataModelIter
{ {
GdaSet object; GdaSet object;
GdaDataModelIterPrivate *priv; GdaDataModelIterPrivate *priv;
}; };
/* struct for the object's class */ /* struct for the object's class */
struct _GdaDataModelIterClass struct _GdaDataModelIterClass
{ {
GdaSetClass parent_class; GdaSetClass parent_class;
gboolean (* row_to_change) (GdaDataModelIter *iter , gint row);
void (* row_changed) (GdaDataModelIter *iter , gint row); void (* row_changed) (GdaDataModelIter *iter , gint row);
void (* end_of_data) (GdaDataModelIter *iter ); void (* end_of_data) (GdaDataModelIter *iter );
}; };
GType gda_data_model_iter_get_type (void) G_GNUC_CO NST; GType gda_data_model_iter_get_type (void) G_GNUC_CO NST;
const GValue *gda_data_model_iter_get_value_at (GdaDataModelIte r *iter, gint col); const GValue *gda_data_model_iter_get_value_at (GdaDataModelIte r *iter, gint col);
const GValue *gda_data_model_iter_get_value_for_field (GdaDataModelIte r *iter, const gchar *field_name); const GValue *gda_data_model_iter_get_value_for_field (GdaDataModelIte r *iter, const gchar *field_name);
gboolean gda_data_model_iter_set_value_at (GdaDataModelIte
r *iter, gint col,
const GValue *va
lue, GError **error);
gboolean gda_data_model_iter_set_at_row (GdaDataModelIte r *iter, gint row); gboolean gda_data_model_iter_move_at_row (GdaDataModelIte r *iter, gint row);
gboolean gda_data_model_iter_move_next (GdaDataModelIte r *iter); gboolean gda_data_model_iter_move_next (GdaDataModelIte r *iter);
gboolean gda_data_model_iter_move_prev (GdaDataModelIte r *iter); gboolean gda_data_model_iter_move_prev (GdaDataModelIte r *iter);
gint gda_data_model_iter_get_row (GdaDataModelIte r *iter); gint gda_data_model_iter_get_row (GdaDataModelIte r *iter);
gboolean gda_data_model_iter_can_be_moved (GdaDataModelIte r *iter);
void gda_data_model_iter_invalidate_contents (GdaDataModelIte r *iter); void gda_data_model_iter_invalidate_contents (GdaDataModelIte r *iter);
gboolean gda_data_model_iter_is_valid (GdaDataModelIte r *iter); gboolean gda_data_model_iter_is_valid (GdaDataModelIte r *iter);
GdaHolder *gda_data_model_iter_get_holder_for_field (GdaDataModelIte r *iter, gint col); GdaHolder *gda_data_model_iter_get_holder_for_field (GdaDataModelIte r *iter, gint col);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 5 change blocks. 
4 lines changed or deleted 6 lines changed or added


 gda-data-model-private.h   gda-data-model-private.h 
skipping to change at line 41 skipping to change at line 41
#include <libgda/gda-column.h> #include <libgda/gda-column.h>
#include <libgda/gda-value.h> #include <libgda/gda-value.h>
#include <libgda/gda-data-model-extra.h> #include <libgda/gda-data-model-extra.h>
G_BEGIN_DECLS G_BEGIN_DECLS
xmlNodePtr gda_data_model_to_xml_node (GdaDat aModel *model, const gint *cols, gint nb_cols, xmlNodePtr gda_data_model_to_xml_node (GdaDat aModel *model, const gint *cols, gint nb_cols,
const g int *rows, gint nb_rows, const gchar *name); const g int *rows, gint nb_rows, const gchar *name);
gboolean gda_data_model_add_data_from_xml_node (GdaDat aModel *model, xmlNodePtr node, GError **error); gboolean gda_data_model_add_data_from_xml_node (GdaDat aModel *model, xmlNodePtr node, GError **error);
gboolean gda_data_model_move_iter_at_row (GdaDat
aModel *model, GdaDataModelIter *iter, gint row);
gboolean gda_data_model_move_iter_next (GdaDat
aModel *model, GdaDataModelIter *iter);
gboolean gda_data_model_move_iter_prev (GdaDat
aModel *model, GdaDataModelIter *iter);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 gda-data-model.h   gda-data-model.h 
skipping to change at line 42 skipping to change at line 42
#include <libgda/gda-value.h> #include <libgda/gda-value.h>
#include <libgda/gda-enums.h> #include <libgda/gda-enums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_DATA_MODEL (gda_data_model_get_type()) #define GDA_TYPE_DATA_MODEL (gda_data_model_get_type())
#define GDA_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GD A_TYPE_DATA_MODEL, GdaDataModel)) #define GDA_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GD A_TYPE_DATA_MODEL, GdaDataModel))
#define GDA_IS_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GD A_TYPE_DATA_MODEL)) #define GDA_IS_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GD A_TYPE_DATA_MODEL))
#define GDA_DATA_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj ), GDA_TYPE_DATA_MODEL, GdaDataModelClass)) #define GDA_DATA_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj ), GDA_TYPE_DATA_MODEL, GdaDataModelClass))
/* error reporting */
extern GQuark gda_data_model_error_quark (void);
#define GDA_DATA_MODEL_ERROR gda_data_model_error_quark ()
typedef enum { typedef enum {
GDA_DATA_MODEL_ACCESS_RANDOM = 1 << 0, GDA_DATA_MODEL_ACCESS_RANDOM = 1 << 0,
GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD = 1 << 1, GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD = 1 << 1,
GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD = 1 << 2, GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD = 1 << 2,
GDA_DATA_MODEL_ACCESS_CURSOR = GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD | GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD, GDA_DATA_MODEL_ACCESS_CURSOR = GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD | GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD,
GDA_DATA_MODEL_ACCESS_INSERT = 1 << 3, GDA_DATA_MODEL_ACCESS_INSERT = 1 << 3,
GDA_DATA_MODEL_ACCESS_UPDATE = 1 << 4, GDA_DATA_MODEL_ACCESS_UPDATE = 1 << 4,
GDA_DATA_MODEL_ACCESS_DELETE = 1 << 5, GDA_DATA_MODEL_ACCESS_DELETE = 1 << 5,
GDA_DATA_MODEL_ACCESS_WRITE = GDA_DATA_MODEL_ACCESS_INSERT | GDA_DAT A_MODEL_ACCESS_UPDATE | GDA_DATA_MODEL_ACCESS_WRITE = GDA_DATA_MODEL_ACCESS_INSERT | GDA_DAT A_MODEL_ACCESS_UPDATE |
GDA_DATA_MODEL_ACCESS_DELETE GDA_DATA_MODEL_ACCESS_DELETE
skipping to change at line 69 skipping to change at line 73
typedef enum { typedef enum {
GDA_DATA_MODEL_IO_DATA_ARRAY_XML, GDA_DATA_MODEL_IO_DATA_ARRAY_XML,
GDA_DATA_MODEL_IO_TEXT_SEPARATED GDA_DATA_MODEL_IO_TEXT_SEPARATED
} GdaDataModelIOFormat; } GdaDataModelIOFormat;
enum { enum {
GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR, GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR,
GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR, GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,
GDA_DATA_MODEL_VALUES_LIST_ERROR, GDA_DATA_MODEL_VALUES_LIST_ERROR,
GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR GDA_DATA_MODEL_VALUE_TYPE_ERROR,
GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
GDA_DATA_MODEL_ACCESS_ERROR,
GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR
}; };
/* struct for the interface */ /* struct for the interface */
struct _GdaDataModelClass { struct _GdaDataModelClass {
GTypeInterface g_iface; GTypeInterface g_iface;
/* virtual table */ /* virtual table */
gint (* i_get_n_rows) (GdaDataModel *model); gint (* i_get_n_rows) (GdaDataModel *model);
gint (* i_get_n_columns) (GdaDataModel *model); gint (* i_get_n_columns) (GdaDataModel *model);
GdaColumn *(* i_describe_column) (GdaDataModel *model, gi nt col); GdaColumn *(* i_describe_column) (GdaDataModel *model, gi nt col);
GdaDataModelAccessFlags (* i_get_access_flags) (GdaDataModel *model) ; GdaDataModelAccessFlags (* i_get_access_flags) (GdaDataModel *model) ;
const GValue *(* i_get_value_at) (GdaDataModel *model, gi nt col, gint row); const GValue *(* i_get_value_at) (GdaDataModel *model, gi nt col, gint row, GError **error);
GdaValueAttribute (* i_get_attributes_at)(GdaDataModel *model, gi nt col, gint row); GdaValueAttribute (* i_get_attributes_at)(GdaDataModel *model, gi nt col, gint row);
GdaDataModelIter *(* i_create_iter) (GdaDataModel *model); GdaDataModelIter *(* i_create_iter) (GdaDataModel *model);
gboolean (* i_iter_at_row) (GdaDataModel *model, Gd aDataModelIter *iter, gint row); gboolean (* i_iter_at_row) (GdaDataModel *model, Gd aDataModelIter *iter, gint row);
gboolean (* i_iter_next) (GdaDataModel *model, Gd aDataModelIter *iter); gboolean (* i_iter_next) (GdaDataModel *model, Gd aDataModelIter *iter);
gboolean (* i_iter_prev) (GdaDataModel *model, Gd aDataModelIter *iter); gboolean (* i_iter_prev) (GdaDataModel *model, Gd aDataModelIter *iter);
gboolean (* i_set_value_at) (GdaDataModel *model, gi nt col, gint row, gboolean (* i_set_value_at) (GdaDataModel *model, gi nt col, gint row,
const GValue *value, GE rror **error); const GValue *value, GE rror **error);
gboolean (* i_iter_set_value) (GdaDataModel *model, Gd
aDataModelIter *iter, gint col,
const GValue *value, GE
rror **error);
gboolean (* i_set_values) (GdaDataModel *model, gi nt row, GList *values, gboolean (* i_set_values) (GdaDataModel *model, gi nt row, GList *values,
GError **error); GError **error);
gint (* i_append_values) (GdaDataModel *model, co nst GList *values, GError **error); gint (* i_append_values) (GdaDataModel *model, co nst GList *values, GError **error);
gint (* i_append_row) (GdaDataModel *model, GE rror **error); gint (* i_append_row) (GdaDataModel *model, GE rror **error);
gboolean (* i_remove_row) (GdaDataModel *model, gi nt row, GError **error); gboolean (* i_remove_row) (GdaDataModel *model, gi nt row, GError **error);
gint (* i_find_row) (GdaDataModel *model, GS List *values, gint *cols_index); gint (* i_find_row) (GdaDataModel *model, GS List *values, gint *cols_index);
void (* i_set_notify) (GdaDataModel *model, gb oolean do_notify_changes); void (* i_set_notify) (GdaDataModel *model, gb oolean do_notify_changes);
gboolean (* i_get_notify) (GdaDataModel *model); gboolean (* i_get_notify) (GdaDataModel *model);
void (* i_send_hint) (GdaDataModel *model, Gd aDataModelHint hint, const GValue *hint_value); void (* i_send_hint) (GdaDataModel *model, Gd aDataModelHint hint, const GValue *hint_value);
skipping to change at line 113 skipping to change at line 122
/* signals */ /* signals */
void (* row_inserted) (GdaDataModel *model, gi nt row); void (* row_inserted) (GdaDataModel *model, gi nt row);
void (* row_updated) (GdaDataModel *model, gi nt row); void (* row_updated) (GdaDataModel *model, gi nt row);
void (* row_removed) (GdaDataModel *model, gi nt row); void (* row_removed) (GdaDataModel *model, gi nt row);
void (* changed) (GdaDataModel *model); void (* changed) (GdaDataModel *model);
void (* reset) (GdaDataModel *model); void (* reset) (GdaDataModel *model);
}; };
GType gda_data_model_get_type (void) G_GNUC_CON ST; GType gda_data_model_get_type (void) G_GNUC_CON ST;
gboolean gda_data_model_is_updatable (GdaDataModel *mo GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *mo
del); del);
GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel
*model);
gint gda_data_model_get_n_rows (GdaDataModel *mo del); gint gda_data_model_get_n_rows (GdaDataModel *mo del);
gint gda_data_model_get_n_columns (GdaDataModel *mo del); gint gda_data_model_get_n_columns (GdaDataModel *mo del);
GdaColumn *gda_data_model_describe_column (GdaDataModel *mo del, gint col); GdaColumn *gda_data_model_describe_column (GdaDataModel *mo del, gint col);
gint gda_data_model_get_column_index_by_name(GdaDataModel *m odel, const gchar *name); gint gda_data_model_get_column_index (GdaDataModel *mo del, const gchar *name);
const gchar *gda_data_model_get_column_name (GdaDataModel *mod el, gint col); const gchar *gda_data_model_get_column_name (GdaDataModel *mod el, gint col);
void gda_data_model_set_column_name (GdaDataModel *mod el, gint col, const gchar *name); void gda_data_model_set_column_name (GdaDataModel *mod el, gint col, const gchar *name);
const gchar *gda_data_model_get_column_title (GdaDataModel *mo del, gint col); const gchar *gda_data_model_get_column_title (GdaDataModel *mo del, gint col);
void gda_data_model_set_column_title (GdaDataModel *mo del, gint col, const gchar *title); void gda_data_model_set_column_title (GdaDataModel *mo del, gint col, const gchar *title);
const GValue *gda_data_model_get_value_at (GdaDataModel *mo const GValue *gda_data_model_get_value_at (GdaDataModel *mo
del, gint col, gint row); del, gint col, gint row, GError **error);
const GValue *gda_data_model_get_value_at_col_name (GdaDataModel *mo const GValue *gda_data_model_get_typed_value_at (GdaDataModel *mo
del, del, gint col, gint row,
const gchar *colu GType expected_ty
mn_name, gint row); pe, gboolean nullok, GError **error);
GdaValueAttribute gda_data_model_get_attributes_at (GdaDataModel *mo del, gint col, gint row); GdaValueAttribute gda_data_model_get_attributes_at (GdaDataModel *mo del, gint col, gint row);
GdaDataModelIter *gda_data_model_create_iter (GdaDataModel *mo del); GdaDataModelIter *gda_data_model_create_iter (GdaDataModel *mo del);
void gda_data_model_freeze (GdaDataModel *mo del); void gda_data_model_freeze (GdaDataModel *mo del);
void gda_data_model_thaw (GdaDataModel *mo del); void gda_data_model_thaw (GdaDataModel *mo del);
gboolean gda_data_model_set_value_at (GdaDataModel *mo del, gint col, gint row, gboolean gda_data_model_set_value_at (GdaDataModel *mo del, gint col, gint row,
const GValue *val ue, GError **error); const GValue *val ue, GError **error);
gboolean gda_data_model_set_values (GdaDataModel *mo del, gint row, gboolean gda_data_model_set_values (GdaDataModel *mo del, gint row,
GList *values, GE rror **error); GList *values, GE rror **error);
gint gda_data_model_append_row (GdaDataModel *mo del, GError **error); gint gda_data_model_append_row (GdaDataModel *mo del, GError **error);
gint gda_data_model_append_values (GdaDataModel *mo del, const GList *values, GError **error); gint gda_data_model_append_values (GdaDataModel *mo del, const GList *values, GError **error);
 End of changes. 7 change blocks. 
13 lines changed or deleted 22 lines changed or added


 gda-data-proxy.h   gda-data-proxy.h 
skipping to change at line 65 skipping to change at line 65
/* struct for the object's class */ /* struct for the object's class */
struct _GdaDataProxyClass struct _GdaDataProxyClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
void (* row_delete_changed) (GdaDataProxy *proxy, gint row, gboolean to_be_deleted); void (* row_delete_changed) (GdaDataProxy *proxy, gint row, gboolean to_be_deleted);
void (* sample_size_changed) (GdaDataProxy *proxy, gint sample_size); void (* sample_size_changed) (GdaDataProxy *proxy, gint sample_size);
void (* sample_changed) (GdaDataProxy *proxy, gint sample_start, gint sample_end); void (* sample_changed) (GdaDataProxy *proxy, gint sample_start, gint sample_end);
gboolean (* pre_changes_applied) (GdaDataProxy *proxy, GError *(* validate_row_changes) (GdaDataProxy *proxy,
gint row, gint proxied_row); gint row, gint proxied_row);
void (* post_changes_applied) (GdaDataProxy *proxy, void (* row_changes_applied) (GdaDataProxy *proxy,
gint row, gint proxied_row); gint row, gint proxied_row);
void (* filter_changed) (GdaDataProxy *proxy);
}; };
GType gda_data_proxy_get_type (void) G_GNUC_CON ST; GType gda_data_proxy_get_type (void) G_GNUC_CON ST;
GObject *gda_data_proxy_new (GdaDataModel *mo del); GObject *gda_data_proxy_new (GdaDataModel *mo del);
GdaDataModel *gda_data_proxy_get_proxied_model (GdaDataProxy *pr oxy); GdaDataModel *gda_data_proxy_get_proxied_model (GdaDataProxy *pr oxy);
gint gda_data_proxy_get_proxied_model_n_cols (GdaDataProxy *pr oxy); gint gda_data_proxy_get_proxied_model_n_cols (GdaDataProxy *pr oxy);
gint gda_data_proxy_get_proxied_model_n_rows (GdaDataProxy *pr oxy); gint gda_data_proxy_get_proxied_model_n_rows (GdaDataProxy *pr oxy);
gboolean gda_data_proxy_is_read_only (GdaDataProxy *pr oxy); gboolean gda_data_proxy_is_read_only (GdaDataProxy *pr oxy);
GSList *gda_data_proxy_get_values (GdaDataProxy *pr oxy, gint proxy_row, GSList *gda_data_proxy_get_values (GdaDataProxy *pr oxy, gint proxy_row,
gint *cols_index, gint n_cols); gint *cols_index, gint n_cols);
GdaValueAttribute gda_data_proxy_get_value_attributes (GdaDataProxy *pr oxy, gint proxy_row, gint col); GdaValueAttribute gda_data_proxy_get_value_attributes (GdaDataProxy *pr oxy, gint proxy_row, gint col);
void gda_data_proxy_alter_value_attributes (GdaDataProxy *pr oxy, gint proxy_row, gint col, GdaValueAttribute alter_flags); void gda_data_proxy_alter_value_attributes (GdaDataProxy *pr oxy, gint proxy_row, gint col, GdaValueAttribute alter_flags);
gint gda_data_proxy_get_proxied_model_row (GdaDataProxy *pr oxy, gint proxy_row); gint gda_data_proxy_get_proxied_model_row (GdaDataProxy *pr oxy, gint proxy_row);
void gda_data_proxy_delete (GdaDataProxy *pr oxy, gint proxy_row); void gda_data_proxy_delete (GdaDataProxy *pr oxy, gint proxy_row);
void gda_data_proxy_undelete (GdaDataProxy *pr oxy, gint proxy_row); void gda_data_proxy_undelete (GdaDataProxy *pr oxy, gint proxy_row);
gboolean gda_data_proxy_row_is_deleted (GdaDataProxy *pr oxy, gint proxy_row); gboolean gda_data_proxy_row_is_deleted (GdaDataProxy *pr oxy, gint proxy_row);
gboolean gda_data_proxy_row_is_inserted (GdaDataProxy *pr oxy, gint proxy_row); gboolean gda_data_proxy_row_is_inserted (GdaDataProxy *pr oxy, gint proxy_row);
gint gda_data_proxy_find_row_from_values (GdaDataProxy *pr
oxy, GSList *values,
gint *cols_index)
;
gboolean gda_data_proxy_row_has_changed (GdaDataProxy *pr oxy, gint proxy_row); gboolean gda_data_proxy_row_has_changed (GdaDataProxy *pr oxy, gint proxy_row);
gboolean gda_data_proxy_has_changed (GdaDataProxy *pr oxy); gboolean gda_data_proxy_has_changed (GdaDataProxy *pr oxy);
gint gda_data_proxy_get_n_new_rows (GdaDataProxy *pr oxy); gint gda_data_proxy_get_n_new_rows (GdaDataProxy *pr oxy);
gint gda_data_proxy_get_n_modified_rows (GdaDataProxy *pr oxy); gint gda_data_proxy_get_n_modified_rows (GdaDataProxy *pr oxy);
gboolean gda_data_proxy_apply_row_changes (GdaDataProxy *pr oxy, gint proxy_row, GError **error); gboolean gda_data_proxy_apply_row_changes (GdaDataProxy *pr oxy, gint proxy_row, GError **error);
void gda_data_proxy_cancel_row_changes (GdaDataProxy *pr oxy, gint proxy_row, gint col); void gda_data_proxy_cancel_row_changes (GdaDataProxy *pr oxy, gint proxy_row, gint col);
gboolean gda_data_proxy_apply_all_changes (GdaDataProxy *pr oxy, GError **error); gboolean gda_data_proxy_apply_all_changes (GdaDataProxy *pr oxy, GError **error);
gboolean gda_data_proxy_cancel_all_changes (GdaDataProxy *pr oxy); gboolean gda_data_proxy_cancel_all_changes (GdaDataProxy *pr oxy);
 End of changes. 2 change blocks. 
8 lines changed or deleted 6 lines changed or added


 gda-enum-types.h   gda-enum-types.h 
skipping to change at line 42 skipping to change at line 42
/* enumerations from "gda-data-model.h" */ /* enumerations from "gda-data-model.h" */
GType gda_data_model_access_flags_get_type (void); GType gda_data_model_access_flags_get_type (void);
#define GDA_TYPE_DATA_MODEL_ACCESS_FLAGS (gda_data_model_access_flags_get_t ype()) #define GDA_TYPE_DATA_MODEL_ACCESS_FLAGS (gda_data_model_access_flags_get_t ype())
GType gda_data_model_hint_get_type (void); GType gda_data_model_hint_get_type (void);
#define GDA_TYPE_DATA_MODEL_HINT (gda_data_model_hint_get_type()) #define GDA_TYPE_DATA_MODEL_HINT (gda_data_model_hint_get_type())
GType gda_data_model_io_format_get_type (void); GType gda_data_model_io_format_get_type (void);
#define GDA_TYPE_DATA_MODEL_IO_FORMAT (gda_data_model_io_format_get_type()) #define GDA_TYPE_DATA_MODEL_IO_FORMAT (gda_data_model_io_format_get_type())
/* enumerations from "gda-data-model-iter.h" */ /* enumerations from "gda-data-model-iter.h" */
GType gda_data_model_iter_error_get_type (void); GType gda_data_model_iter_error_get_type (void);
#define GDA_TYPE_DATA_MODEL_ITER_ERROR (gda_data_model_iter_error_get_type( )) #define GDA_TYPE_DATA_MODEL_ITER_ERROR (gda_data_model_iter_error_get_type( ))
/* enumerations from "gda-data-model-query.h" */
GType gda_data_model_query_error_get_type (void);
#define GDA_TYPE_DATA_MODEL_QUERY_ERROR (gda_data_model_query_error_get_typ
e())
GType gda_data_model_query_options_get_type (void);
#define GDA_TYPE_DATA_MODEL_QUERY_OPTIONS (gda_data_model_query_options_get
_type())
/* enumerations from "gda-data-proxy.h" */ /* enumerations from "gda-data-proxy.h" */
GType gda_data_proxy_error_get_type (void); GType gda_data_proxy_error_get_type (void);
#define GDA_TYPE_DATA_PROXY_ERROR (gda_data_proxy_error_get_type()) #define GDA_TYPE_DATA_PROXY_ERROR (gda_data_proxy_error_get_type())
/* enumerations from "gda-easy.h" */ /* enumerations from "gda-easy.h" */
GType gda_easy_error_get_type (void); GType gda_easy_error_get_type (void);
#define GDA_TYPE_EASY_ERROR (gda_easy_error_get_type()) #define GDA_TYPE_EASY_ERROR (gda_easy_error_get_type())
GType gda_easy_create_table_flag_get_type (void); GType gda_easy_create_table_flag_get_type (void);
#define GDA_TYPE_EASY_CREATE_TABLE_FLAG (gda_easy_create_table_flag_get_typ e()) #define GDA_TYPE_EASY_CREATE_TABLE_FLAG (gda_easy_create_table_flag_get_typ e())
/* enumerations from "gda-enums.h" */ /* enumerations from "gda-enums.h" */
GType gda_transaction_isolation_get_type (void); GType gda_transaction_isolation_get_type (void);
#define GDA_TYPE_TRANSACTION_ISOLATION (gda_transaction_isolation_get_type( )) #define GDA_TYPE_TRANSACTION_ISOLATION (gda_transaction_isolation_get_type( ))
GType gda_value_attribute_get_type (void); GType gda_value_attribute_get_type (void);
#define GDA_TYPE_VALUE_ATTRIBUTE (gda_value_attribute_get_type()) #define GDA_TYPE_VALUE_ATTRIBUTE (gda_value_attribute_get_type())
GType gda_graph_type_get_type (void);
#define GDA_TYPE_GRAPH_TYPE (gda_graph_type_get_type())
GType gda_query_field_state_get_type (void);
#define GDA_TYPE_QUERY_FIELD_STATE (gda_query_field_state_get_type())
/* enumerations from "gda-holder.h" */ /* enumerations from "gda-holder.h" */
GType gda_holder_error_get_type (void); GType gda_holder_error_get_type (void);
#define GDA_TYPE_HOLDER_ERROR (gda_holder_error_get_type()) #define GDA_TYPE_HOLDER_ERROR (gda_holder_error_get_type())
/* enumerations from "gda-meta-store.h" */ /* enumerations from "gda-meta-store.h" */
GType gda_meta_store_error_get_type (void); GType gda_meta_store_error_get_type (void);
#define GDA_TYPE_META_STORE_ERROR (gda_meta_store_error_get_type()) #define GDA_TYPE_META_STORE_ERROR (gda_meta_store_error_get_type())
GType gda_meta_store_change_type_get_type (void); GType gda_meta_store_change_type_get_type (void);
#define GDA_TYPE_META_STORE_CHANGE_TYPE (gda_meta_store_change_type_get_typ e()) #define GDA_TYPE_META_STORE_CHANGE_TYPE (gda_meta_store_change_type_get_typ e())
/* enumerations from "gda-meta-struct.h" */ /* enumerations from "gda-meta-struct.h" */
GType gda_meta_struct_error_get_type (void); GType gda_meta_struct_error_get_type (void);
 End of changes. 2 change blocks. 
11 lines changed or deleted 0 lines changed or added


 gda-enums.h   gda-enums.h 
skipping to change at line 48 skipping to change at line 48
GDA_VALUE_ATTR_IS_DEFAULT = 1 << 2, GDA_VALUE_ATTR_IS_DEFAULT = 1 << 2,
GDA_VALUE_ATTR_CAN_BE_DEFAULT = 1 << 3, GDA_VALUE_ATTR_CAN_BE_DEFAULT = 1 << 3,
GDA_VALUE_ATTR_IS_UNCHANGED = 1 << 4, GDA_VALUE_ATTR_IS_UNCHANGED = 1 << 4,
GDA_VALUE_ATTR_ACTIONS_SHOWN = 1 << 5, GDA_VALUE_ATTR_ACTIONS_SHOWN = 1 << 5,
GDA_VALUE_ATTR_DATA_NON_VALID = 1 << 6, GDA_VALUE_ATTR_DATA_NON_VALID = 1 << 6,
GDA_VALUE_ATTR_HAS_VALUE_ORIG = 1 << 7, GDA_VALUE_ATTR_HAS_VALUE_ORIG = 1 << 7,
GDA_VALUE_ATTR_NO_MODIF = 1 << 8, GDA_VALUE_ATTR_NO_MODIF = 1 << 8,
GDA_VALUE_ATTR_UNUSED = 1 << 9 GDA_VALUE_ATTR_UNUSED = 1 << 9
} GdaValueAttribute; } GdaValueAttribute;
/* different possible types for a GdaGraph object */ /* possible different keywords used when qualifying a table's column's extr
typedef enum { a attributes */
GDA_GRAPH_DB_RELATIONS, #define GDA_EXTRA_AUTO_INCREMENT "AUTO_INCREMENT"
GDA_GRAPH_QUERY_JOINS,
GDA_GRAPH_MODELLING /* for future extensions */
} GdaGraphType;
typedef enum {
GDA_ENTITY_FIELD_VISIBLE = 1 << 0,
GDA_ENTITY_FIELD_INVISIBLE = 1 << 1,
GDA_ENTITY_FIELD_ANY = GDA_ENTITY_FIELD_VISIBLE | GDA_ENTITY_F
IELD_INVISIBLE
} GdaQueryFieldState;
#endif #endif
 End of changes. 1 change blocks. 
13 lines changed or deleted 3 lines changed or added


 gda-holder.h   gda-holder.h 
skipping to change at line 39 skipping to change at line 39
#define GDA_TYPE_HOLDER (gda_holder_get_type()) #define GDA_TYPE_HOLDER (gda_holder_get_type())
#define GDA_HOLDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_holde r_get_type(), GdaHolder) #define GDA_HOLDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_holde r_get_type(), GdaHolder)
#define GDA_HOLDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_holder _get_type (), GdaHolderClass) #define GDA_HOLDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_holder _get_type (), GdaHolderClass)
#define GDA_IS_HOLDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_holde r_get_type ()) #define GDA_IS_HOLDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_holde r_get_type ())
/* error reporting */ /* error reporting */
extern GQuark gda_holder_error_quark (void); extern GQuark gda_holder_error_quark (void);
#define GDA_HOLDER_ERROR gda_holder_error_quark () #define GDA_HOLDER_ERROR gda_holder_error_quark ()
typedef enum { typedef enum {
GDA_HOLDER_QUERY_LIMIT_ERROR GDA_HOLDER_STRING_CONVERSION_ERROR,
GDA_HOLDER_VALUE_TYPE_ERROR,
GDA_HOLDER_VALUE_NULL_ERROR
} GdaHolderError; } GdaHolderError;
/* struct for the object's data */ /* struct for the object's data */
struct _GdaHolder struct _GdaHolder
{ {
GObject object; GObject object;
GdaHolderPrivate *priv; GdaHolderPrivate *priv;
}; };
/* struct for the object's class */ /* struct for the object's class */
struct _GdaHolderClass struct _GdaHolderClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
void (*changed) (GdaHolder *holder); void (*changed) (GdaHolder *holder);
void (*source_changed) (GdaHolder *holder); void (*source_changed) (GdaHolder *holder);
GError *(*validate_change) (GdaHolder *holder, con
st GValue *new_value);
void (*att_changed) (GdaHolder *holder, con
st gchar *att_name, const GValue *att_value);
}; };
GType gda_holder_get_type (void) G_GNUC_CONST; GType gda_holder_get_type (void) G_GNUC_CONST;
GdaHolder *gda_holder_new (GType type); GdaHolder *gda_holder_new (GType type);
GdaHolder *gda_holder_new_inline (GType type, const g char *id, ...); GdaHolder *gda_holder_new_inline (GType type, const g char *id, ...);
GdaHolder *gda_holder_copy (GdaHolder *orig); GdaHolder *gda_holder_copy (GdaHolder *orig);
GType gda_holder_get_g_type (GdaHolder *holder); GType gda_holder_get_g_type (GdaHolder *holder);
const gchar *gda_holder_get_id (GdaHolder *holder); const gchar *gda_holder_get_id (GdaHolder *holder);
#define gda_holder_new_string(id,str) gda_holder_new_inline (G_TYPE_STRING, (id), (str)) #define gda_holder_new_string(id,str) gda_holder_new_inline (G_TYPE_STRING, (id), (str))
#define gda_holder_new_boolean(id,abool) gda_holder_new_inline (G_TYPE_BOOL EAN, (id), (abool)) #define gda_holder_new_boolean(id,abool) gda_holder_new_inline (G_TYPE_BOOL EAN, (id), (abool))
#define gda_holder_new_int(id,anint) gda_holder_new_inline (G_TYPE_INT, (id ), (anint)) #define gda_holder_new_int(id,anint) gda_holder_new_inline (G_TYPE_INT, (id ), (anint))
const GValue *gda_holder_get_value (GdaHolder *holder); const GValue *gda_holder_get_value (GdaHolder *holder);
gchar *gda_holder_get_value_str (GdaHolder *holder, GdaDataHandler *dh); gchar *gda_holder_get_value_str (GdaHolder *holder, GdaDataHandler *dh);
gboolean gda_holder_set_value (GdaHolder *holder, gboolean gda_holder_set_value (GdaHolder *holder,
const GValue *value); const GValue *value, GError **error);
gboolean gda_holder_take_value (GdaHolder *holder, gboolean gda_holder_take_value (GdaHolder *holder,
GValue *value); GValue *value, GError **error);
gboolean gda_holder_set_value_str (GdaHolder *holder, GValue *gda_holder_take_static_value (GdaHolder *holder,
GdaDataHandler *dh, const gchar *value); const GValue *value, gboolean *value_changed, GError **error);
gboolean gda_holder_set_value_str (GdaHolder *holder,
GdaDataHandler *dh, const gchar *value, GError **error);
const GValue *gda_holder_get_default_value (GdaHolder *holder); const GValue *gda_holder_get_default_value (GdaHolder *holder);
void gda_holder_set_default_value (GdaHolder *holder, const GValue *value); void gda_holder_set_default_value (GdaHolder *holder, const GValue *value);
gboolean gda_holder_set_value_to_default (GdaHolder *holder); gboolean gda_holder_set_value_to_default (GdaHolder *holder);
gboolean gda_holder_value_is_default (GdaHolder *holder); gboolean gda_holder_value_is_default (GdaHolder *holder);
void gda_holder_force_invalid (GdaHolder *holder); void gda_holder_force_invalid (GdaHolder *holder);
gboolean gda_holder_is_valid (GdaHolder *holder); gboolean gda_holder_is_valid (GdaHolder *holder);
void gda_holder_set_not_null (GdaHolder *holder, gboolean not_null); void gda_holder_set_not_null (GdaHolder *holder, gboolean not_null);
gboolean gda_holder_get_not_null (GdaHolder *holder); gboolean gda_holder_get_not_null (GdaHolder *holder);
gboolean gda_holder_set_source_model (GdaHolder *holder, GdaDataModel *model, gboolean gda_holder_set_source_model (GdaHolder *holder, GdaDataModel *model,
gint col, GError ** error); gint col, GError ** error);
GdaDataModel *gda_holder_get_source_model (GdaHolder *holder, gint *col); GdaDataModel *gda_holder_get_source_model (GdaHolder *holder, gint *col);
void gda_holder_set_bind (GdaHolder *holder, GdaHolder *bind_to); gboolean gda_holder_set_bind (GdaHolder *holder, GdaHolder *bind_to, GError **error);
GdaHolder *gda_holder_get_bind (GdaHolder *holder) ; GdaHolder *gda_holder_get_bind (GdaHolder *holder) ;
const GValue *gda_holder_get_attribute (GdaHolder *holder,
const gchar *attribute);
void gda_holder_set_attribute (GdaHolder *holder,
const gchar *attribute, const GValue *value);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 5 change blocks. 
8 lines changed or deleted 21 lines changed or added


 gda-marshal.h   gda-marshal.h 
skipping to change at line 117 skipping to change at line 117
gpointer marshal_data); gpointer marshal_data);
/* VOID:ENUM,POINTER (gda-marshal.list:40) */ /* VOID:ENUM,POINTER (gda-marshal.list:40) */
extern void gda_marshal_VOID__ENUM_POINTER (GClosure *closure, extern void gda_marshal_VOID__ENUM_POINTER (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* BOOLEAN:INT (gda-marshal.list:41) */ /* POINTER:INT,INT (gda-marshal.list:41) */
extern void gda_marshal_BOOLEAN__INT (GClosure *closure, extern void gda_marshal_POINTER__INT_INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* BOOLEAN:INT,INT (gda-marshal.list:42) */
extern void gda_marshal_BOOLEAN__INT_INT (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* POINTER:VOID (gda-marshal.list:42) */
extern void gda_marshal_POINTER__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* POINTER:POINTER (gda-marshal.list:43) */ /* POINTER:POINTER (gda-marshal.list:43) */
extern void gda_marshal_POINTER__POINTER (GClosure *closure, extern void gda_marshal_POINTER__POINTER (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* BOOLEAN:POINTER (gda-marshal.list:44) */ /* BOOLEAN:POINTER (gda-marshal.list:44) */
extern void gda_marshal_BOOLEAN__POINTER (GClosure *closure, extern void gda_marshal_BOOLEAN__POINTER (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* POINTER:OBJECT,POINTER (gda-marshal.list:45) */
extern void gda_marshal_POINTER__OBJECT_POINTER (GClosure *closure,
GValue *return_value
,
guint n_param_valu
es,
const GValue *param_values
,
gpointer invocation_h
int,
gpointer marshal_data
);
/* VOID:STRING,POINTER (gda-marshal.list:46) */
extern void gda_marshal_VOID__STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint
,
gpointer marshal_data);
/* VOID:OBJECT,STRING,POINTER (gda-marshal.list:47) */
extern void gda_marshal_VOID__OBJECT_STRING_POINTER (GClosure *closure,
GValue *return_v
alue,
guint n_param_
values,
const GValue *param_va
lues,
gpointer invocati
on_hint,
gpointer marshal_
data);
G_END_DECLS G_END_DECLS
#endif /* __gda_marshal_MARSHAL_H__ */ #endif /* __gda_marshal_MARSHAL_H__ */
 End of changes. 3 change blocks. 
10 lines changed or deleted 45 lines changed or added


 gda-meta-store.h   gda-meta-store.h 
skipping to change at line 41 skipping to change at line 41
#define GDA_TYPE_META_STORE (gda_meta_store_get_type()) #define GDA_TYPE_META_STORE (gda_meta_store_get_type())
#define GDA_META_STORE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_m eta_store_get_type(), GdaMetaStore) #define GDA_META_STORE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_m eta_store_get_type(), GdaMetaStore)
#define GDA_META_STORE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_me ta_store_get_type (), GdaMetaStoreClass) #define GDA_META_STORE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_me ta_store_get_type (), GdaMetaStoreClass)
#define GDA_IS_META_STORE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_m eta_store_get_type ()) #define GDA_IS_META_STORE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_m eta_store_get_type ())
/* error reporting */ /* error reporting */
extern GQuark gda_meta_store_error_quark (void); extern GQuark gda_meta_store_error_quark (void);
#define GDA_META_STORE_ERROR gda_meta_store_error_quark () #define GDA_META_STORE_ERROR gda_meta_store_error_quark ()
typedef enum { typedef enum {
GDA_META_STORE_INCORRECT_SCHEMA, GDA_META_STORE_INCORRECT_SCHEMA_ERROR,
GDA_META_STORE_UNSUPPORTED_PROVIDER, GDA_META_STORE_UNSUPPORTED_PROVIDER_ERROR,
GDA_META_STORE_INTERNAL_ERROR, GDA_META_STORE_INTERNAL_ERROR,
GDA_META_STORE_META_CONTEXT_ERROR, GDA_META_STORE_META_CONTEXT_ERROR,
GDA_META_STORE_MODIFY_CONTENTS_ERROR, GDA_META_STORE_MODIFY_CONTENTS_ERROR,
GDA_META_STORE_EXTRACT_SQL_ERROR, GDA_META_STORE_EXTRACT_SQL_ERROR,
GDA_META_STORE_ATTRIBUTE_NOT_FOUND_ERROR, GDA_META_STORE_ATTRIBUTE_NOT_FOUND_ERROR,
GDA_META_STORE_ATTRIBUTE_ERROR, GDA_META_STORE_ATTRIBUTE_ERROR,
GDA_META_STORE_SCHEMA_OBJECT_NOT_FOUND_ERROR, GDA_META_STORE_SCHEMA_OBJECT_NOT_FOUND_ERROR,
GDA_META_STORE_SCHEMA_OBJECT_CONFLICT_ERROR, GDA_META_STORE_SCHEMA_OBJECT_CONFLICT_ERROR,
GDA_META_STORE_SCHEMA_OBJECT_DESCR_ERROR, GDA_META_STORE_SCHEMA_OBJECT_DESCR_ERROR,
GDA_META_STORE_TRANSACTION_ALREADY_STARTED_ERROR GDA_META_STORE_TRANSACTION_ALREADY_STARTED_ERROR
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 gda-meta-struct.h   gda-meta-struct.h 
skipping to change at line 28 skipping to change at line 28
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GDA_META_STRUCT_H_ #ifndef __GDA_META_STRUCT_H_
#define __GDA_META_STRUCT_H_ #define __GDA_META_STRUCT_H_
#include <glib-object.h> #include <glib-object.h>
#include <libgda/gda-data-model.h> #include <libgda/gda-data-model.h>
#include <libgda/gda-meta-store.h> #include <libgda/gda-meta-store.h>
#include <libgda/gda-decl.h> #include <libgda/gda-decl.h>
#include <libgda/gda-attributes-manager.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_META_STRUCT (gda_meta_struct_get_type()) #define GDA_TYPE_META_STRUCT (gda_meta_struct_get_type())
#define GDA_META_STRUCT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_ meta_struct_get_type(), GdaMetaStruct) #define GDA_META_STRUCT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_ meta_struct_get_type(), GdaMetaStruct)
#define GDA_META_STRUCT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_m eta_struct_get_type (), GdaMetaStructClass) #define GDA_META_STRUCT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_m eta_struct_get_type (), GdaMetaStructClass)
#define GDA_IS_META_STRUCT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_ meta_struct_get_type ()) #define GDA_IS_META_STRUCT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_ meta_struct_get_type ())
/* error reporting */ /* error reporting */
extern GQuark gda_meta_struct_error_quark (void); extern GQuark gda_meta_struct_error_quark (void);
skipping to change at line 115 skipping to change at line 116
* Complements the GdaMetaDbObject structure, for views only * Complements the GdaMetaDbObject structure, for views only
* contains more information than for tables * contains more information than for tables
*/ */
typedef struct { typedef struct {
GdaMetaTable table; GdaMetaTable table;
gchar *view_def; gchar *view_def;
gboolean is_updatable; gboolean is_updatable;
} GdaMetaView; } GdaMetaView;
/* /*
* Struture to hold information about each object * Struture to hold information about each database object (tables, views,
* which can be created in the internal GdaMetaStore's connection. triggers, ...)
* It is available for tables, views, triggers, ...
* *
* Note: @obj_catalog, @obj_schema, @obj_name, @obj_short_name and @obj_ful l_name are case sensitive: * Note: @obj_catalog, @obj_schema, @obj_name, @obj_short_name and @obj_ful l_name are case sensitive:
* one must call _identifier_needs_quotes() to know is it is necessar y to surround by double quotes * one must call gda_sql_identifier_needs_quotes() to know if is it i s necessary to surround by double quotes
* before using in an SQL statement * before using in an SQL statement
*/ */
typedef struct { typedef struct {
union { union {
GdaMetaTable meta_table; GdaMetaTable meta_table;
GdaMetaView meta_view; GdaMetaView meta_view;
} extra; } extra;
GdaMetaDbObjectType obj_type; GdaMetaDbObjectType obj_type;
gboolean outdated; gboolean outdated;
gchar *obj_catalog; gchar *obj_catalog;
skipping to change at line 148 skipping to change at line 147
} GdaMetaDbObject; } GdaMetaDbObject;
#define GDA_META_DB_OBJECT(x) ((GdaMetaDbObject*)(x)) #define GDA_META_DB_OBJECT(x) ((GdaMetaDbObject*)(x))
#define GDA_META_TABLE(dbobj) (&((dbobj)->extra.meta_table)) #define GDA_META_TABLE(dbobj) (&((dbobj)->extra.meta_table))
#define GDA_META_VIEW(dbobj) (&((dbobj)->extra.meta_view)) #define GDA_META_VIEW(dbobj) (&((dbobj)->extra.meta_view))
typedef struct { typedef struct {
gchar *column_name; gchar *column_name;
gchar *column_type; gchar *column_type;
GType gtype; GType gtype;
gboolean pkey; gboolean pkey;
gboolean nullok; gboolean nullok;
gchar *default_value; gchar *default_value;
} GdaMetaTableColumn; } GdaMetaTableColumn;
#define GDA_META_TABLE_COLUMN(x) ((GdaMetaTableColumn*)(x)) #define GDA_META_TABLE_COLUMN(x) ((GdaMetaTableColumn*)(x))
const GValue *gda_meta_table_column_get_attribute (GdaMetaTableColumn *tcol
, const gchar *att_name);
void gda_meta_table_column_set_attribute (GdaMetaTableColumn *tcol
, const gchar *att_name, const GValue *value);
void gda_meta_table_column_foreach_attribute (GdaMetaTableColumn *
tcol, GdaAttributesManagerFunc func, gpointer data);
typedef struct { typedef struct {
GdaMetaDbObject *meta_table; GdaMetaDbObject *meta_table;
GdaMetaDbObject *depend_on; GdaMetaDbObject *depend_on;
gint cols_nb; gint cols_nb;
gint *fk_cols_array; /* FK fields index */ gint *fk_cols_array; /* FK fields index */
gchar **fk_names_array; /* FK fields names */ gchar **fk_names_array; /* FK fields names */
gint *ref_pk_cols_array; /* Ref PK fields index */ gint *ref_pk_cols_array; /* Ref PK fields index */
gchar **ref_pk_names_array; /* Ref PK fields names */ gchar **ref_pk_names_array; /* Ref PK fields names */
 End of changes. 5 change blocks. 
5 lines changed or deleted 11 lines changed or added


 gda-pstmt.h   gda-pstmt.h 
skipping to change at line 38 skipping to change at line 38
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_PSTMT (gda_pstmt_get_type()) #define GDA_TYPE_PSTMT (gda_pstmt_get_type())
#define GDA_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYP E_PSTMT, GdaPStmt)) #define GDA_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYP E_PSTMT, GdaPStmt))
#define GDA_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE _PSTMT, GdaPStmtClass)) #define GDA_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE _PSTMT, GdaPStmtClass))
#define GDA_IS_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE _PSTMT)) #define GDA_IS_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE _PSTMT))
#define GDA_IS_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYP E_PSTMT)) #define GDA_IS_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYP E_PSTMT))
typedef struct _GdaPStmt GdaPStmt; typedef struct _GdaPStmt GdaPStmt;
typedef struct _GdaPStmtPrivate GdaPStmtPrivate;
typedef struct _GdaPStmtClass GdaPStmtClass; typedef struct _GdaPStmtClass GdaPStmtClass;
struct _GdaPStmt { struct _GdaPStmt {
GObject object; GObject object;
GdaStatement *stmt; /* GdaPStmt object holds a reference on this stm t object, may be NULL */ GdaPStmtPrivate *priv;
gchar *sql; /* actual SQL code used for this prepared stateme nt, mem freed by GdaPStmt */ gchar *sql; /* actual SQL code used for this prepared stateme nt, mem freed by GdaPStmt */
GSList *param_ids; /* list of parameters' IDs (as gchar *), m em freed by GdaPStmt */ GSList *param_ids; /* list of parameters' IDs (as gchar *), m em freed by GdaPStmt */
/* meta data */ /* meta data */
gint ncols; gint ncols;
GType *types; /* array of ncols types */ GType *types; /* array of ncols types */
GSList *tmpl_columns; /* list of #GdaColumn objects which data models created from this prep. statement GSList *tmpl_columns; /* list of #GdaColumn objects which data models created from this prep. statement
* can copy */ * can copy */
}; };
struct _GdaPStmtClass { struct _GdaPStmtClass {
GObjectClass parent_class; GObjectClass parent_class;
}; };
GType gda_pstmt_get_type (void) G_GNUC_CONST; GType gda_pstmt_get_type (void) G_GNUC_CONST;
void gda_pstmt_set_gda_statement (GdaPStmt *pstmt, GdaStatement *stmt); void gda_pstmt_set_gda_statement (GdaPStmt *pstmt, GdaStatement *s
void gda_pstmt_copy_contents (GdaPStmt *src, GdaPStmt *dest); tmt);
void gda_pstmt_copy_contents (GdaPStmt *src, GdaPStmt *dest);
GdaStatement *gda_pstmt_get_gda_statement (GdaPStmt *pstmt);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 7 lines changed or added


 gda-row.h   gda-row.h 
/* GDA library /* GDA library
* Copyright (C) 1998 - 2005 The GNOME Foundation. * Copyright (C) 1998 - 2008 The GNOME Foundation.
* *
* AUTHORS: * AUTHORS:
* Michael Lausch <michael@lausch.at> * Michael Lausch <michael@lausch.at>
* Rodrigo Moya <rodrigo@gnome-db.org> * Rodrigo Moya <rodrigo@gnome-db.org>
* Vivien Malerba <malerba@gnome-db.org> * Vivien Malerba <malerba@gnome-db.org>
* *
* This Library is free software; you can redistribute it and/or * This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as * modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the * published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version. * License, or (at your option) any later version.
skipping to change at line 29 skipping to change at line 29
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this Library; see the file COPYING.LIB. If not, * License along with this Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 , * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GDA_ROW_H__ #ifndef __GDA_ROW_H__
#define __GDA_ROW_H__ #define __GDA_ROW_H__
#include <glib-object.h> #include <glib-object.h>
#include <libgda/gda-column.h>
#include <glib/gmacros.h>
#include <libgda/gda-decl.h> #include <libgda/gda-decl.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_ROW (gda_row_get_type()) #define GDA_TYPE_ROW (gda_row_get_type())
#define GDA_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_ ROW, GdaRow)) #define GDA_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_ ROW, GdaRow))
#define GDA_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_R OW, GdaRowClass)) #define GDA_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_R OW, GdaRowClass))
#define GDA_IS_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_ ROW)) #define GDA_IS_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_ ROW))
#define GDA_IS_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE _ROW)) #define GDA_IS_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE _ROW))
skipping to change at line 52 skipping to change at line 50
typedef struct _GdaRowClass GdaRowClass; typedef struct _GdaRowClass GdaRowClass;
typedef struct _GdaRowPrivate GdaRowPrivate; typedef struct _GdaRowPrivate GdaRowPrivate;
struct _GdaRow { struct _GdaRow {
GObject object; GObject object;
GdaRowPrivate *priv; GdaRowPrivate *priv;
}; };
struct _GdaRowClass { struct _GdaRowClass {
GObjectClass parent_class; GObjectClass parent_class;
/* signals */
gboolean (* value_to_change) (GdaRow *row, gint num, const GValue *c
urrent, const GValue *proposed);
void (* value_changed) (GdaRow *row, gint num, const GValue *o
ld_value, const GValue *new_value);
}; };
GType gda_row_get_type (void) G_GNUC_CONST; GType gda_row_get_type (void) G_GNUC_CONST;
GdaRow *gda_row_new (GdaDataModel *model, gint count);
GdaRow *gda_row_new_from_list (GdaDataModel *model, const GList *val
ues);
GdaRow *gda_row_copy (GdaRow *row);
void gda_row_set_model (GdaRow *row, GdaDataModel *model);
GdaDataModel *gda_row_get_model (GdaRow *row);
GdaRow *gda_row_new (gint count);
gint gda_row_get_length (GdaRow *row); gint gda_row_get_length (GdaRow *row);
GValue *gda_row_get_value (GdaRow *row, gint num);
gint gda_row_get_number (GdaRow *row);
void gda_row_set_number (GdaRow *row, gint number);
const gchar *gda_row_get_id (GdaRow *row);
void gda_row_set_id (GdaRow *row, const gchar *id);
GValue *gda_row_get_value (GdaRow *row, gint num);
gboolean gda_row_set_value (GdaRow *row, gint num, const GValue *
value);
void gda_row_set_is_default (GdaRow *row, gint num, gboolean is_de
fault);
gboolean gda_row_get_is_default (GdaRow *row, gint num);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 6 change blocks. 
32 lines changed or deleted 4 lines changed or added


 gda-server-provider-extra.h   gda-server-provider-extra.h 
skipping to change at line 53 skipping to change at line 53
/* /*
* Default perform operation * Default perform operation
*/ */
gboolean gda_server_provider_perform_operation_default (GdaServerProvider * provider, GdaConnection *cnc, gboolean gda_server_provider_perform_operation_default (GdaServerProvider * provider, GdaConnection *cnc,
GdaServerOperation * op, GError **error); GdaServerOperation * op, GError **error);
/* default data handler method */ /* default data handler method */
GdaDataHandler *gda_server_provider_get_data_handler_default (GdaServerProv ider *provider, GdaConnection *cnc, GdaDataHandler *gda_server_provider_get_data_handler_default (GdaServerProv ider *provider, GdaConnection *cnc,
GType type, co nst gchar *dbms_type); GType type, co nst gchar *dbms_type);
/* Convert a SELECT statement with potentially some parameters to another S
ELECT statement
* where all the parameters are removed and where the WHERE condition is se
t to "0 = 1"
* to make sure no row will ever be returned
*/
GdaStatement *gda_select_alter_select_for_empty (GdaStatement *stmt, GError
**error);
/* /*
* Help to implement the GdaDataHandler retreiving for the providers * Help to implement the GdaDataHandler retreiving for the providers
*/ */
typedef struct { typedef struct {
GdaConnection *cnc; GdaConnection *cnc;
GType g_type; GType g_type;
gchar *dbms_type; gchar *dbms_type;
} GdaServerProviderHandlerInfo; } GdaServerProviderHandlerInfo;
GdaDataHandler *gda_server_provider_handler_find (GdaServerProvi der *prov, GdaConnection *cnc, GdaDataHandler *gda_server_provider_handler_find (GdaServerProvi der *prov, GdaConnection *cnc,
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 gda-server-provider.h   gda-server-provider.h 
skipping to change at line 59 skipping to change at line 59
{ {
GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR, GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR, GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR, GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR,
GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR, GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR, GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
GDA_SERVER_PROVIDER_OPERATION_ERROR, GDA_SERVER_PROVIDER_OPERATION_ERROR,
GDA_SERVER_PROVIDER_INTERNAL_ERROR, GDA_SERVER_PROVIDER_INTERNAL_ERROR,
GDA_SERVER_PROVIDER_BUSY_ERROR, GDA_SERVER_PROVIDER_BUSY_ERROR,
GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR, GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
GDA_SERVER_PROVIDER_DATA_ERROR
} GdaServerProviderError; } GdaServerProviderError;
struct _GdaServerProvider { struct _GdaServerProvider {
GObject object; GObject object;
GdaServerProviderPrivate *priv; GdaServerProviderPrivate *priv;
}; };
typedef struct { typedef struct {
/* _information_schema_catalog_name */ /* _information_schema_catalog_name */
gboolean (*_info) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **); gboolean (*_info) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **);
skipping to change at line 196 skipping to change at line 197
gboolean (*xa_end) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **); gboolean (*xa_end) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **);
gboolean (*xa_prepare) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **); gboolean (*xa_prepare) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **);
gboolean (*xa_commit) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **); gboolean (*xa_commit) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **);
gboolean (*xa_rollback) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **); gboolean (*xa_rollback) (GdaServerProvider *, GdaConnection *, const GdaXaTransactionId *, GError **);
GList *(*xa_recover) (GdaServerProvider *, GdaConnection *, GErro r **); GList *(*xa_recover) (GdaServerProvider *, GdaConnection *, GErro r **);
} GdaServerProviderXa; } GdaServerProviderXa;
typedef void (*GdaServerProviderAsyncCallback) (GdaServerProvider *provider , GdaConnection *cnc, guint task_id, typedef void (*GdaServerProviderAsyncCallback) (GdaServerProvider *provider , GdaConnection *cnc, guint task_id,
gboolean result_status, gpoi gboolean result_status, cons
nter data); t GError *error, gpointer data);
typedef void (*GdaServerProviderExecCallback) (GdaServerProvider *provider,
GdaConnection *cnc, guint task_id,
GObject *result_obj, const GE
rror *error, gpointer data);
struct _GdaServerProviderClass { struct _GdaServerProviderClass {
GObjectClass parent_class; GObjectClass parent_class;
/* provider information */ /* provider information */
GThread * limiting_thread; /* if not NULL, then usin g the provider will be limited to this thread */
const gchar *(* get_name) (GdaServerProvider *provider); const gchar *(* get_name) (GdaServerProvider *provider);
const gchar *(* get_version) (GdaServerProvider *provider); const gchar *(* get_version) (GdaServerProvider *provider);
const gchar *(* get_server_version) (GdaServerProvider *provider, GdaConnection *cnc); const gchar *(* get_server_version) (GdaServerProvider *provider, GdaConnection *cnc);
gboolean (* supports_feature) (GdaServerProvider *provider, GdaConnection *cnc, gboolean (* supports_feature) (GdaServerProvider *provider, GdaConnection *cnc,
GdaConnectionFeatu re feature); GdaConnectionFeatu re feature);
/* types and values manipulation */ /* types and values manipulation */
GdaDataHandler *(* get_data_handler) (GdaServerProvider *provider, GdaConnection *cnc, GdaDataHandler *(* get_data_handler) (GdaServerProvider *provider, GdaConnection *cnc,
GType g_type, cons t gchar *dbms_type); GType g_type, cons t gchar *dbms_type);
const gchar *(*get_def_dbms_type) (GdaServerProvider *provider, GdaConnection *cnc, GType g_type); const gchar *(*get_def_dbms_type) (GdaServerProvider *provider, GdaConnection *cnc, GType g_type);
gchar *(*escape_string) (GdaServerProvider *provider, GdaConnection *cnc, const gchar *str); gchar *(*escape_string) (GdaServerProvider *provider, GdaConnection *cnc, const gchar *str);
skipping to change at line 260 skipping to change at line 264
GdaSqlParser *(* create_parser) (GdaServerProvider *provider, GdaConnection *cnc); GdaSqlParser *(* create_parser) (GdaServerProvider *provider, GdaConnection *cnc);
gchar *(* statement_to_sql) (GdaServerProvider *provider, GdaConnection *cnc, gchar *(* statement_to_sql) (GdaServerProvider *provider, GdaConnection *cnc,
GdaStatement *stmt , GdaSet *params, GdaStatementSqlFlag flags, GdaStatement *stmt , GdaSet *params, GdaStatementSqlFlag flags,
GSList **params_us ed, GError **error); GSList **params_us ed, GError **error);
gboolean (* statement_prepare) (GdaServerProvider *provider, GdaConnection *cnc, gboolean (* statement_prepare) (GdaServerProvider *provider, GdaConnection *cnc,
GdaStatement *stmt , GError **error); GdaStatement *stmt , GError **error);
GObject *(* statement_execute) (GdaServerProvider *provider, GdaConnection *cnc, GObject *(* statement_execute) (GdaServerProvider *provider, GdaConnection *cnc,
GdaStatement *stmt , GdaSet *params, GdaStatement *stmt , GdaSet *params,
GdaStatementModelU sage model_usage, GdaStatementModelU sage model_usage,
GType *col_types, GdaSet **last_inserted_row, GType *col_types, GdaSet **last_inserted_row,
guint *task_id, Gd aServerProviderAsyncCallback async_cb, guint *task_id, Gd aServerProviderExecCallback exec_cb,
gpointer cb_data, GError **error); gpointer cb_data, GError **error);
/* Misc */ /* Misc */
gboolean (* is_busy) (GdaServerProvider *provider, GdaConnection *cnc, GError **error); gboolean (* is_busy) (GdaServerProvider *provider, GdaConnection *cnc, GError **error);
gboolean (* cancel) (GdaServerProvider *provider, GdaConnection *cnc, gboolean (* cancel) (GdaServerProvider *provider, GdaConnection *cnc,
guint task_id, GEr ror **error); guint task_id, GEr ror **error);
GdaConnection *(* create_connection) (GdaServerProvider *provider); GdaConnection *(* create_connection) (GdaServerProvider *provider);
/* meta data reporting */ /* meta data reporting */
GdaServerProviderMeta meta_funcs; GdaServerProviderMeta meta_funcs;
 End of changes. 4 change blocks. 
4 lines changed or deleted 10 lines changed or added


 gda-set.h   gda-set.h 
skipping to change at line 40 skipping to change at line 40
#define GDA_SET(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_set_get_ type(), GdaSet) #define GDA_SET(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_set_get_ type(), GdaSet)
#define GDA_SET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_set_get_t ype (), GdaSetClass) #define GDA_SET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_set_get_t ype (), GdaSetClass)
#define GDA_IS_SET(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_set_get_ type ()) #define GDA_IS_SET(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_set_get_ type ())
/* error reporting */ /* error reporting */
extern GQuark gda_set_error_quark (void); extern GQuark gda_set_error_quark (void);
#define GDA_SET_ERROR gda_set_error_quark () #define GDA_SET_ERROR gda_set_error_quark ()
typedef enum typedef enum
{ {
/*GDA_SET_NO_NODE_ERROR, GDA_SET_XML_SPEC_ERROR,
GDA_SET_NODE_OUTDATED_ERROR, GDA_SET_HOLDER_NOT_FOUND_ERROR,
GDA_SET_VALUE_PROV_OBJ_TYPE_ERROR, GDA_SET_INVALID_ERROR
GDA_SET_VALUE_PROV_DATA_TYPE_ERROR,
GDA_SET_VALUE_PROV_INVISIBLE_ERROR,
GDA_SET_VALUE_PROV_QUERY_TYPE_ERROR,
GDA_SET_DEPENDENCY_NOT_IN_SET_ERROR,
GDA_SET_DEPENDENCY_POSITION_ERROR,*/
GDA_SET_XML_SPEC_ERROR
} GdaSetError; } GdaSetError;
typedef enum { typedef enum {
GDA_SET_HOLDER_READ_ONLY = 1 << 0, /* holder should not be affected by user modifications */ GDA_SET_HOLDER_READ_ONLY = 1 << 0, /* holder should not be affected by user modifications */
GDA_SET_HOLDER_HIDE = 1 << 1 /* holder should not be shown to the user */ GDA_SET_HOLDER_HIDE = 1 << 1 /* holder should not be shown to the user */
} GdaSetHint; } GdaSetHint;
/** /**
* GdaSetNode: * GdaSetNode:
* *
skipping to change at line 124 skipping to change at line 118
GSList *nodes_list; /* list of GdaSetNode */ GSList *nodes_list; /* list of GdaSetNode */
GSList *sources_list; /* list of GdaSetSource */ GSList *sources_list; /* list of GdaSetSource */
GSList *groups_list; /* list of GdaSetGroup */ GSList *groups_list; /* list of GdaSetGroup */
}; };
/* struct for the object's class */ /* struct for the object's class */
struct _GdaSetClass struct _GdaSetClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
GError *(*validate_holder_change)(GdaSet *set, GdaHold
er *holder, const GValue *new_value);
GError *(*validate_set) (GdaSet *set);
void (*holder_changed) (GdaSet *set, GdaHold er *holder); void (*holder_changed) (GdaSet *set, GdaHold er *holder);
void (*holder_plugin_changed) (GdaSet *set, GdaHold void (*holder_attr_changed) (GdaSet *set, GdaHold
er *holder); er *holder,
void (*holder_attr_changed) (GdaSet *set, GdaHold const gchar *attr_na
er *holder); me, const GValue *value);
void (*public_data_changed) (GdaSet *set); void (*public_data_changed) (GdaSet *set);
}; };
GType gda_set_get_type (void) G_GNUC_CONST; GType gda_set_get_type (void) G_GNUC_CONST;
GdaSet *gda_set_new (GSList *holders); GdaSet *gda_set_new (GSList *holders);
GdaSet *gda_set_copy (GdaSet *set); GdaSet *gda_set_copy (GdaSet *set);
GdaSet *gda_set_new_inline (gint nb, ...); GdaSet *gda_set_new_inline (gint nb, ...);
GdaSet *gda_set_new_from_spec_string (const gchar *xml_spec, GErr or **error); GdaSet *gda_set_new_from_spec_string (const gchar *xml_spec, GErr or **error);
GdaSet *gda_set_new_from_spec_node (xmlNodePtr xml_spec, GError **error); GdaSet *gda_set_new_from_spec_node (xmlNodePtr xml_spec, GError **error);
gchar *gda_set_get_spec (GdaSet *set);
gboolean gda_set_set_holder_value (GdaSet *set, const gchar *h older_id, ...); gboolean gda_set_set_holder_value (GdaSet *set, GError **error , const gchar *holder_id, ...);
const GValue *gda_set_get_holder_value (GdaSet *set, const gchar *h older_id); const GValue *gda_set_get_holder_value (GdaSet *set, const gchar *h older_id);
GdaHolder *gda_set_get_holder (GdaSet *set, const gchar *h older_id); GdaHolder *gda_set_get_holder (GdaSet *set, const gchar *h older_id);
gboolean gda_set_add_holder (GdaSet *set, GdaHolder *hol der); gboolean gda_set_add_holder (GdaSet *set, GdaHolder *hol der);
void gda_set_remove_holder (GdaSet *set, GdaHolder *hol der); void gda_set_remove_holder (GdaSet *set, GdaHolder *hol der);
void gda_set_merge_with_set (GdaSet *set, GdaSet *set_to _merge); void gda_set_merge_with_set (GdaSet *set, GdaSet *set_to _merge);
gboolean gda_set_is_valid (GdaSet *set); gboolean gda_set_is_valid (GdaSet *set, GError **error );
/* public data lookup functions */ /* public data lookup functions */
GdaSetNode *gda_set_get_node (GdaSet *set, GdaHolder *par am); GdaSetNode *gda_set_get_node (GdaSet *set, GdaHolder *par am);
GdaSetSource *gda_set_get_source_for_model (GdaSet *set, GdaDataModel * model); GdaSetSource *gda_set_get_source_for_model (GdaSet *set, GdaDataModel * model);
GdaSetSource *gda_set_get_source (GdaSet *set, GdaHolder *par am); GdaSetSource *gda_set_get_source (GdaSet *set, GdaHolder *par am);
GdaSetGroup *gda_set_get_group (GdaSet *set, GdaHolder *par am); GdaSetGroup *gda_set_get_group (GdaSet *set, GdaHolder *par am);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 6 change blocks. 
16 lines changed or deleted 12 lines changed or added


 gda-sql-parser.h   gda-sql-parser.h 
skipping to change at line 28 skipping to change at line 28
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GDA_SQL_PARSER_H_ #ifndef __GDA_SQL_PARSER_H_
#define __GDA_SQL_PARSER_H_ #define __GDA_SQL_PARSER_H_
#include <glib-object.h> #include <glib-object.h>
#include <libgda/gda-statement.h> #include <libgda/gda-statement.h>
#include <libgda/gda-batch.h> #include <libgda/gda-batch.h>
#include <sql-parser/gda-statement-struct.h> #include <sql-parser/gda-statement-struct.h>
#include <sql-parser/gda-statement-struct-util.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GDA_TYPE_SQL_PARSER (gda_sql_parser_get_type()) #define GDA_TYPE_SQL_PARSER (gda_sql_parser_get_type())
#define GDA_SQL_PARSER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_s ql_parser_get_type(), GdaSqlParser) #define GDA_SQL_PARSER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_s ql_parser_get_type(), GdaSqlParser)
#define GDA_SQL_PARSER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_sq l_parser_get_type (), GdaSqlParserClass) #define GDA_SQL_PARSER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_sq l_parser_get_type (), GdaSqlParserClass)
#define GDA_IS_SQL_PARSER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_s ql_parser_get_type ()) #define GDA_IS_SQL_PARSER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_s ql_parser_get_type ())
/* error reporting */ /* error reporting */
extern GQuark gda_sql_parser_error_quark (void); extern GQuark gda_sql_parser_error_quark (void);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 gda-statement-struct-parts.h   gda-statement-struct-parts.h 
skipping to change at line 163 skipping to change at line 163
GDA_SQL_OPERATOR_TYPE_STAR, GDA_SQL_OPERATOR_TYPE_STAR,
GDA_SQL_OPERATOR_TYPE_DIV, GDA_SQL_OPERATOR_TYPE_DIV,
GDA_SQL_OPERATOR_TYPE_REM, GDA_SQL_OPERATOR_TYPE_REM,
GDA_SQL_OPERATOR_TYPE_BITAND, GDA_SQL_OPERATOR_TYPE_BITAND,
GDA_SQL_OPERATOR_TYPE_BITOR, GDA_SQL_OPERATOR_TYPE_BITOR,
GDA_SQL_OPERATOR_TYPE_BITNOT GDA_SQL_OPERATOR_TYPE_BITNOT
} GdaSqlOperatorType; } GdaSqlOperatorType;
struct _GdaSqlOperation { struct _GdaSqlOperation {
GdaSqlAnyPart any; GdaSqlAnyPart any;
GdaSqlOperatorType operator; GdaSqlOperatorType operator_type;
GSList *operands; GSList *operands;
}; };
GdaSqlOperation *gda_sql_operation_new (GdaSqlAnyPart *parent); GdaSqlOperation *gda_sql_operation_new (GdaSqlAnyPart *parent);
void gda_sql_operation_free (GdaSqlOperation *operat ion); void gda_sql_operation_free (GdaSqlOperation *operat ion);
GdaSqlOperation *gda_sql_operation_copy (GdaSqlOperation *operat ion); GdaSqlOperation *gda_sql_operation_copy (GdaSqlOperation *operat ion);
gchar *gda_sql_operation_serialize (GdaSqlOperation *operat ion); gchar *gda_sql_operation_serialize (GdaSqlOperation *operat ion);
const gchar *gda_sql_operation_operator_to_string (GdaSqlOperatorType op); const gchar *gda_sql_operation_operator_to_string (GdaSqlOperatorType op);
GdaSqlOperatorType gda_sql_operation_operator_from_string (const gchar * op); GdaSqlOperatorType gda_sql_operation_operator_from_string (const gchar * op);
skipping to change at line 258 skipping to change at line 258
GDA_SQL_SELECT_JOIN_LEFT, GDA_SQL_SELECT_JOIN_LEFT,
GDA_SQL_SELECT_JOIN_RIGHT, GDA_SQL_SELECT_JOIN_RIGHT,
GDA_SQL_SELECT_JOIN_FULL GDA_SQL_SELECT_JOIN_FULL
} GdaSqlSelectJoinType; } GdaSqlSelectJoinType;
struct _GdaSqlSelectJoin struct _GdaSqlSelectJoin
{ {
GdaSqlAnyPart any; GdaSqlAnyPart any;
GdaSqlSelectJoinType type; GdaSqlSelectJoinType type;
gint position; /* between a target at (pos < @posit ion) and the one @position */ gint position; /* between a target at (pos < @posit ion) and the one @position */
GdaSqlExpr *expr; GdaSqlExpr *expr;
GSList *using; GSList *use;
}; };
GdaSqlSelectJoin *gda_sql_select_join_new (GdaSqlAnyPart *paren t); GdaSqlSelectJoin *gda_sql_select_join_new (GdaSqlAnyPart *paren t);
void gda_sql_select_join_free (GdaSqlSelectJoin *jo in); void gda_sql_select_join_free (GdaSqlSelectJoin *jo in);
GdaSqlSelectJoin *gda_sql_select_join_copy (GdaSqlSelectJoin *jo in); GdaSqlSelectJoin *gda_sql_select_join_copy (GdaSqlSelectJoin *jo in);
gchar *gda_sql_select_join_serialize (GdaSqlSelectJoin *jo in); gchar *gda_sql_select_join_serialize (GdaSqlSelectJoin *jo in);
const gchar *gda_sql_select_join_type_to_string (GdaSqlSelectJoinType type); const gchar *gda_sql_select_join_type_to_string (GdaSqlSelectJoinType type);
/* /*
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 gda-statement-struct-pspec.h   gda-statement-struct-pspec.h 
skipping to change at line 35 skipping to change at line 35
typedef struct _GdaSqlParamSpec GdaSqlParamSpec; typedef struct _GdaSqlParamSpec GdaSqlParamSpec;
/* /*
* Structure to hold one parameter specification * Structure to hold one parameter specification
*/ */
struct _GdaSqlParamSpec struct _GdaSqlParamSpec
{ {
gchar *name; gchar *name;
gchar *descr; gchar *descr;
gchar *type;
gboolean is_param; gboolean is_param;
gboolean nullok; gboolean nullok;
GType g_type; GType g_type;
gpointer validity_meta_dict; /* to be replaced with a pointer to a structure representing a DBMS data type in GdaMetaStruct */ gpointer validity_meta_dict; /* to be replaced with a pointer to a structure representing a DBMS data type in GdaMetaStruct */
}; };
GdaSqlParamSpec *gda_sql_param_spec_new (GValue *simple_spec); GdaSqlParamSpec *gda_sql_param_spec_new (GValue *simple_spec);
GdaSqlParamSpec *gda_sql_param_spec_copy (GdaSqlParamSpec *pspec); GdaSqlParamSpec *gda_sql_param_spec_copy (GdaSqlParamSpec *pspec);
void gda_sql_param_spec_take_name (GdaSqlParamSpec *pspec, GVa lue *value); void gda_sql_param_spec_take_name (GdaSqlParamSpec *pspec, GVa lue *value);
void gda_sql_param_spec_take_type (GdaSqlParamSpec *pspec, GVa lue *value); void gda_sql_param_spec_take_type (GdaSqlParamSpec *pspec, GVa lue *value);
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 gda-statement-struct-util.h   gda-statement-struct-util.h 
skipping to change at line 27 skipping to change at line 27
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef _GDA_STATEMENT_STRUCT_UTIL_H #ifndef _GDA_STATEMENT_STRUCT_UTIL_H
#define _GDA_STATEMENT_STRUCT_UTIL_H #define _GDA_STATEMENT_STRUCT_UTIL_H
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
/* utility functions */ /* utility functions */
gchar *_remove_quotes (gchar *str); gchar *_remove_quotes (gchar *str);
gchar *_add_quotes (const gchar *str); gchar *gda_sql_identifier_add_quotes (const gchar *str);
gchar *_json_quote_string (const gchar *str); gchar *_json_quote_string (const gchar *str);
gboolean _string_is_identifier (const gchar *str); gboolean _string_is_identifier (const gchar *str);
gboolean _identifier_needs_quotes (const gchar *str); gboolean gda_sql_identifier_needs_quotes (const gchar *str);
gboolean _split_identifier_string (gchar *str, gchar **remain, gchar **las t); gboolean _split_identifier_string (gchar *str, gchar **remain, gchar **las t);
gchar *_identifier_unquote (gchar *str); gchar *gda_sql_identifier_remove_quotes (gchar *str);
/* to be removed, only here for debug */ /* to be removed, only here for debug */
gchar *gda_sql_value_stringify (const GValue *value); gchar *gda_sql_value_stringify (const GValue *value);
#endif #endif
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added


 gda-statement.h   gda-statement.h 
skipping to change at line 53 skipping to change at line 53
GDA_STATEMENT_CNC_CLOSED_ERROR, GDA_STATEMENT_CNC_CLOSED_ERROR,
GDA_STATEMENT_EXEC_ERROR, GDA_STATEMENT_EXEC_ERROR,
GDA_STATEMENT_PARAM_TYPE_ERROR, GDA_STATEMENT_PARAM_TYPE_ERROR,
GDA_STATEMENT_PARAM_ERROR GDA_STATEMENT_PARAM_ERROR
} GdaStatementError; } GdaStatementError;
typedef enum { typedef enum {
GDA_STATEMENT_MODEL_RANDOM_ACCESS = 1 << 0, GDA_STATEMENT_MODEL_RANDOM_ACCESS = 1 << 0,
GDA_STATEMENT_MODEL_CURSOR_FORWARD = 1 << 1, GDA_STATEMENT_MODEL_CURSOR_FORWARD = 1 << 1,
GDA_STATEMENT_MODEL_CURSOR_BACKWARD = 1 << 2, GDA_STATEMENT_MODEL_CURSOR_BACKWARD = 1 << 2,
GDA_STATEMENT_MODEL_CURSOR = GDA_STATEMENT_MODEL_CURSOR_FOR GDA_STATEMENT_MODEL_CURSOR = GDA_STATEMENT_MODEL_CURSOR_FOR
WARD | GDA_STATEMENT_MODEL_CURSOR_BACKWARD WARD | GDA_STATEMENT_MODEL_CURSOR_BACKWARD,
GDA_STATEMENT_MODEL_ALLOW_NOPARAM = 1 << 3
} GdaStatementModelUsage; } GdaStatementModelUsage;
typedef enum { typedef enum {
GDA_STATEMENT_SQL_PRETTY = 1 << 0, GDA_STATEMENT_SQL_PRETTY = 1 << 0,
GDA_STATEMENT_SQL_PARAMS_LONG = 1 << 1, GDA_STATEMENT_SQL_PARAMS_LONG = 1 << 1,
GDA_STATEMENT_SQL_PARAMS_SHORT = 1 << 2, GDA_STATEMENT_SQL_PARAMS_SHORT = 1 << 2,
GDA_STATEMENT_SQL_PARAMS_AS_COLON = 1 << 3, GDA_STATEMENT_SQL_PARAMS_AS_COLON = 1 << 3,
GDA_STATEMENT_SQL_PARAMS_AS_DOLLAR = 1 << 4, GDA_STATEMENT_SQL_PARAMS_AS_DOLLAR = 1 << 4,
GDA_STATEMENT_SQL_PARAMS_AS_QMARK = 1 << 5, GDA_STATEMENT_SQL_PARAMS_AS_QMARK = 1 << 5,
GDA_STATEMENT_SQL_PARAMS_AS_UQMARK = 1 << 6 GDA_STATEMENT_SQL_PARAMS_AS_UQMARK = 1 << 6
 End of changes. 1 change blocks. 
2 lines changed or deleted 3 lines changed or added


 gda-util.h   gda-util.h 
skipping to change at line 32 skipping to change at line 32
*/ */
#ifndef __GDA_UTIL_H__ #ifndef __GDA_UTIL_H__
#define __GDA_UTIL_H__ #define __GDA_UTIL_H__
#include <glib/ghash.h> #include <glib/ghash.h>
#include <glib/glist.h> #include <glib/glist.h>
#include "gda-holder.h" #include "gda-holder.h"
#include "gda-row.h" #include "gda-row.h"
#include "gda-connection.h" #include "gda-connection.h"
#include <sql-parser/gda-sql-statement.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* /*
* Type utilities * Type utilities
*/ */
const gchar *gda_g_type_to_string (GType type); const gchar *gda_g_type_to_string (GType type);
GType gda_g_type_from_string (const gchar *str); GType gda_g_type_from_string (const gchar *str);
/* /*
skipping to change at line 54 skipping to change at line 55
gchar *gda_default_escape_string (const gchar *string); gchar *gda_default_escape_string (const gchar *string);
gchar *gda_default_unescape_string (const gchar *string); gchar *gda_default_unescape_string (const gchar *string);
guint gda_identifier_hash (const gchar *id); guint gda_identifier_hash (const gchar *id);
gboolean gda_identifier_equal (const gchar *id1, const gchar *id2); gboolean gda_identifier_equal (const gchar *id1, const gchar *id2);
gchar **gda_completion_list_get (GdaConnection *cnc, const gchar *text , gint start, gint end); gchar **gda_completion_list_get (GdaConnection *cnc, const gchar *text , gint start, gint end);
/* /*
* Param & model utilities * Param & model utilities
*/ */
gboolean gda_utility_check_data_model (GdaDataModel *model, gint nbcols , ...); gboolean gda_utility_check_data_model (GdaDataModel *model, gint nbcols , ...);
void gda_utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlNodePtr parent, gboolean gda_utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlNodePtr parent,
const gint *cols, gint nb_cols , const gint *rows, gint nb_rows, const gint *cols, gint nb_cols , const gint *rows, gint nb_rows,
gboolean use_col_ids); gboolean use_col_ids);
void gda_utility_holder_load_attributes (GdaHolder *holder, xmlNode Ptr node, GSList *sources); gboolean gda_utility_holder_load_attributes (GdaHolder *holder, xmlNode Ptr node, GSList *sources, GError **error);
/* /*
* translate any text to an alphanumerical text * translate any text to an alphanumerical text
*/ */
gchar *gda_text_to_alphanum (const gchar *text); gchar *gda_text_to_alphanum (const gchar *text);
gchar *gda_alphanum_to_text (gchar *text); gchar *gda_alphanum_to_text (gchar *text);
/* /*
* Statement computation from meta store * Statement computation from meta store
*/ */
GdaSqlExpr *gda_compute_unique_table_row_condition (GdaSqlStatementSelect
*stsel, GdaMetaTable *mtable,
gboolean require_pk, GE
rror **error);
gboolean gda_compute_dml_statements (GdaConnection *cnc, GdaStatement * select_stmt, gboolean require_pk, gboolean gda_compute_dml_statements (GdaConnection *cnc, GdaStatement * select_stmt, gboolean require_pk,
GdaStatement **insert_stmt, GdaStat ement **update_stmt, GdaStatement **delete_stmt, GdaStatement **insert_stmt, GdaStat ement **update_stmt, GdaStatement **delete_stmt,
GError **error); GError **error);
/* /*
* DSN and connection string manipulations * DSN and connection string manipulations
*/ */
gchar *gda_rfc1738_encode (const gchar *string); gchar *gda_rfc1738_encode (const gchar *string);
gboolean gda_rfc1738_decode (gchar *string); gboolean gda_rfc1738_decode (gchar *string);
void gda_dsn_split (const gchar *string, gchar **out_ dsn, void gda_dsn_split (const gchar *string, gchar **out_ dsn,
gchar **out_username, gchar **out_ password); gchar **out_username, gchar **out_ password);
void gda_connection_string_split (const gchar *string, gchar **out_ cnc_params, gchar **out_provider, void gda_connection_string_split (const gchar *string, gchar **out_ cnc_params, gchar **out_provider,
gchar **out_username, gchar **out_ password); gchar **out_username, gchar **out_ password);
/*
* Date and time parsing from ISO 8601 (well, part of it)
*/
gboolean gda_parse_iso8601_date (GDate *gdate, const gchar *value);
gboolean gda_parse_iso8601_time (GdaTime *timegda, const gchar *value);
gboolean gda_parse_iso8601_timestamp (GdaTimestamp *timestamp, const gc
har *value);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 5 change blocks. 
2 lines changed or deleted 16 lines changed or added


 gda-value.h   gda-value.h 
skipping to change at line 153 skipping to change at line 153
G_CONST_RETURN GdaTime *gda_value_get_time (const GValue *value); G_CONST_RETURN GdaTime *gda_value_get_time (const GValue *value);
void gda_value_set_time (GValue *value, const GdaTime *val); void gda_value_set_time (GValue *value, const GdaTime *val);
G_CONST_RETURN GdaTimestamp *gda_value_get_timestamp (const GValue *va lue); G_CONST_RETURN GdaTimestamp *gda_value_get_timestamp (const GValue *va lue);
void gda_value_set_timestamp (GValue *value, c onst GdaTimestamp *val); void gda_value_set_timestamp (GValue *value, c onst GdaTimestamp *val);
gboolean gda_value_set_from_string (GValue *value, gboolean gda_value_set_from_string (GValue *value,
const gchar *as _string, const gchar *as _string,
GType type); GType type);
gboolean gda_value_set_from_value (GValue *value, const GValue *from); gboolean gda_value_set_from_value (GValue *value, const GValue *from);
gint gda_value_bcompare (const GValue *value1, const GValue *value2); gint gda_value_differ (const GValue *value1, c onst GValue *value2);
gint gda_value_compare (const GValue *value1, const GValue *value2); gint gda_value_compare (const GValue *value1, const GValue *value2);
gint gda_value_compare_ext (const GValue *valu e1, const GValue *value2);
gchar *gda_value_stringify (const GValue *value) ; gchar *gda_value_stringify (const GValue *value) ;
xmlNodePtr gda_value_to_xml (const GValue *value); xmlNodePtr gda_value_to_xml (const GValue *value);
gchar *gda_binary_to_string (const GdaBinary *bi n, guint maxlen); gchar *gda_binary_to_string (const GdaBinary *bi n, guint maxlen);
gboolean gda_string_to_binary (const gchar *str, G daBinary *bin); gboolean gda_string_to_binary (const gchar *str, G daBinary *bin);
gchar *gda_blob_to_string (GdaBlob *blob, guint maxlen); gchar *gda_blob_to_string (GdaBlob *blob, guint maxlen);
gboolean gda_string_to_blob (const gchar *str, Gda Blob *blob); gboolean gda_string_to_blob (const gchar *str, Gda Blob *blob);
/* Custom data types */ /* Custom data types */
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 gda-vconnection-data-model.h   gda-vconnection-data-model.h 
skipping to change at line 41 skipping to change at line 41
#define GDA_IS_VCONNECTION_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_T YPE (obj, GDA_TYPE_VCONNECTION_DATA_MODEL)) #define GDA_IS_VCONNECTION_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_T YPE (obj, GDA_TYPE_VCONNECTION_DATA_MODEL))
#define GDA_IS_VCONNECTION_DATA_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE_VCONNECTION_DATA_MODEL)) #define GDA_IS_VCONNECTION_DATA_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE_VCONNECTION_DATA_MODEL))
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GdaVconnectionDataModel GdaVconnectionDataModel; typedef struct _GdaVconnectionDataModel GdaVconnectionDataModel;
typedef struct _GdaVconnectionDataModelClass GdaVconnectionDataModelClass; typedef struct _GdaVconnectionDataModelClass GdaVconnectionDataModelClass;
typedef struct _GdaVconnectionDataModelPrivate GdaVconnectionDataModelPriva te; typedef struct _GdaVconnectionDataModelPrivate GdaVconnectionDataModelPriva te;
typedef struct _GdaVconnectionDataModelSpec GdaVconnectionDataModelSpec; typedef struct _GdaVconnectionDataModelSpec GdaVconnectionDataModelSpec;
typedef GList *(*GdaVconnectionDataModelCreateColumnsFunc) (GdaVconn ectionDataModelSpec *); typedef GList *(*GdaVconnectionDataModelCreateColumnsFunc) (GdaVconn ectionDataModelSpec *, GError **);
typedef GdaDataModel *(*GdaVconnectionDataModelCreateModelFunc) (GdaVconn ectionDataModelSpec *); typedef GdaDataModel *(*GdaVconnectionDataModelCreateModelFunc) (GdaVconn ectionDataModelSpec *);
struct _GdaVconnectionDataModelSpec { struct _GdaVconnectionDataModelSpec {
GdaDataModel *data_model; GdaDataModel *data_model;
GdaVconnectionDataModelCreateColumnsFunc create_columns_func; GdaVconnectionDataModelCreateColumnsFunc create_columns_func;
GdaVconnectionDataModelCreateModelFunc create_model_func; GdaVconnectionDataModelCreateModelFunc create_model_func;
}; };
#define GDA_VCONNECTION_DATA_MODEL_SPEC(x) ((GdaVconnectionDataModelSpec*)( x)) #define GDA_VCONNECTION_DATA_MODEL_SPEC(x) ((GdaVconnectionDataModelSpec*)( x))
typedef void (*GdaVConnectionDataModelFunc) (GdaDataModel *model, const gch ar *table_name, gpointer data); typedef void (*GdaVConnectionDataModelFunc) (GdaDataModel *model, const gch ar *table_name, gpointer data);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 libgda.h   libgda.h 
skipping to change at line 29 skipping to change at line 29
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this Library; see the file COPYING.LIB. If not, * License along with this Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 , * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __LIBGDA_H__ #ifndef __LIBGDA_H__
#define __LIBGDA_H__ #define __LIBGDA_H__
#include <libgda/gda-attributes-manager.h>
#include <libgda/gda-easy.h> #include <libgda/gda-easy.h>
#include <libgda/gda-column.h> #include <libgda/gda-column.h>
#include <libgda/gda-config.h> #include <libgda/gda-config.h>
#include <libgda/gda-connection-event.h> #include <libgda/gda-connection-event.h>
#include <libgda/gda-connection.h> #include <libgda/gda-connection.h>
#include <libgda/gda-connection-private.h> #include <libgda/gda-connection-private.h>
#include <libgda/gda-data-comparator.h> #include <libgda/gda-data-comparator.h>
#include <libgda/gda-data-model-array.h> #include <libgda/gda-data-model-array.h>
#include <libgda/gda-data-model-bdb.h> #include <libgda/gda-data-model-bdb.h>
#include <libgda/gda-data-model-query.h>
#include <libgda/gda-data-model.h> #include <libgda/gda-data-model.h>
#include <libgda/gda-data-model-iter.h> #include <libgda/gda-data-model-iter.h>
#include <libgda/gda-data-model-import.h> #include <libgda/gda-data-model-import.h>
#include <libgda/gda-data-model-dir.h> #include <libgda/gda-data-model-dir.h>
#include <libgda/gda-data-access-wrapper.h> #include <libgda/gda-data-access-wrapper.h>
#include <libgda/gda-data-proxy.h> #include <libgda/gda-data-proxy.h>
#include <libgda/gda-data-select.h>
#include <libgda/gda-lockable.h>
#include <libgda/gda-log.h> #include <libgda/gda-log.h>
#include <libgda/gda-quark-list.h> #include <libgda/gda-quark-list.h>
#include <libgda/gda-row.h> #include <libgda/gda-row.h>
#include <libgda/gda-server-operation.h> #include <libgda/gda-server-operation.h>
#include <libgda/gda-server-provider.h> #include <libgda/gda-server-provider.h>
#include <libgda/gda-threader.h> #include <libgda/gda-threader.h>
#include <libgda/gda-xa-transaction.h> #include <libgda/gda-xa-transaction.h>
#include <libgda/gda-transaction-status.h> #include <libgda/gda-transaction-status.h>
#include <libgda/gda-transaction-status-private.h> #include <libgda/gda-transaction-status-private.h>
#include <libgda/gda-util.h> #include <libgda/gda-util.h>
skipping to change at line 75 skipping to change at line 77
#include <libgda/gda-meta-store.h> #include <libgda/gda-meta-store.h>
#include <libgda/gda-meta-struct.h> #include <libgda/gda-meta-struct.h>
#include <libgda/gda-statement.h> #include <libgda/gda-statement.h>
#include <libgda/gda-batch.h> #include <libgda/gda-batch.h>
#include <libgda/gda-holder.h> #include <libgda/gda-holder.h>
#include <libgda/gda-set.h> #include <libgda/gda-set.h>
#include <libgda/gda-meta-store.h> #include <libgda/gda-meta-store.h>
#include <libgda/gda-mutex.h>
G_BEGIN_DECLS G_BEGIN_DECLS
void gda_init (void); void gda_init (void);
gchar *gda_get_application_exec_path (const gchar *app_name);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 5 change blocks. 
1 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/