gda-connection-private.h | gda-connection-private.h | |||
---|---|---|---|---|
skipping to change at line 59 | skipping to change at line 59 | |||
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); | |||
void gda_connection_internal_reset_transaction_status (GdaConnection *cnc); | ||||
/* | /* | |||
* prepared statements support | * prepared statements support | |||
*/ | */ | |||
void gda_connection_add_prepared_statement (GdaConnection *cnc, GdaSta tement *gda_stmt, GdaPStmt *prepared_stmt); | void gda_connection_add_prepared_statement (GdaConnection *cnc, GdaSta tement *gda_stmt, GdaPStmt *prepared_stmt); | |||
void gda_connection_del_prepared_statement (GdaConnection *cnc, GdaSta tement *gda_stmt); | void gda_connection_del_prepared_statement (GdaConnection *cnc, GdaSta tement *gda_stmt); | |||
GdaPStmt *gda_connection_get_prepared_statement (GdaConnection *cnc, GdaSta tement *gda_stmt); | GdaPStmt *gda_connection_get_prepared_statement (GdaConnection *cnc, GdaSta tement *gda_stmt); | |||
/* | ||||
* Open an SQLite connection even if the SQLite provider is not installed | ||||
*/ | ||||
GdaConnection *gda_connection_open_sqlite (const gchar *directory, const gc | ||||
har *filename, gboolean auto_unlink); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 7 lines changed or added | |||
gda-connection.h | gda-connection.h | |||
---|---|---|---|---|
skipping to change at line 59 | skipping to change at line 59 | |||
typedef enum { | typedef enum { | |||
GDA_CONNECTION_DSN_NOT_FOUND_ERROR, | GDA_CONNECTION_DSN_NOT_FOUND_ERROR, | |||
GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR, | GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR, | |||
GDA_CONNECTION_PROVIDER_ERROR, | GDA_CONNECTION_PROVIDER_ERROR, | |||
GDA_CONNECTION_NO_CNC_SPEC_ERROR, | GDA_CONNECTION_NO_CNC_SPEC_ERROR, | |||
GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR, | GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR, | |||
GDA_CONNECTION_OPEN_ERROR, | GDA_CONNECTION_OPEN_ERROR, | |||
GDA_CONNECTION_STATEMENT_TYPE_ERROR, | GDA_CONNECTION_STATEMENT_TYPE_ERROR, | |||
GDA_CONNECTION_CANT_LOCK_ERROR, | GDA_CONNECTION_CANT_LOCK_ERROR, | |||
GDA_CONNECTION_TASK_NOT_FOUND_ERROR, | GDA_CONNECTION_TASK_NOT_FOUND_ERROR, | |||
GDA_CONNECTION_UNSUPPORTED_THREADS_ERROR | GDA_CONNECTION_UNSUPPORTED_THREADS_ERROR, | |||
GDA_CONNECTION_CLOSED_ERROR | ||||
} GdaConnectionError; | } GdaConnectionError; | |||
#define GDA_CONNECTION_NONEXIST_DSN_ERROR GDA_CONNECTION_DSN_NOT_FOUND_ERRO R | #define GDA_CONNECTION_NONEXIST_DSN_ERROR GDA_CONNECTION_DSN_NOT_FOUND_ERRO R | |||
struct _GdaConnection { | struct _GdaConnection { | |||
GObject object; | GObject object; | |||
GdaConnectionPrivate *priv; | GdaConnectionPrivate *priv; | |||
}; | }; | |||
struct _GdaConnectionClass { | struct _GdaConnectionClass { | |||
GObjectClass object_class; | GObjectClass object_class; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added | |||
gda-meta-column-types.h | gda-meta-column-types.h | |||
---|---|---|---|---|
skipping to change at line 14 | skipping to change at line 14 | |||
* This file contains declaration of the expected data types when | * This file contains declaration of the expected data types when | |||
* extracting meta data, it should be updated when the libgda/information_s chema.xml file changes | * extracting meta data, it should be updated when the libgda/information_s chema.xml file changes | |||
* DO NOT MODIFY | * DO NOT MODIFY | |||
*/ | */ | |||
/* | /* | |||
* TABLE: _attributes | * TABLE: _attributes | |||
* | * | |||
* Table to store (key,value) pairs (keys starting with '_' are reserved) | * Table to store (key,value) pairs (keys starting with '_' are reserved) | |||
*/ | */ | |||
GType _col_types_attributes[] = { | static GType _col_types_attributes[] = { | |||
G_TYPE_STRING /* column: att_name */ | G_TYPE_STRING /* column: att_name */ | |||
, G_TYPE_STRING /* column: att_value */ | , G_TYPE_STRING /* column: att_value */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _information_schema_catalog_name | * TABLE: _information_schema_catalog_name | |||
* | * | |||
* Name of the current database (current catalog), has only one row | * Name of the current database (current catalog), has only one row | |||
*/ | */ | |||
GType _col_types_information_schema_catalog_name[] = { | static GType _col_types_information_schema_catalog_name[] = { | |||
G_TYPE_STRING /* column: catalog_name */ | G_TYPE_STRING /* column: catalog_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _schemata | * TABLE: _schemata | |||
* | * | |||
* List of schemas | * List of schemas | |||
*/ | */ | |||
GType _col_types_schemata[] = { | static GType _col_types_schemata[] = { | |||
G_TYPE_STRING /* column: catalog_name */ | G_TYPE_STRING /* column: catalog_name */ | |||
, G_TYPE_STRING /* column: schema_name */ | , G_TYPE_STRING /* column: schema_name */ | |||
, G_TYPE_STRING /* column: schema_owner */ | , G_TYPE_STRING /* column: schema_owner */ | |||
, G_TYPE_BOOLEAN /* column: schema_internal */ | , G_TYPE_BOOLEAN /* column: schema_internal */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _builtin_data_types | * TABLE: _builtin_data_types | |||
* | * | |||
* List of built-in data types such as varchar, int, ... | * List of built-in data types such as varchar, int, ... | |||
*/ | */ | |||
GType _col_types_builtin_data_types[] = { | static GType _col_types_builtin_data_types[] = { | |||
G_TYPE_STRING /* column: short_type_name */ | G_TYPE_STRING /* column: short_type_name */ | |||
, G_TYPE_STRING /* column: full_type_name */ | , G_TYPE_STRING /* column: full_type_name */ | |||
, G_TYPE_STRING /* column: gtype */ | , G_TYPE_STRING /* column: gtype */ | |||
, G_TYPE_STRING /* column: comments */ | , G_TYPE_STRING /* column: comments */ | |||
, G_TYPE_STRING /* column: synonyms */ | , G_TYPE_STRING /* column: synonyms */ | |||
, G_TYPE_BOOLEAN /* column: internal */ | , G_TYPE_BOOLEAN /* column: internal */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _udt | * TABLE: _udt | |||
* | * | |||
* User defined data types | * User defined data types | |||
*/ | */ | |||
GType _col_types_udt[] = { | static GType _col_types_udt[] = { | |||
G_TYPE_STRING /* column: udt_catalog */ | G_TYPE_STRING /* column: udt_catalog */ | |||
, G_TYPE_STRING /* column: udt_schema */ | , G_TYPE_STRING /* column: udt_schema */ | |||
, G_TYPE_STRING /* column: udt_name */ | , G_TYPE_STRING /* column: udt_name */ | |||
, G_TYPE_STRING /* column: udt_gtype */ | , G_TYPE_STRING /* column: udt_gtype */ | |||
, G_TYPE_STRING /* column: udt_comments */ | , G_TYPE_STRING /* column: udt_comments */ | |||
, G_TYPE_STRING /* column: udt_short_name */ | , G_TYPE_STRING /* column: udt_short_name */ | |||
, G_TYPE_STRING /* column: udt_full_name */ | , G_TYPE_STRING /* column: udt_full_name */ | |||
, G_TYPE_BOOLEAN /* column: udt_internal */ | , G_TYPE_BOOLEAN /* column: udt_internal */ | |||
, G_TYPE_STRING /* column: udt_owner */ | , G_TYPE_STRING /* column: udt_owner */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _udt_columns | * TABLE: _udt_columns | |||
* | * | |||
* List of components for a user defined data type for composed data types (such as a complex number data type which has real and imaginary parts) | * List of components for a user defined data type for composed data types (such as a complex number data type which has real and imaginary parts) | |||
*/ | */ | |||
GType _col_types_udt_columns[] = { | static GType _col_types_udt_columns[] = { | |||
G_TYPE_STRING /* column: udt_catalog */ | G_TYPE_STRING /* column: udt_catalog */ | |||
, G_TYPE_STRING /* column: udt_schema */ | , G_TYPE_STRING /* column: udt_schema */ | |||
, G_TYPE_STRING /* column: udt_name */ | , G_TYPE_STRING /* column: udt_name */ | |||
, G_TYPE_STRING /* column: udt_column */ | , G_TYPE_STRING /* column: udt_column */ | |||
, G_TYPE_INT /* column: ordinal_position */ | , G_TYPE_INT /* column: ordinal_position */ | |||
, G_TYPE_STRING /* column: data_type */ | , G_TYPE_STRING /* column: data_type */ | |||
, G_TYPE_STRING /* column: array_spec */ | , G_TYPE_STRING /* column: array_spec */ | |||
, G_TYPE_INT /* column: character_maximum_length */ | , G_TYPE_INT /* column: character_maximum_length */ | |||
, G_TYPE_INT /* column: character_octet_length */ | , G_TYPE_INT /* column: character_octet_length */ | |||
, G_TYPE_INT /* column: numeric_precision */ | , G_TYPE_INT /* column: numeric_precision */ | |||
skipping to change at line 108 | skipping to change at line 108 | |||
, G_TYPE_STRING /* column: collation_schema */ | , G_TYPE_STRING /* column: collation_schema */ | |||
, G_TYPE_STRING /* column: collation_name */ | , G_TYPE_STRING /* column: collation_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _enums | * TABLE: _enums | |||
* | * | |||
* List of possible enumeration labels for enumerations | * List of possible enumeration labels for enumerations | |||
*/ | */ | |||
GType _col_types_enums[] = { | static GType _col_types_enums[] = { | |||
G_TYPE_STRING /* column: udt_catalog */ | G_TYPE_STRING /* column: udt_catalog */ | |||
, G_TYPE_STRING /* column: udt_schema */ | , G_TYPE_STRING /* column: udt_schema */ | |||
, G_TYPE_STRING /* column: udt_name */ | , G_TYPE_STRING /* column: udt_name */ | |||
, G_TYPE_STRING /* column: label */ | , G_TYPE_STRING /* column: label */ | |||
, G_TYPE_INT /* column: ordinal_position */ | , G_TYPE_INT /* column: ordinal_position */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _element_types | * TABLE: _element_types | |||
* | * | |||
* Array specific attributes for array data types | * Array specific attributes for array data types | |||
*/ | */ | |||
GType _col_types_element_types[] = { | static GType _col_types_element_types[] = { | |||
G_TYPE_STRING /* column: specific_name */ | G_TYPE_STRING /* column: specific_name */ | |||
, G_TYPE_STRING /* column: object_catalog */ | , G_TYPE_STRING /* column: object_catalog */ | |||
, G_TYPE_STRING /* column: object_schema */ | , G_TYPE_STRING /* column: object_schema */ | |||
, G_TYPE_STRING /* column: object_name */ | , G_TYPE_STRING /* column: object_name */ | |||
, G_TYPE_STRING /* column: object_type */ | , G_TYPE_STRING /* column: object_type */ | |||
, G_TYPE_STRING /* column: data_type */ | , G_TYPE_STRING /* column: data_type */ | |||
, G_TYPE_STRING /* column: array_spec */ | , G_TYPE_STRING /* column: array_spec */ | |||
, G_TYPE_INT /* column: min_cardinality */ | , G_TYPE_INT /* column: min_cardinality */ | |||
, G_TYPE_INT /* column: max_cardinality */ | , G_TYPE_INT /* column: max_cardinality */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _domains | * TABLE: _domains | |||
* | * | |||
* List of domains | * List of domains | |||
*/ | */ | |||
GType _col_types_domains[] = { | static GType _col_types_domains[] = { | |||
G_TYPE_STRING /* column: domain_catalog */ | G_TYPE_STRING /* column: domain_catalog */ | |||
, G_TYPE_STRING /* column: domain_schema */ | , G_TYPE_STRING /* column: domain_schema */ | |||
, G_TYPE_STRING /* column: domain_name */ | , G_TYPE_STRING /* column: domain_name */ | |||
, G_TYPE_STRING /* column: data_type */ | , G_TYPE_STRING /* column: data_type */ | |||
, G_TYPE_STRING /* column: array_spec */ | , G_TYPE_STRING /* column: array_spec */ | |||
, G_TYPE_STRING /* column: domain_gtype */ | , G_TYPE_STRING /* column: domain_gtype */ | |||
, G_TYPE_INT /* column: character_maximum_length */ | , G_TYPE_INT /* column: character_maximum_length */ | |||
, G_TYPE_INT /* column: character_octet_length */ | , G_TYPE_INT /* column: character_octet_length */ | |||
, G_TYPE_STRING /* column: collation_catalog */ | , G_TYPE_STRING /* column: collation_catalog */ | |||
, G_TYPE_STRING /* column: collation_schema */ | , G_TYPE_STRING /* column: collation_schema */ | |||
skipping to change at line 171 | skipping to change at line 171 | |||
, G_TYPE_BOOLEAN /* column: domain_internal */ | , G_TYPE_BOOLEAN /* column: domain_internal */ | |||
, G_TYPE_STRING /* column: domain_owner */ | , G_TYPE_STRING /* column: domain_owner */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _tables | * TABLE: _tables | |||
* | * | |||
* List of tables (tables, views or other objects which can contain data) | * List of tables (tables, views or other objects which can contain data) | |||
*/ | */ | |||
GType _col_types_tables[] = { | static GType _col_types_tables[] = { | |||
G_TYPE_STRING /* column: table_catalog */ | G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: table_type */ | , G_TYPE_STRING /* column: table_type */ | |||
, G_TYPE_BOOLEAN /* column: is_insertable_into */ | , G_TYPE_BOOLEAN /* column: is_insertable_into */ | |||
, G_TYPE_STRING /* column: table_comments */ | , G_TYPE_STRING /* column: table_comments */ | |||
, G_TYPE_STRING /* column: table_short_name */ | , G_TYPE_STRING /* column: table_short_name */ | |||
, G_TYPE_STRING /* column: table_full_name */ | , G_TYPE_STRING /* column: table_full_name */ | |||
, G_TYPE_STRING /* column: table_owner */ | , G_TYPE_STRING /* column: table_owner */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _views | * TABLE: _views | |||
* | * | |||
* List of views and their specific information | * List of views and their specific information | |||
*/ | */ | |||
GType _col_types_views[] = { | static GType _col_types_views[] = { | |||
G_TYPE_STRING /* column: table_catalog */ | G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: view_definition */ | , G_TYPE_STRING /* column: view_definition */ | |||
, G_TYPE_STRING /* column: check_option */ | , G_TYPE_STRING /* column: check_option */ | |||
, G_TYPE_BOOLEAN /* column: is_updatable */ | , G_TYPE_BOOLEAN /* column: is_updatable */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _collations | * TABLE: _collations | |||
* | * | |||
* List of collations methods | * List of collations methods | |||
*/ | */ | |||
GType _col_types_collations[] = { | static GType _col_types_collations[] = { | |||
G_TYPE_STRING /* column: collation_catalog */ | G_TYPE_STRING /* column: collation_catalog */ | |||
, G_TYPE_STRING /* column: collation_schema */ | , G_TYPE_STRING /* column: collation_schema */ | |||
, G_TYPE_STRING /* column: collation_name */ | , G_TYPE_STRING /* column: collation_name */ | |||
, G_TYPE_STRING /* column: collation_comments */ | , G_TYPE_STRING /* column: collation_comments */ | |||
, G_TYPE_STRING /* column: collation_short_name */ | , G_TYPE_STRING /* column: collation_short_name */ | |||
, G_TYPE_STRING /* column: collation_full_name */ | , G_TYPE_STRING /* column: collation_full_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _character_sets | * TABLE: _character_sets | |||
* | * | |||
* List of character sets | * List of character sets | |||
*/ | */ | |||
GType _col_types_character_sets[] = { | static GType _col_types_character_sets[] = { | |||
G_TYPE_STRING /* column: character_set_catalog */ | G_TYPE_STRING /* column: character_set_catalog */ | |||
, G_TYPE_STRING /* column: character_set_schema */ | , G_TYPE_STRING /* column: character_set_schema */ | |||
, G_TYPE_STRING /* column: character_set_name */ | , G_TYPE_STRING /* column: character_set_name */ | |||
, G_TYPE_STRING /* column: default_collate_catalog */ | , G_TYPE_STRING /* column: default_collate_catalog */ | |||
, G_TYPE_STRING /* column: default_collate_schema */ | , G_TYPE_STRING /* column: default_collate_schema */ | |||
, G_TYPE_STRING /* column: default_collate_name */ | , G_TYPE_STRING /* column: default_collate_name */ | |||
, G_TYPE_STRING /* column: character_set_comments */ | , G_TYPE_STRING /* column: character_set_comments */ | |||
, G_TYPE_STRING /* column: character_set_short_name */ | , G_TYPE_STRING /* column: character_set_short_name */ | |||
, G_TYPE_STRING /* column: character_set_full_name */ | , G_TYPE_STRING /* column: character_set_full_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _routines | * TABLE: _routines | |||
* | * | |||
* List of functions and stored procedures (note: the primary jey for that table is composed of (specific_catalog, specific_schema, specific_name)) | * List of functions and stored procedures (note: the primary jey for that table is composed of (specific_catalog, specific_schema, specific_name)) | |||
*/ | */ | |||
GType _col_types_routines[] = { | static GType _col_types_routines[] = { | |||
G_TYPE_STRING /* column: specific_catalog */ | G_TYPE_STRING /* column: specific_catalog */ | |||
, G_TYPE_STRING /* column: specific_schema */ | , G_TYPE_STRING /* column: specific_schema */ | |||
, G_TYPE_STRING /* column: specific_name */ | , G_TYPE_STRING /* column: specific_name */ | |||
, G_TYPE_STRING /* column: routine_catalog */ | , G_TYPE_STRING /* column: routine_catalog */ | |||
, G_TYPE_STRING /* column: routine_schema */ | , G_TYPE_STRING /* column: routine_schema */ | |||
, G_TYPE_STRING /* column: routine_name */ | , G_TYPE_STRING /* column: routine_name */ | |||
, G_TYPE_STRING /* column: routine_type */ | , G_TYPE_STRING /* column: routine_type */ | |||
, G_TYPE_STRING /* column: return_type */ | , G_TYPE_STRING /* column: return_type */ | |||
, G_TYPE_BOOLEAN /* column: returns_set */ | , G_TYPE_BOOLEAN /* column: returns_set */ | |||
, G_TYPE_INT /* column: nb_args */ | , G_TYPE_INT /* column: nb_args */ | |||
skipping to change at line 268 | skipping to change at line 268 | |||
, G_TYPE_STRING /* column: routine_full_name */ | , G_TYPE_STRING /* column: routine_full_name */ | |||
, G_TYPE_STRING /* column: routine_owner */ | , G_TYPE_STRING /* column: routine_owner */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _triggers | * TABLE: _triggers | |||
* | * | |||
* List of triggers | * List of triggers | |||
*/ | */ | |||
GType _col_types_triggers[] = { | static GType _col_types_triggers[] = { | |||
G_TYPE_STRING /* column: trigger_catalog */ | G_TYPE_STRING /* column: trigger_catalog */ | |||
, G_TYPE_STRING /* column: trigger_schema */ | , G_TYPE_STRING /* column: trigger_schema */ | |||
, G_TYPE_STRING /* column: trigger_name */ | , G_TYPE_STRING /* column: trigger_name */ | |||
, G_TYPE_STRING /* column: event_manipulation */ | , G_TYPE_STRING /* column: event_manipulation */ | |||
, G_TYPE_STRING /* column: event_object_catalog */ | , G_TYPE_STRING /* column: event_object_catalog */ | |||
, G_TYPE_STRING /* column: event_object_schema */ | , G_TYPE_STRING /* column: event_object_schema */ | |||
, G_TYPE_STRING /* column: event_object_table */ | , G_TYPE_STRING /* column: event_object_table */ | |||
, G_TYPE_STRING /* column: action_statement */ | , G_TYPE_STRING /* column: action_statement */ | |||
, G_TYPE_STRING /* column: action_orientation */ | , G_TYPE_STRING /* column: action_orientation */ | |||
, G_TYPE_STRING /* column: condition_timing */ | , G_TYPE_STRING /* column: condition_timing */ | |||
skipping to change at line 290 | skipping to change at line 290 | |||
, G_TYPE_STRING /* column: trigger_short_name */ | , G_TYPE_STRING /* column: trigger_short_name */ | |||
, G_TYPE_STRING /* column: trigger_full_name */ | , G_TYPE_STRING /* column: trigger_full_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _columns | * TABLE: _columns | |||
* | * | |||
* List of columns composing tables | * List of columns composing tables | |||
*/ | */ | |||
GType _col_types_columns[] = { | static GType _col_types_columns[] = { | |||
G_TYPE_STRING /* column: table_catalog */ | G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: column_name */ | , G_TYPE_STRING /* column: column_name */ | |||
, G_TYPE_INT /* column: ordinal_position */ | , G_TYPE_INT /* column: ordinal_position */ | |||
, G_TYPE_STRING /* column: column_default */ | , G_TYPE_STRING /* column: column_default */ | |||
, G_TYPE_BOOLEAN /* column: is_nullable */ | , G_TYPE_BOOLEAN /* column: is_nullable */ | |||
, G_TYPE_STRING /* column: data_type */ | , G_TYPE_STRING /* column: data_type */ | |||
, G_TYPE_STRING /* column: array_spec */ | , G_TYPE_STRING /* column: array_spec */ | |||
, G_TYPE_STRING /* column: gtype */ | , G_TYPE_STRING /* column: gtype */ | |||
skipping to change at line 323 | skipping to change at line 323 | |||
, G_TYPE_BOOLEAN /* column: is_updatable */ | , G_TYPE_BOOLEAN /* column: is_updatable */ | |||
, G_TYPE_STRING /* column: column_comments */ | , G_TYPE_STRING /* column: column_comments */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _table_constraints | * TABLE: _table_constraints | |||
* | * | |||
* List of constraints applied to tables (Check, primary or foreign key, or unique constraints) | * List of constraints applied to tables (Check, primary or foreign key, or unique constraints) | |||
*/ | */ | |||
GType _col_types_table_constraints[] = { | static GType _col_types_table_constraints[] = { | |||
G_TYPE_STRING /* column: constraint_catalog */ | G_TYPE_STRING /* column: constraint_catalog */ | |||
, G_TYPE_STRING /* column: constraint_schema */ | , G_TYPE_STRING /* column: constraint_schema */ | |||
, G_TYPE_STRING /* column: constraint_name */ | , G_TYPE_STRING /* column: constraint_name */ | |||
, G_TYPE_STRING /* column: table_catalog */ | , G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: constraint_type */ | , G_TYPE_STRING /* column: constraint_type */ | |||
, G_TYPE_STRING /* column: check_clause */ | , G_TYPE_STRING /* column: check_clause */ | |||
, G_TYPE_BOOLEAN /* column: is_deferrable */ | , G_TYPE_BOOLEAN /* column: is_deferrable */ | |||
, G_TYPE_BOOLEAN /* column: initially_deferred */ | , G_TYPE_BOOLEAN /* column: initially_deferred */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _referential_constraints | * TABLE: _referential_constraints | |||
* | * | |||
* List of foreign key constraints, along with some specific attributes | * List of foreign key constraints, along with some specific attributes | |||
*/ | */ | |||
GType _col_types_referential_constraints[] = { | static GType _col_types_referential_constraints[] = { | |||
G_TYPE_STRING /* column: table_catalog */ | G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: constraint_name */ | , G_TYPE_STRING /* column: constraint_name */ | |||
, G_TYPE_STRING /* column: ref_table_catalog */ | , G_TYPE_STRING /* column: ref_table_catalog */ | |||
, G_TYPE_STRING /* column: ref_table_schema */ | , G_TYPE_STRING /* column: ref_table_schema */ | |||
, G_TYPE_STRING /* column: ref_table_name */ | , G_TYPE_STRING /* column: ref_table_name */ | |||
, G_TYPE_STRING /* column: ref_constraint_name */ | , G_TYPE_STRING /* column: ref_constraint_name */ | |||
, G_TYPE_STRING /* column: match_option */ | , G_TYPE_STRING /* column: match_option */ | |||
, G_TYPE_STRING /* column: update_rule */ | , G_TYPE_STRING /* column: update_rule */ | |||
, G_TYPE_STRING /* column: delete_rule */ | , G_TYPE_STRING /* column: delete_rule */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _key_column_usage | * TABLE: _key_column_usage | |||
* | * | |||
* List of primary key constraints and the name of the tables' columns invo lved | * List of primary key constraints and the name of the tables' columns invo lved | |||
*/ | */ | |||
GType _col_types_key_column_usage[] = { | static GType _col_types_key_column_usage[] = { | |||
G_TYPE_STRING /* column: table_catalog */ | G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: constraint_name */ | , G_TYPE_STRING /* column: constraint_name */ | |||
, G_TYPE_STRING /* column: column_name */ | , G_TYPE_STRING /* column: column_name */ | |||
, G_TYPE_INT /* column: ordinal_position */ | , G_TYPE_INT /* column: ordinal_position */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _check_column_usage | * TABLE: _check_column_usage | |||
* | * | |||
* List of check constraints and the name of the tables' columns involved | * List of check constraints and the name of the tables' columns involved | |||
*/ | */ | |||
GType _col_types_check_column_usage[] = { | static GType _col_types_check_column_usage[] = { | |||
G_TYPE_STRING /* column: table_catalog */ | G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: constraint_name */ | , G_TYPE_STRING /* column: constraint_name */ | |||
, G_TYPE_STRING /* column: column_name */ | , G_TYPE_STRING /* column: column_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _view_column_usage | * TABLE: _view_column_usage | |||
* | * | |||
* List of the tables' columns involved in a view | * List of the tables' columns involved in a view | |||
*/ | */ | |||
GType _col_types_view_column_usage[] = { | static GType _col_types_view_column_usage[] = { | |||
G_TYPE_STRING /* column: view_catalog */ | G_TYPE_STRING /* column: view_catalog */ | |||
, G_TYPE_STRING /* column: view_schema */ | , G_TYPE_STRING /* column: view_schema */ | |||
, G_TYPE_STRING /* column: view_name */ | , G_TYPE_STRING /* column: view_name */ | |||
, G_TYPE_STRING /* column: table_catalog */ | , G_TYPE_STRING /* column: table_catalog */ | |||
, G_TYPE_STRING /* column: table_schema */ | , G_TYPE_STRING /* column: table_schema */ | |||
, G_TYPE_STRING /* column: table_name */ | , G_TYPE_STRING /* column: table_name */ | |||
, G_TYPE_STRING /* column: column_name */ | , G_TYPE_STRING /* column: column_name */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _domain_constraints | * TABLE: _domain_constraints | |||
* | * | |||
* List of constraints applicable to domains | * List of constraints applicable to domains | |||
*/ | */ | |||
GType _col_types_domain_constraints[] = { | static GType _col_types_domain_constraints[] = { | |||
G_TYPE_STRING /* column: constraint_catalog */ | G_TYPE_STRING /* column: constraint_catalog */ | |||
, G_TYPE_STRING /* column: constraint_schema */ | , G_TYPE_STRING /* column: constraint_schema */ | |||
, G_TYPE_STRING /* column: constraint_name */ | , G_TYPE_STRING /* column: constraint_name */ | |||
, G_TYPE_STRING /* column: domain_catalog */ | , G_TYPE_STRING /* column: domain_catalog */ | |||
, G_TYPE_STRING /* column: domain_schema */ | , G_TYPE_STRING /* column: domain_schema */ | |||
, G_TYPE_STRING /* column: domain_name */ | , G_TYPE_STRING /* column: domain_name */ | |||
, G_TYPE_STRING /* column: check_clause */ | , G_TYPE_STRING /* column: check_clause */ | |||
, G_TYPE_BOOLEAN /* column: is_deferrable */ | , G_TYPE_BOOLEAN /* column: is_deferrable */ | |||
, G_TYPE_BOOLEAN /* column: initially_deferred */ | , G_TYPE_BOOLEAN /* column: initially_deferred */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _parameters | * TABLE: _parameters | |||
* | * | |||
* List of routines' (functions and stored procedures) parameters (may not contain data for some routines which accept any type of parameter) | * List of routines' (functions and stored procedures) parameters (may not contain data for some routines which accept any type of parameter) | |||
*/ | */ | |||
GType _col_types_parameters[] = { | static GType _col_types_parameters[] = { | |||
G_TYPE_STRING /* column: specific_catalog */ | G_TYPE_STRING /* column: specific_catalog */ | |||
, G_TYPE_STRING /* column: specific_schema */ | , G_TYPE_STRING /* column: specific_schema */ | |||
, G_TYPE_STRING /* column: specific_name */ | , G_TYPE_STRING /* column: specific_name */ | |||
, G_TYPE_INT /* column: ordinal_position */ | , G_TYPE_INT /* column: ordinal_position */ | |||
, G_TYPE_STRING /* column: parameter_mode */ | , G_TYPE_STRING /* column: parameter_mode */ | |||
, G_TYPE_STRING /* column: parameter_name */ | , G_TYPE_STRING /* column: parameter_name */ | |||
, G_TYPE_STRING /* column: data_type */ | , G_TYPE_STRING /* column: data_type */ | |||
, G_TYPE_STRING /* column: array_spec */ | , G_TYPE_STRING /* column: array_spec */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | /* | |||
* TABLE: _routine_columns | * TABLE: _routine_columns | |||
* | * | |||
* List of routines' (functions and stored procedures) returned values' par ts (columns) for routines returning composed values | * List of routines' (functions and stored procedures) returned values' par ts (columns) for routines returning composed values | |||
*/ | */ | |||
GType _col_types_routine_columns[] = { | static GType _col_types_routine_columns[] = { | |||
G_TYPE_STRING /* column: specific_catalog */ | G_TYPE_STRING /* column: specific_catalog */ | |||
, G_TYPE_STRING /* column: specific_schema */ | , G_TYPE_STRING /* column: specific_schema */ | |||
, G_TYPE_STRING /* column: specific_name */ | , G_TYPE_STRING /* column: specific_name */ | |||
, G_TYPE_STRING /* column: column_name */ | , G_TYPE_STRING /* column: column_name */ | |||
, G_TYPE_INT /* column: ordinal_position */ | , G_TYPE_INT /* column: ordinal_position */ | |||
, G_TYPE_STRING /* column: data_type */ | , G_TYPE_STRING /* column: data_type */ | |||
, G_TYPE_STRING /* column: array_spec */ | , G_TYPE_STRING /* column: array_spec */ | |||
, G_TYPE_NONE /* end of array marker */ | , G_TYPE_NONE /* end of array marker */ | |||
}; | }; | |||
/* | ||||
* TABLE: _table_indexes | ||||
* | ||||
* List of tables' indexes which do not relate to primary keys | ||||
*/ | ||||
static GType _col_types_table_indexes[] = { | ||||
G_TYPE_STRING /* column: index_catalog */ | ||||
, G_TYPE_STRING /* column: index_schema */ | ||||
, G_TYPE_STRING /* column: index_name */ | ||||
, G_TYPE_STRING /* column: table_catalog */ | ||||
, G_TYPE_STRING /* column: table_schema */ | ||||
, G_TYPE_STRING /* column: table_name */ | ||||
, G_TYPE_BOOLEAN /* column: is_unique */ | ||||
, G_TYPE_STRING /* column: index_def */ | ||||
, G_TYPE_STRING /* column: index_type */ | ||||
, G_TYPE_STRING /* column: extra */ | ||||
, G_TYPE_STRING /* column: index_owner */ | ||||
, G_TYPE_STRING /* column: index_comments */ | ||||
, G_TYPE_NONE /* end of array marker */ | ||||
}; | ||||
/* | ||||
* TABLE: _index_column_usage | ||||
* | ||||
* List of the tables' columns involved in an index listed in the _table_in | ||||
dexes table | ||||
*/ | ||||
static GType _col_types_index_column_usage[] = { | ||||
G_TYPE_STRING /* column: index_catalog */ | ||||
, G_TYPE_STRING /* column: index_schema */ | ||||
, G_TYPE_STRING /* column: index_name */ | ||||
, G_TYPE_STRING /* column: table_catalog */ | ||||
, G_TYPE_STRING /* column: table_schema */ | ||||
, G_TYPE_STRING /* column: table_name */ | ||||
, G_TYPE_STRING /* column: column_name */ | ||||
, G_TYPE_STRING /* column: column_expr */ | ||||
, G_TYPE_INT /* column: ordinal_position */ | ||||
, G_TYPE_NONE /* end of array marker */ | ||||
}; | ||||
End of changes. 25 change blocks. | ||||
24 lines changed or deleted | 24 lines changed or added | |||
gda-server-provider.h | gda-server-provider.h | |||
---|---|---|---|---|
skipping to change at line 180 | skipping to change at line 180 | |||
/* _routine_columns */ | /* _routine_columns */ | |||
gboolean (*_routine_col) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **); | gboolean (*_routine_col) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **); | |||
gboolean (*routine_col) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **, | gboolean (*routine_col) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **, | |||
const GValue *rout_catalog, const GVal ue *rout_schema, const GValue *rout_name); | const GValue *rout_catalog, const GVal ue *rout_schema, const GValue *rout_name); | |||
/* _parameters */ | /* _parameters */ | |||
gboolean (*_routine_par) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **); | gboolean (*_routine_par) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **); | |||
gboolean (*routine_par) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **, | gboolean (*routine_par) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **, | |||
const GValue *rout_catalog, const GVal ue *rout_schema, const GValue *rout_name); | const GValue *rout_catalog, const GVal ue *rout_schema, const GValue *rout_name); | |||
/* _table_indexes */ | ||||
gboolean (*_indexes_tab) (GdaServerProvider *, GdaConnection *, | ||||
GdaMetaStore *, GdaMetaContext *, GError **); | ||||
gboolean (*indexes_tab) (GdaServerProvider *, GdaConnection *, | ||||
GdaMetaStore *, GdaMetaContext *, GError **, | ||||
const GValue *table_catalog, const GVa | ||||
lue *table_schema, const GValue *table_name, | ||||
const GValue *index_name_n); | ||||
/* _index_column_usage */ | ||||
gboolean (*_index_cols) (GdaServerProvider *, GdaConnection *, | ||||
GdaMetaStore *, GdaMetaContext *, GError **); | ||||
gboolean (*index_cols) (GdaServerProvider *, GdaConnection *, | ||||
GdaMetaStore *, GdaMetaContext *, GError **, | ||||
const GValue *table_catalog, const GVa | ||||
lue *table_schema, const GValue *table_name, const GValue *index_name); | ||||
/* Padding for future expansion */ | /* Padding for future expansion */ | |||
void (*_gda_reserved1) (void); | ||||
void (*_gda_reserved2) (void); | ||||
void (*_gda_reserved3) (void); | ||||
void (*_gda_reserved4) (void); | ||||
void (*_gda_reserved5) (void); | void (*_gda_reserved5) (void); | |||
void (*_gda_reserved6) (void); | void (*_gda_reserved6) (void); | |||
void (*_gda_reserved7) (void); | void (*_gda_reserved7) (void); | |||
void (*_gda_reserved8) (void); | void (*_gda_reserved8) (void); | |||
void (*_gda_reserved9) (void); | void (*_gda_reserved9) (void); | |||
void (*_gda_reserved10) (void); | void (*_gda_reserved10) (void); | |||
void (*_gda_reserved11) (void); | void (*_gda_reserved11) (void); | |||
void (*_gda_reserved12) (void); | void (*_gda_reserved12) (void); | |||
void (*_gda_reserved13) (void); | void (*_gda_reserved13) (void); | |||
void (*_gda_reserved14) (void); | void (*_gda_reserved14) (void); | |||
End of changes. 2 change blocks. | ||||
4 lines changed or deleted | 16 lines changed or added | |||
gda-set.h | gda-set.h | |||
---|---|---|---|---|
skipping to change at line 104 | skipping to change at line 104 | |||
{ | { | |||
GObjectClass parent_class; | GObjectClass parent_class; | |||
GError *(*validate_holder_change)(GdaSet *set, GdaHold er *holder, const GValue *new_value); | GError *(*validate_holder_change)(GdaSet *set, GdaHold er *holder, const GValue *new_value); | |||
GError *(*validate_set) (GdaSet *set); | GError *(*validate_set) (GdaSet *set); | |||
void (*holder_changed) (GdaSet *set, GdaHold er *holder); | void (*holder_changed) (GdaSet *set, GdaHold er *holder); | |||
void (*holder_attr_changed) (GdaSet *set, GdaHold er *holder, | void (*holder_attr_changed) (GdaSet *set, GdaHold er *holder, | |||
const gchar *attr_na me, const GValue *attr_value); | const gchar *attr_na me, const GValue *attr_value); | |||
void (*public_data_changed) (GdaSet *set); | void (*public_data_changed) (GdaSet *set); | |||
/*< private >*/ | ||||
/* Padding for future expansion */ | /* Padding for future expansion */ | |||
void (*_gda_reserved1) (void); | void (*_gda_reserved1) (void); | |||
void (*_gda_reserved2) (void); | void (*_gda_reserved2) (void); | |||
void (*_gda_reserved3) (void); | void (*_gda_reserved3) (void); | |||
void (*_gda_reserved4) (void); | void (*_gda_reserved4) (void); | |||
}; | }; | |||
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); | |||
gboolean gda_set_set_holder_value (GdaSet *set, GError **error , const gchar *holder_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); | |||
GdaHolder *gda_set_get_nth_holder (GdaSet *set, gint pos); | ||||
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, GError **error ); | 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 *hol der); | GdaSetNode *gda_set_get_node (GdaSet *set, GdaHolder *hol der); | |||
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 *hol der); | GdaSetSource *gda_set_get_source (GdaSet *set, GdaHolder *hol der); | |||
GdaSetGroup *gda_set_get_group (GdaSet *set, GdaHolder *hol der); | GdaSetGroup *gda_set_get_group (GdaSet *set, GdaHolder *hol der); | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
gda-sql-builder.h | gda-sql-builder.h | |||
---|---|---|---|---|
skipping to change at line 59 | skipping to change at line 59 | |||
{ | { | |||
GObject object; | GObject object; | |||
GdaSqlBuilderPrivate *priv; | GdaSqlBuilderPrivate *priv; | |||
}; | }; | |||
/* struct for the object's class */ | /* struct for the object's class */ | |||
struct _GdaSqlBuilderClass | struct _GdaSqlBuilderClass | |||
{ | { | |||
GObjectClass parent_class; | GObjectClass parent_class; | |||
/*< private >*/ | ||||
/* Padding for future expansion */ | /* Padding for future expansion */ | |||
void (*_gda_reserved1) (void); | void (*_gda_reserved1) (void); | |||
void (*_gda_reserved2) (void); | void (*_gda_reserved2) (void); | |||
void (*_gda_reserved3) (void); | void (*_gda_reserved3) (void); | |||
void (*_gda_reserved4) (void); | void (*_gda_reserved4) (void); | |||
}; | }; | |||
GType gda_sql_builder_get_type (void) G_GNUC_CONST; | GType gda_sql_builder_get_type (void) G_GNUC_CONST; | |||
GdaSqlBuilder *gda_sql_builder_new (GdaSqlStatementType stmt_ type); | GdaSqlBuilder *gda_sql_builder_new (GdaSqlStatementType stmt_ type); | |||
GdaStatement *gda_sql_builder_get_statement (GdaSqlBuilder *builder, GE rror **error); | GdaStatement *gda_sql_builder_get_statement (GdaSqlBuilder *builder, GE rror **error); | |||
GdaSqlStatement *gda_sql_builder_get_sql_statement (GdaSqlBuilder *builder , gboolean copy_it); | GdaSqlStatement *gda_sql_builder_get_sql_statement (GdaSqlBuilder *builder , gboolean copy_it); | |||
/* Expression API */ | /* Expression API */ | |||
guint gda_sql_builder_add_id (GdaSqlBuilder *builder, guint id | guint gda_sql_builder_add_id (GdaSqlBuilder *builder, guint id, | |||
, const gchar *string); | const gchar *string); | |||
guint gda_sql_builder_add_expr (GdaSqlBuilder *builder, guint | guint gda_sql_builder_add_expr (GdaSqlBuilder *builder, guint i | |||
id, GdaDataHandler *dh, GType type, ...); | d, GdaDataHandler *dh, GType type, ...); | |||
guint gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, | guint gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, g | |||
guint id, GdaDataHandler *dh, GValue* value); | uint id, GdaDataHandler *dh, const GValue *value); | |||
guint gda_sql_builder_add_param (GdaSqlBuilder *builder, guint | guint gda_sql_builder_add_param (GdaSqlBuilder *builder, guint | |||
id, const gchar *param_name, GType type, gboolean nullok); | id, const gchar *param_name, GType type, gboolean nullok); | |||
guint gda_sql_builder_add_cond (GdaSqlBuilder *builder, guint | guint gda_sql_builder_add_cond (GdaSqlBuilder *builder, guint i | |||
id, GdaSqlOperatorType op, | d, GdaSqlOperatorType op, | |||
guint op1, guint op2, guint op3); | guint op1, guint op2, guint op3) | |||
guint gda_sql_builder_add_cond_v (GdaSqlBuilder *builder, guin | ; | |||
t id, GdaSqlOperatorType op, | guint gda_sql_builder_add_cond_v (GdaSqlBuilder *builder, guint | |||
const guint *op_ids, gint op_ids_ | id, GdaSqlOperatorType op, | |||
size); | const guint *op_ids, gint op_i | |||
ds_size); | ||||
guint gda_sql_builder_add_function (GdaSqlBuilder *builder, gui nt id, const gchar *func_name, ...); | guint gda_sql_builder_add_function (GdaSqlBuilder *builder, gui nt id, const gchar *func_name, ...); | |||
guint gda_sql_builder_add_function_v (GdaSqlBuilder *builder, g uint id, const gchar *func_name, | guint gda_sql_builder_add_function_v (GdaSqlBuilder *builder, g uint id, const gchar *func_name, | |||
const guint *args, gint ar gs_size); | const guint *args, gint ar gs_size); | |||
guint gda_sql_builder_add_sub_select (GdaSqlBuilder *builder, g | ||||
/* SELECT Statement API */ | uint id, GdaSqlStatement *sqlst, | |||
guint gda_sql_builder_select_add_target (GdaSqlBuilder *builde | gboolean steal); | |||
r, guint id, | guint gda_sql_builder_add_case (GdaSqlBuilder *builder, guint i | |||
guint table_id, const | d, | |||
gchar *alias); | guint test_expr, guint else_expr | |||
guint gda_sql_builder_select_join_targets (GdaSqlBuilder *buil | , ...); | |||
der, guint id, | guint gda_sql_builder_add_case_v (GdaSqlBuilder *builder, guint | |||
guint left_target_id | id, | |||
, guint right_target_id, | guint test_expr, guint else_ex | |||
GdaSqlSelectJoinType | pr, | |||
join_type, | const guint *when_array, const | |||
guint join_expr); | guint *then_array, gint args_size); | |||
void gda_sql_builder_join_add_field (GdaSqlBuilder *builder, | ||||
guint join_id, const gchar *field_name); | ||||
void gda_sql_builder_select_order_by (GdaSqlBuilder *builder, | ||||
guint expr_id, | ||||
gboolean asc, const gcha | ||||
r *collation_name); | ||||
/* General Statement API */ | /* General Statement API */ | |||
void gda_sql_builder_add_field (GdaSqlBuilder *builder, const | ||||
gchar *field_name, GType type, ...); | ||||
void gda_sql_builder_add_field_value (GdaSqlBuilder *builder, | ||||
const gchar *field_name, | ||||
const GValue *value); | ||||
void gda_sql_builder_set_table (GdaSqlBuilder *builder, const gchar *table_name); | void gda_sql_builder_set_table (GdaSqlBuilder *builder, const gchar *table_name); | |||
void gda_sql_builder_set_where (GdaSqlBuilder *builder, guint cond_id); | void gda_sql_builder_set_where (GdaSqlBuilder *builder, guint cond_id); | |||
void gda_sql_builder_add_field (GdaSqlBuilder *builder, guint | void gda_sql_builder_add_field_id (GdaSqlBuilder *builder, gui | |||
field_id, guint value_id); | nt field_id, guint value_id); | |||
/* SELECT Statement API */ | ||||
void gda_sql_builder_select_add_field (GdaSqlBuilder *builder, | ||||
const gchar *field_name, | ||||
const gchar *table_name, | ||||
const gchar *alias); | ||||
guint gda_sql_builder_select_add_target (GdaSqlBuilder *builder | ||||
, const gchar *table_name, const gchar *alias); | ||||
guint gda_sql_builder_select_add_target_id (GdaSqlBuilder *buil | ||||
der, guint id, | ||||
guint table_id, const g | ||||
char *alias); | ||||
guint gda_sql_builder_select_join_targets (GdaSqlBuilder *build | ||||
er, guint id, | ||||
guint left_target_id, | ||||
guint right_target_id, | ||||
GdaSqlSelectJoinType | ||||
join_type, | ||||
guint join_expr); | ||||
void gda_sql_builder_join_add_field (GdaSqlBuilder *builder, g | ||||
uint join_id, const gchar *field_name); | ||||
void gda_sql_builder_select_order_by (GdaSqlBuilder *builder, | ||||
guint expr_id, | ||||
gboolean asc, const gchar | ||||
*collation_name); | ||||
/* COMPOUND SELECT Statement API */ | ||||
void gda_sql_builder_compound_set_type (GdaSqlBuilder *builder | ||||
, GdaSqlStatementCompoundType compound_type); | ||||
void gda_sql_builder_compound_add_sub_select (GdaSqlBuilder *b | ||||
uilder, GdaSqlStatement *sqlst, gboolean steal); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 6 change blocks. | ||||
36 lines changed or deleted | 69 lines changed or added | |||
gda-virtual-connection.h | gda-virtual-connection.h | |||
---|---|---|---|---|
skipping to change at line 58 | skipping to change at line 58 | |||
/* Padding for future expansion */ | /* Padding for future expansion */ | |||
void (*_gda_reserved1) (void); | void (*_gda_reserved1) (void); | |||
void (*_gda_reserved2) (void); | void (*_gda_reserved2) (void); | |||
void (*_gda_reserved3) (void); | void (*_gda_reserved3) (void); | |||
void (*_gda_reserved4) (void); | void (*_gda_reserved4) (void); | |||
}; | }; | |||
GType gda_virtual_connection_get_type (void) G_G NUC_CONST; | GType gda_virtual_connection_get_type (void) G_G NUC_CONST; | |||
GdaConnection *gda_virtual_connection_open (GdaVirtua lProvider *virtual_provider, GError **error); | GdaConnection *gda_virtual_connection_open (GdaVirtua lProvider *virtual_provider, GError **error); | |||
GdaConnection *gda_virtual_connection_open_extended (GdaVirtua | ||||
lProvider *virtual_provider, | ||||
GdaConnect | ||||
ionOptions options, GError **error); | ||||
void gda_virtual_connection_internal_set_provider_data (GdaVirtua lConnection *vcnc, | void gda_virtual_connection_internal_set_provider_data (GdaVirtua lConnection *vcnc, | |||
gpointer d ata, GDestroyNotify destroy_func); | gpointer d ata, GDestroyNotify destroy_func); | |||
gpointer gda_virtual_connection_internal_get_provider_data (GdaVirtua lConnection *cnc); | gpointer gda_virtual_connection_internal_get_provider_data (GdaVirtua lConnection *cnc); | |||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added | |||
gdaui-basic-form.h | gdaui-basic-form.h | |||
---|---|---|---|---|
skipping to change at line 26 | skipping to change at line 26 | |||
* along with this program; if not, write to the Free Software | * along with this program; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |||
* USA | * USA | |||
*/ | */ | |||
#ifndef __GDAUI_BASIC_FORM__ | #ifndef __GDAUI_BASIC_FORM__ | |||
#define __GDAUI_BASIC_FORM__ | #define __GDAUI_BASIC_FORM__ | |||
#include <gtk/gtk.h> | #include <gtk/gtk.h> | |||
#include <libgda/libgda.h> | #include <libgda/libgda.h> | |||
#ifdef HAVE_LIBGLADE | ||||
#include <glade/glade.h> | ||||
#endif | ||||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
#define GDAUI_TYPE_BASIC_FORM (gdaui_basic_form_get_type()) | #define GDAUI_TYPE_BASIC_FORM (gdaui_basic_form_get_type()) | |||
#define GDAUI_BASIC_FORM(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda ui_basic_form_get_type(), GdauiBasicForm) | #define GDAUI_BASIC_FORM(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda ui_basic_form_get_type(), GdauiBasicForm) | |||
#define GDAUI_BASIC_FORM_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdau i_basic_form_get_type (), GdauiBasicFormClass) | #define GDAUI_BASIC_FORM_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdau i_basic_form_get_type (), GdauiBasicFormClass) | |||
#define GDAUI_IS_BASIC_FORM(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda ui_basic_form_get_type ()) | #define GDAUI_IS_BASIC_FORM(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda ui_basic_form_get_type ()) | |||
typedef struct { | ||||
#ifdef HAVE_LIBGLADE | ||||
GladeXML *xml_object; /* one of xml_object or */ | ||||
#endif | ||||
gchar *xml_file; /* xml_file is required */ | ||||
gchar *root_element; /* required */ | ||||
gchar *form_prefix; /* required */ | ||||
} GdauiFormLayoutSpec; | ||||
typedef struct _GdauiBasicForm GdauiBasicForm; | typedef struct _GdauiBasicForm GdauiBasicForm; | |||
typedef struct _GdauiBasicFormClass GdauiBasicFormClass; | typedef struct _GdauiBasicFormClass GdauiBasicFormClass; | |||
typedef struct _GdauiBasicFormPriv GdauiBasicFormPriv; | typedef struct _GdauiBasicFormPriv GdauiBasicFormPriv; | |||
/* struct for the object's data */ | /* struct for the object's data */ | |||
struct _GdauiBasicForm | struct _GdauiBasicForm | |||
{ | { | |||
GtkVBox object; | GtkVBox object; | |||
GdauiBasicFormPriv *priv; | GdauiBasicFormPriv *priv; | |||
}; | }; | |||
/* struct for the object's class */ | /* struct for the object's class */ | |||
struct _GdauiBasicFormClass | struct _GdauiBasicFormClass | |||
{ | { | |||
GtkVBoxClass parent_class; | GtkVBoxClass parent_class; | |||
/* signals */ | /* signals */ | |||
void (*param_changed) (GdauiBasicForm *form, GdaHolde | void (*holder_changed) (GdauiBasicForm *form, GdaHolder *hold | |||
r *param, gboolean is_user_modif); | er, gboolean is_user_action); | |||
void (*activated) (GdauiBasicForm *form); | void (*activated) (GdauiBasicForm *form); | |||
void (*layout_changed) (GdauiBasicForm *form); | ||||
}; | }; | |||
/* | /* | |||
* Generic widget's methods | * Generic widget's methods | |||
*/ | */ | |||
GType gdaui_basic_form_get_type (void) G_GNUC_C ONST; | GType gdaui_basic_form_get_type (void) G_GNUC_C ONST; | |||
GtkWidget *gdaui_basic_form_new (GdaSet *data_s et); | GtkWidget *gdaui_basic_form_new (GdaSet *data_s et); | |||
GtkWidget *gdaui_basic_form_new_custom (GdaSet *data_s | ||||
et, const gchar *glade_file, | ||||
const gchar | ||||
*root_element, const gchar *form_prefix); | ||||
GtkWidget *gdaui_basic_form_new_in_dialog (GdaSet *data_s et, GtkWindow *parent, | GtkWidget *gdaui_basic_form_new_in_dialog (GdaSet *data_s et, GtkWindow *parent, | |||
const gchar *title, const gchar *header); | const gchar *ti tle, const gchar *header); | |||
GdaSet *gdaui_basic_form_get_data_set (GdauiBasicForm *form); | GdaSet *gdaui_basic_form_get_data_set (GdauiBasicForm *form); | |||
gboolean gdaui_basic_form_is_valid (GdauiBasicForm *form); | gboolean gdaui_basic_form_is_valid (GdauiBasicForm *form); | |||
gboolean gdaui_basic_form_has_been_changed (GdauiBasicForm *form); | gboolean gdaui_basic_form_has_changed (GdauiBasicForm *form); | |||
void gdaui_basic_form_reset (GdauiBasicForm *form); | void gdaui_basic_form_reset (GdauiBasicForm *form); | |||
void gdaui_basic_form_set_current_as_orig (GdauiBasicForm *form); | void gdaui_basic_form_set_as_reference (GdauiBasicForm *form); | |||
void gdaui_basic_form_show_entry_actions (GdauiBasicForm | void gdaui_basic_form_entry_set_visible (GdauiBasicForm | |||
*form, gboolean show_actions); | *form, | |||
void gdaui_basic_form_entry_show (GdauiBasicForm | GdaHolder *hold | |||
*form, | er, gboolean show); | |||
GdaHolder *p | void gdaui_basic_form_entry_grab_focus (GdauiBasicForm | |||
aram, gboolean show); | *form, GdaHolder *holder); | |||
void gdaui_basic_form_entry_grab_focus (GdauiBasicForm | void gdaui_basic_form_entry_set_editable (GdauiBasicForm | |||
*form, GdaHolder *param); | *form, GdaHolder *holder, | |||
void gdaui_basic_form_entry_set_editable (GdauiBasicForm | gboolean editab | |||
*form, GdaHolder *param, | le); | |||
gboolean edi | void gdaui_basic_form_set_entries_to_default (GdauiBasicForm | |||
table); | *form); | |||
void gdaui_basic_form_set_entries_auto_default (GdauiBasicForm | ||||
*form, gboolean auto_default); | ||||
void gdaui_basic_form_set_entries_default (GdauiBasicForm | ||||
*form); | ||||
GtkWidget *gdaui_basic_form_get_entry_widget (GdauiBasicForm | GtkWidget *gdaui_basic_form_get_entry_widget (GdauiBasicForm | |||
*form, GdaHolder *param); | *form, GdaHolder *holder); | |||
GtkWidget *gdaui_basic_form_get_label_widget (GdauiBasicForm | GtkWidget *gdaui_basic_form_get_label_widget (GdauiBasicForm | |||
*form, GdaHolder *param); | *form, GdaHolder *holder); | |||
void gdaui_basic_form_set_layout_from_file (GdauiBasicForm | ||||
*form, const gchar *file_name, | ||||
const gchar *fo | ||||
rm_name); | ||||
GtkWidget *gdaui_basic_form_get_place_holder (GdauiBasicForm | ||||
*form, const gchar *placeholder_id); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 11 change blocks. | ||||
45 lines changed or deleted | 32 lines changed or added | |||
gdaui-combo.h | gdaui-combo.h | |||
---|---|---|---|---|
skipping to change at line 45 | skipping to change at line 45 | |||
#define GDAUI_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDAUI_ TYPE_COMBO, GdauiComboClass)) | #define GDAUI_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDAUI_ TYPE_COMBO, GdauiComboClass)) | |||
#define GDAUI_IS_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDAUI _TYPE_COMBO)) | #define GDAUI_IS_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDAUI _TYPE_COMBO)) | |||
#define GDAUI_IS_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAU I_TYPE_COMBO)) | #define GDAUI_IS_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAU I_TYPE_COMBO)) | |||
typedef struct _GdauiCombo GdauiCombo; | typedef struct _GdauiCombo GdauiCombo; | |||
typedef struct _GdauiComboClass GdauiComboClass; | typedef struct _GdauiComboClass GdauiComboClass; | |||
typedef struct _GdauiComboPrivate GdauiComboPrivate; | typedef struct _GdauiComboPrivate GdauiComboPrivate; | |||
struct _GdauiCombo { | struct _GdauiCombo { | |||
GtkComboBox object; | GtkComboBox object; | |||
GdauiComboPrivate *priv; | GdauiComboPrivate *priv; | |||
}; | }; | |||
struct _GdauiComboClass { | struct _GdauiComboClass { | |||
GtkComboBoxClass parent_class; | GtkComboBoxClass parent_class; | |||
}; | }; | |||
GType gdaui_combo_get_type (void) G_GNUC_CONST; | GType gdaui_combo_get_type (void) G_GNUC_CONST; | |||
GtkWidget *gdaui_combo_new (void); | GtkWidget *gdaui_combo_new (void); | |||
GtkWidget *gdaui_combo_new_with_model (GdaDataModel *model, gint n_col s, gint *cols_index); | GtkWidget *gdaui_combo_new_with_model (GdaDataModel *model, gint n_col s, gint *cols_index); | |||
void gdaui_combo_set_model (GdauiCombo *combo, GdaDataModel *model, gint n_cols, gint *cols_index); | void gdaui_combo_set_model (GdauiCombo *combo, GdaDataModel *model, gint n_cols, gint *cols_index); | |||
GdaDataModel *gdaui_combo_get_model (GdauiCombo *combo); | void gdaui_combo_add_null (GdauiCombo *combo, gboolean add | |||
void gdaui_combo_add_undef_choice (GdauiCombo *combo, gboolean add | _null); | |||
_undef_choice); | gboolean gdaui_combo_is_null_selected (GdauiCombo *combo); | |||
gboolean gdaui_combo_set_values (GdauiCombo *combo, const GSList | ||||
*values); | ||||
GSList *gdaui_combo_get_values (GdauiCombo *combo); | ||||
gboolean gdaui_combo_undef_selected (GdauiCombo *combo); | ||||
gboolean gdaui_combo_set_values_ext (GdauiCombo *combo, const GSList | /* private API */ | |||
*values, gint *cols_index); | gboolean _gdaui_combo_set_selected (GdauiCombo *combo, const GSLis | |||
GSList *gdaui_combo_get_values_ext (GdauiCombo *combo, gint n_cols, | t *values); | |||
gint *cols_index); | GSList *_gdaui_combo_get_selected (GdauiCombo *combo); | |||
gboolean _gdaui_combo_set_selected_ext (GdauiCombo *combo, const GSLis | ||||
t *values, gint *cols_index); | ||||
GSList *_gdaui_combo_get_selected_ext (GdauiCombo *combo, gint n_cols | ||||
, gint *cols_index); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
13 lines changed or deleted | 12 lines changed or added | |||
gdaui-data-entry.h | gdaui-data-entry.h | |||
---|---|---|---|---|
skipping to change at line 62 | skipping to change at line 62 | |||
void (*set_value) (GdauiDataEntry *de, const GValue * value); | void (*set_value) (GdauiDataEntry *de, const GValue * value); | |||
GValue *(*get_value) (GdauiDataEntry *de); | GValue *(*get_value) (GdauiDataEntry *de); | |||
void (*set_value_orig) (GdauiDataEntry *de, const GValue * value); | void (*set_value_orig) (GdauiDataEntry *de, const GValue * value); | |||
const GValue *(*get_value_orig) (GdauiDataEntry *de); | const GValue *(*get_value_orig) (GdauiDataEntry *de); | |||
void (*set_value_default) (GdauiDataEntry *de, const GValue * value); | void (*set_value_default) (GdauiDataEntry *de, const GValue * value); | |||
void (*set_attributes) (GdauiDataEntry *de, GdaVal ueAttribute attrs, GdaValueAttribute mask); | void (*set_attributes) (GdauiDataEntry *de, GdaVal ueAttribute attrs, GdaValueAttribute mask); | |||
GdaValueAttribute (*get_attributes) (GdauiDataEntry *de); | GdaValueAttribute (*get_attributes) (GdauiDataEntry *de); | |||
GdaDataHandler *(*get_handler) (GdauiDataEntry *de); | GdaDataHandler *(*get_handler) (GdauiDataEntry *de); | |||
gboolean (*expand_in_layout) (GdauiDataEntry *de); | gboolean (*expand_in_layout) (GdauiDataEntry *de); | |||
void (*set_editable) (GdauiDataEntry *de, gboole an editable); | void (*set_editable) (GdauiDataEntry *de, gboole an editable); | |||
gboolean (*get_editable) (GdauiDataEntry *de); | ||||
void (*grab_focus) (GdauiDataEntry *de); | void (*grab_focus) (GdauiDataEntry *de); | |||
/*< private >*/ | ||||
/* Padding for future expansion */ | /* Padding for future expansion */ | |||
void (*_gdaui_reserved1) (void); | void (*_gdaui_reserved1) (void); | |||
void (*_gdaui_reserved2) (void); | void (*_gdaui_reserved2) (void); | |||
void (*_gdaui_reserved3) (void); | void (*_gdaui_reserved3) (void); | |||
void (*_gdaui_reserved4) (void); | void (*_gdaui_reserved4) (void); | |||
}; | }; | |||
GType gdaui_data_entry_get_type (void) G_GNUC_CONST ; | GType gdaui_data_entry_get_type (void) G_GNUC_CONST ; | |||
void gdaui_data_entry_set_value_type (GdauiDataEntry *de , GType type); | void gdaui_data_entry_set_value_type (GdauiDataEntry *de , GType type); | |||
skipping to change at line 90 | skipping to change at line 92 | |||
const GValue *gdaui_data_entry_get_original_value (GdauiDataEntry *de); | const GValue *gdaui_data_entry_get_original_value (GdauiDataEntry *de); | |||
void gdaui_data_entry_reset (GdauiDataEntry *de); | void gdaui_data_entry_reset (GdauiDataEntry *de); | |||
void gdaui_data_entry_set_value_default (GdauiDataEntry *de , const GValue * value); | void gdaui_data_entry_set_value_default (GdauiDataEntry *de , const GValue * value); | |||
void gdaui_data_entry_set_attributes (GdauiDataEntry *de , GdaValueAttribute attrs, GdaValueAttribute mask); | void gdaui_data_entry_set_attributes (GdauiDataEntry *de , GdaValueAttribute attrs, GdaValueAttribute mask); | |||
GdaValueAttribute gdaui_data_entry_get_attributes (GdauiDataEntry *de ); | GdaValueAttribute gdaui_data_entry_get_attributes (GdauiDataEntry *de ); | |||
GdaDataHandler *gdaui_data_entry_get_handler (GdauiDataEntry *de ); | GdaDataHandler *gdaui_data_entry_get_handler (GdauiDataEntry *de ); | |||
gboolean gdaui_data_entry_expand_in_layout (GdauiDataEntry *de ); | gboolean gdaui_data_entry_expand_in_layout (GdauiDataEntry *de ); | |||
void gdaui_data_entry_set_editable (GdauiDataEntry *de , gboolean editable); | void gdaui_data_entry_set_editable (GdauiDataEntry *de , gboolean editable); | |||
gboolean gdaui_data_entry_get_editable (GdauiDataEntry *de ); | ||||
void gdaui_data_entry_grab_focus (GdauiDataEntry *de ); | void gdaui_data_entry_grab_focus (GdauiDataEntry *de ); | |||
/* TO remove and replace with properties: | /* TO remove and replace with properties: | |||
* gdaui_data_entry_expand_in_layout | * gdaui_data_entry_expand_in_layout | |||
* gdaui_data_entry_get_handler | * gdaui_data_entry_get_handler | |||
* gdaui_data_entry_set_attributes | * gdaui_data_entry_set_attributes | |||
* gdaui_data_entry_get_attributes | * gdaui_data_entry_get_attributes | |||
* gdaui_data_entry_set_value_default | * gdaui_data_entry_set_value_default | |||
* | * | |||
* Don't replace at all: | * Don't replace at all: | |||
End of changes. 3 change blocks. | ||||
0 lines changed or deleted | 3 lines changed or added | |||
gdaui-data-store.h | gdaui-data-store.h | |||
---|---|---|---|---|
skipping to change at line 24 | skipping to change at line 24 | |||
* | * | |||
* You should have received a copy of the GNU Library General Public Licens e | * You should have received a copy of the GNU Library General Public Licens e | |||
* along with this program; if not, write to the Free Software | * along with this program; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |||
* USA | * USA | |||
*/ | */ | |||
#ifndef __GDAUI_DATA_STORE__ | #ifndef __GDAUI_DATA_STORE__ | |||
#define __GDAUI_DATA_STORE__ | #define __GDAUI_DATA_STORE__ | |||
#include <gtk/gtktreemodel.h> | #include <gtk/gtk.h> | |||
#include <libgda/gda-data-model.h> | #include <libgda/gda-data-model.h> | |||
#include <libgda/gda-data-proxy.h> | #include <libgda/gda-data-proxy.h> | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
#define GDAUI_TYPE_DATA_STORE (gdaui_data_store_get_type()) | #define GDAUI_TYPE_DATA_STORE (gdaui_data_store_get_type()) | |||
#define GDAUI_DATA_STORE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda ui_data_store_get_type(), GdauiDataStore) | #define GDAUI_DATA_STORE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda ui_data_store_get_type(), GdauiDataStore) | |||
#define GDAUI_DATA_STORE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdau i_data_store_get_type (), GdauiDataStoreClass) | #define GDAUI_DATA_STORE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdau i_data_store_get_type (), GdauiDataStoreClass) | |||
#define GDAUI_IS_DATA_STORE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda ui_data_store_get_type ()) | #define GDAUI_IS_DATA_STORE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda ui_data_store_get_type ()) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
gdaui-decl.h | gdaui-decl.h | |||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
* USA | * USA | |||
*/ | */ | |||
#ifndef __GDAUI_DECL_H_ | #ifndef __GDAUI_DECL_H_ | |||
#define __GDAUI_DECL_H_ | #define __GDAUI_DECL_H_ | |||
/* | /* | |||
* Interfaces | * Interfaces | |||
*/ | */ | |||
typedef struct _GdauiDataWidget GdauiDataWidget; | typedef struct _GdauiDataProxy GdauiDataProxy; | |||
typedef struct _GdauiDataWidgetIface GdauiDataWidgetIface; | typedef struct _GdauiDataProxyIface GdauiDataProxyIface; | |||
/* | /* | |||
* Colors | * Colors | |||
*/ | */ | |||
#define GDAUI_COLOR_NORMAL_NULL "#00cd66" | #define GDAUI_COLOR_NORMAL_NULL "#00cd66" | |||
#define GDAUI_COLOR_PRELIGHT_NULL "#00ef77" | #define GDAUI_COLOR_PRELIGHT_NULL "#00ef77" | |||
#define GDAUI_COLOR_NORMAL_DEFAULT "#6495ed" | #define GDAUI_COLOR_NORMAL_DEFAULT "#6495ed" | |||
#define GDAUI_COLOR_PRELIGHT_DEFAULT "#75a6fe" | #define GDAUI_COLOR_PRELIGHT_DEFAULT "#75a6fe" | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
gdaui-enum-types.h | gdaui-enum-types.h | |||
---|---|---|---|---|
/* Generated data (by glib-mkenums) */ | /* Generated data (by glib-mkenums) */ | |||
#ifndef __LIBGDAUI_ENUM_TYPES_H__ | #ifndef __LIBGDAUI_ENUM_TYPES_H__ | |||
#define __LIBGDAUI_ENUM_TYPES_H__ | #define __LIBGDAUI_ENUM_TYPES_H__ | |||
#include <glib-object.h> | #include <glib-object.h> | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
/* enumerations from "gdaui-data-widget.h" */ | /* enumerations from "gdaui-data-proxy.h" */ | |||
GType gdaui_data_widget_write_mode_get_type (void); | GType gdaui_data_proxy_write_mode_get_type (void); | |||
#define GDAUI_TYPE_DATA_WIDGET_WRITE_MODE (gdaui_data_widget_write_mode_get | #define GDAUI_TYPE_DATA_PROXY_WRITE_MODE (gdaui_data_proxy_write_mode_get_t | |||
_type()) | ype()) | |||
/* enumerations from "gdaui-data-widget-info.h" */ | /* enumerations from "gdaui-data-proxy-info.h" */ | |||
GType gdaui_data_widget_info_flag_get_type (void); | GType gdaui_data_proxy_info_flag_get_type (void); | |||
#define GDAUI_TYPE_DATA_WIDGET_INFO_FLAG (gdaui_data_widget_info_flag_get_t | #define GDAUI_TYPE_DATA_PROXY_INFO_FLAG (gdaui_data_proxy_info_flag_get_typ | |||
ype()) | e()) | |||
/* enumerations from "gdaui-enums.h" */ | /* enumerations from "gdaui-enums.h" */ | |||
GType gdaui_action_mode_get_type (void); | GType gdaui_action_mode_get_type (void); | |||
#define GDAUI_TYPE_ACTION_MODE (gdaui_action_mode_get_type()) | #define GDAUI_TYPE_ACTION_MODE (gdaui_action_mode_get_type()) | |||
GType gdaui_action_get_type (void); | GType gdaui_action_get_type (void); | |||
#define GDAUI_TYPE_ACTION (gdaui_action_get_type()) | #define GDAUI_TYPE_ACTION (gdaui_action_get_type()) | |||
/* enumerations from "gdaui-login.h" */ | /* enumerations from "gdaui-login.h" */ | |||
GType gdaui_login_mode_get_type (void); | GType gdaui_login_mode_get_type (void); | |||
#define GDAUI_TYPE_LOGIN_MODE (gdaui_login_mode_get_type()) | #define GDAUI_TYPE_LOGIN_MODE (gdaui_login_mode_get_type()) | |||
G_END_DECLS | G_END_DECLS | |||
End of changes. 1 change blocks. | ||||
8 lines changed or deleted | 8 lines changed or added | |||
gdaui-grid.h | gdaui-grid.h | |||
---|---|---|---|---|
skipping to change at line 57 | skipping to change at line 57 | |||
{ | { | |||
GtkVBoxClass parent_class; | GtkVBoxClass parent_class; | |||
}; | }; | |||
/* | /* | |||
* Generic widget's methods | * Generic widget's methods | |||
*/ | */ | |||
GType gdaui_grid_get_type (void) G_GNUC_CONST; | GType gdaui_grid_get_type (void) G_GNUC_CONST; | |||
GtkWidget *gdaui_grid_new (GdaDataModel *model); | GtkWidget *gdaui_grid_new (GdaDataModel *model); | |||
GList *gdaui_grid_get_selection (GdauiGrid *grid); | ||||
void gdaui_grid_set_sample_size (GdauiGrid *grid, gint sam ple_size); | void gdaui_grid_set_sample_size (GdauiGrid *grid, gint sam ple_size); | |||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 0 lines changed or added | |||
gdaui-login.h | gdaui-login.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 __GDAUI_LOGIN_H__ | #ifndef __GDAUI_LOGIN_H__ | |||
#define __GDAUI_LOGIN_H__ | #define __GDAUI_LOGIN_H__ | |||
#include <gtk/gtkvbox.h> | #include <gtk/gtk.h> | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
#define GDAUI_TYPE_LOGIN (gdaui_login_get_type()) | #define GDAUI_TYPE_LOGIN (gdaui_login_get_type()) | |||
#define GDAUI_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDAUI _TYPE_LOGIN, GdauiLogin)) | #define GDAUI_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDAUI _TYPE_LOGIN, GdauiLogin)) | |||
#define GDAUI_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDAUI_ TYPE_LOGIN, GdauiLoginClass)) | #define GDAUI_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDAUI_ TYPE_LOGIN, GdauiLoginClass)) | |||
#define GDAUI_IS_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDAUI _TYPE_LOGIN)) | #define GDAUI_IS_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDAUI _TYPE_LOGIN)) | |||
#define GDAUI_IS_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAU I_TYPE_LOGIN)) | #define GDAUI_IS_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAU I_TYPE_LOGIN)) | |||
typedef struct _GdauiLogin GdauiLogin; | typedef struct _GdauiLogin GdauiLogin; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
gdaui-raw-grid.h | gdaui-raw-grid.h | |||
---|---|---|---|---|
skipping to change at line 40 | skipping to change at line 40 | |||
#define GDAUI_RAW_GRID_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdaui_ raw_grid_get_type (), GdauiRawGridClass) | #define GDAUI_RAW_GRID_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdaui_ raw_grid_get_type (), GdauiRawGridClass) | |||
#define GDAUI_IS_RAW_GRID(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gdaui _raw_grid_get_type ()) | #define GDAUI_IS_RAW_GRID(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gdaui _raw_grid_get_type ()) | |||
typedef struct _GdauiRawGrid GdauiRawGrid; | typedef struct _GdauiRawGrid GdauiRawGrid; | |||
typedef struct _GdauiRawGridClass GdauiRawGridClass; | typedef struct _GdauiRawGridClass GdauiRawGridClass; | |||
typedef struct _GdauiRawGridPriv GdauiRawGridPriv; | typedef struct _GdauiRawGridPriv GdauiRawGridPriv; | |||
/* struct for the object's data */ | /* struct for the object's data */ | |||
struct _GdauiRawGrid | struct _GdauiRawGrid | |||
{ | { | |||
GtkTreeView object; | GtkTreeView object; | |||
GdauiRawGridPriv *priv; | GdauiRawGridPriv *priv; | |||
}; | }; | |||
/* struct for the object's class */ | /* struct for the object's class */ | |||
struct _GdauiRawGridClass | struct _GdauiRawGridClass | |||
{ | { | |||
GtkTreeViewClass parent_class; | GtkTreeViewClass parent_class; | |||
void (* selection_changed) (GdauiRawGrid *grid, gboolean row_selected); | ||||
void (* double_clicked) (GdauiRawGrid *grid, gint row ); | void (* double_clicked) (GdauiRawGrid *grid, gint row ); | |||
void (* populate_popup) (GdauiRawGrid *grid, GtkMenu *menu); | void (* populate_popup) (GdauiRawGrid *grid, GtkMenu *menu); | |||
}; | }; | |||
/* | /* | |||
* Generic widget's methods | * Generic widget's methods | |||
*/ | */ | |||
GType gdaui_raw_grid_get_type (void) G_GNUC_CO NST; | GType gdaui_raw_grid_get_type (void) G_GNUC_CONST; | |||
GtkWidget *gdaui_raw_grid_new (GdaDataModel *m odel); | GtkWidget *gdaui_raw_grid_new (GdaDataModel *model); | |||
void gdaui_raw_grid_set_sample_size (GdauiRawGrid *g | void gdaui_raw_grid_set_sample_size (GdauiRawGrid *grid, gint s | |||
rid, gint sample_size); | ample_size); | |||
void gdaui_raw_grid_set_sample_start (GdauiRawGrid *g | void gdaui_raw_grid_set_sample_start (GdauiRawGrid *grid, gint s | |||
rid, gint sample_start); | ample_start); | |||
GList *gdaui_raw_grid_get_selection (GdauiRawGrid *g | void gdaui_raw_grid_set_layout_from_file (GdauiRawGrid *grid, const | |||
rid); | gchar *file_name, const gchar *grid_name); | |||
/* private API */ | ||||
GList *_gdaui_raw_grid_get_selection (GdauiRawGrid *grid); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 8 change blocks. | ||||
12 lines changed or deleted | 14 lines changed or added | |||
libgda-ui.h | libgda-ui.h | |||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
#ifndef __LIBGDAUI_H__ | #ifndef __LIBGDAUI_H__ | |||
#define __LIBGDAUI_H__ | #define __LIBGDAUI_H__ | |||
#include <libgda/libgda.h> | #include <libgda/libgda.h> | |||
#include <libgda-ui/gdaui-data-entry.h> | #include <libgda-ui/gdaui-data-entry.h> | |||
#include <libgda-ui/gdaui-basic-form.h> | #include <libgda-ui/gdaui-basic-form.h> | |||
#include <libgda-ui/gdaui-combo.h> | #include <libgda-ui/gdaui-combo.h> | |||
#include <libgda-ui/gdaui-data-store.h> | #include <libgda-ui/gdaui-data-store.h> | |||
#include <libgda-ui/gdaui-data-widget-filter.h> | #include <libgda-ui/gdaui-data-filter.h> | |||
#include <libgda-ui/gdaui-data-widget.h> | #include <libgda-ui/gdaui-data-proxy.h> | |||
#include <libgda-ui/gdaui-easy.h> | #include <libgda-ui/gdaui-easy.h> | |||
#include <libgda-ui/gdaui-enums.h> | #include <libgda-ui/gdaui-enums.h> | |||
#include <libgda-ui/gdaui-raw-form.h> | #include <libgda-ui/gdaui-raw-form.h> | |||
#include <libgda-ui/gdaui-form.h> | #include <libgda-ui/gdaui-form.h> | |||
#include <libgda-ui/gdaui-set.h> | ||||
#include <libgda-ui/gdaui-raw-grid.h> | #include <libgda-ui/gdaui-raw-grid.h> | |||
#include <libgda-ui/gdaui-grid.h> | #include <libgda-ui/gdaui-grid.h> | |||
#include <libgda-ui/gdaui-data-widget-info.h> | #include <libgda-ui/gdaui-data-proxy-info.h> | |||
#include <libgda-ui/gdaui-provider-selector.h> | #include <libgda-ui/gdaui-provider-selector.h> | |||
#include <libgda-ui/gdaui-server-operation.h> | #include <libgda-ui/gdaui-server-operation.h> | |||
#include <libgda-ui/gdaui-login.h> | #include <libgda-ui/gdaui-login.h> | |||
#include <libgda-ui/gdaui-tree-store.h> | #include <libgda-ui/gdaui-tree-store.h> | |||
#include <libgda-ui/gdaui-cloud.h> | ||||
#include <libgda-ui/gdaui-data-selector.h> | ||||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
void gdaui_init (void); | void gdaui_init (void); | |||
G_END_DECLS | G_END_DECLS | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
5 lines changed or deleted | 6 lines changed or added | |||