| gda-sql-builder.h | | gda-sql-builder.h | |
| | | | |
| skipping to change at line 72 | | skipping to change at line 72 | |
| 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_ident (GdaSqlBuilder *builder, guint id, | | guint gda_sql_builder_add_id (GdaSqlBuilder *builder, guint id | |
| const gchar *string); | | , const gchar *string); | |
| guint gda_sql_builder_expr (GdaSqlBuilder *builder, guint id, | | guint gda_sql_builder_add_expr (GdaSqlBuilder *builder, guint | |
| GdaDataHandler *dh, GType type, ...); | | id, GdaDataHandler *dh, GType type, ...); | |
| guint gda_sql_builder_param (GdaSqlBuilder *builder, guint id, | | guint gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, | |
| const gchar *param_name, GType type, gboolean nullok); | | guint id, GdaDataHandler *dh, GValue* value); | |
| | | guint gda_sql_builder_add_param (GdaSqlBuilder *builder, guint | |
| | | id, const gchar *param_name, GType type, gboolean nullok); | |
| | | | |
|
| guint gda_sql_builder_cond (GdaSqlBuilder *builder, guint id,
GdaSqlOperatorType op, | | guint gda_sql_builder_add_cond (GdaSqlBuilder *builder, guint
id, GdaSqlOperatorType op, | |
| guint op1, guint op2, guint op3); | | guint op1, guint op2, guint op3); | |
|
| guint gda_sql_builder_cond_v (GdaSqlBuilder *builder, guint id | | guint gda_sql_builder_add_cond_v (GdaSqlBuilder *builder, guin | |
| , GdaSqlOperatorType op, | | t id, GdaSqlOperatorType op, | |
| guint *op_ids, gint op_ids_size); | | const guint *op_ids, gint op_ids_ | |
| | | size); | |
| | | 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, | |
| | | const guint *args, gint ar | |
| | | gs_size); | |
| | | | |
| /* SELECT Statement API */ | | /* SELECT Statement API */ | |
| guint gda_sql_builder_select_add_target (GdaSqlBuilder *builde
r, guint id, | | guint gda_sql_builder_select_add_target (GdaSqlBuilder *builde
r, guint id, | |
| guint table_id, const
gchar *alias); | | guint table_id, const
gchar *alias); | |
| guint gda_sql_builder_select_join_targets (GdaSqlBuilder *buil
der, guint id, | | guint gda_sql_builder_select_join_targets (GdaSqlBuilder *buil
der, guint id, | |
| guint left_target_id
, guint right_target_id, | | guint left_target_id
, guint right_target_id, | |
| GdaSqlSelectJoinType
join_type, | | GdaSqlSelectJoinType
join_type, | |
| guint join_expr); | | guint join_expr); | |
| void gda_sql_builder_join_add_field (GdaSqlBuilder *builder,
guint join_id, const gchar *field_name); | | 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, | | void gda_sql_builder_select_order_by (GdaSqlBuilder *builder,
guint expr_id, | |
| | | | |
End of changes. 3 change blocks. |
| 10 lines changed or deleted | | 19 lines changed or added | |
|
| gda-statement-struct-parts.h | | gda-statement-struct-parts.h | |
| | | | |
| skipping to change at line 86 | | skipping to change at line 86 | |
| /* | | /* | |
| * Any Table's field | | * Any Table's field | |
| */ | | */ | |
| struct _GdaSqlField { | | struct _GdaSqlField { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| gchar *field_name; | | gchar *field_name; | |
| | | | |
| /* validity check with a connection */ | | /* validity check with a connection */ | |
| GdaMetaTableColumn *validity_meta_table_column; | | GdaMetaTableColumn *validity_meta_table_column; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlField *gda_sql_field_new (GdaSqlAnyPart *parent); | | GdaSqlField *gda_sql_field_new (GdaSqlAnyPart *parent); | |
| void gda_sql_field_free (GdaSqlField *field); | | void gda_sql_field_free (GdaSqlField *field); | |
| GdaSqlField *gda_sql_field_copy (GdaSqlField *field); | | GdaSqlField *gda_sql_field_copy (GdaSqlField *field); | |
| gchar *gda_sql_field_serialize (GdaSqlField *field); | | gchar *gda_sql_field_serialize (GdaSqlField *field); | |
| void _gda_sql_field_check_clean (GdaSqlField *field); | | void _gda_sql_field_check_clean (GdaSqlField *field); | |
| | | | |
| skipping to change at line 110 | | skipping to change at line 111 | |
| * Any table | | * Any table | |
| */ | | */ | |
| struct _GdaSqlTable | | struct _GdaSqlTable | |
| { | | { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| gchar *table_name; | | gchar *table_name; | |
| | | | |
| /* validity check with a connection */ | | /* validity check with a connection */ | |
| GdaMetaDbObject *validity_meta_object; | | GdaMetaDbObject *validity_meta_object; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlTable *gda_sql_table_new (GdaSqlAnyPart *parent); | | GdaSqlTable *gda_sql_table_new (GdaSqlAnyPart *parent); | |
| void gda_sql_table_free (GdaSqlTable *table); | | void gda_sql_table_free (GdaSqlTable *table); | |
| GdaSqlTable *gda_sql_table_copy (GdaSqlTable *table); | | GdaSqlTable *gda_sql_table_copy (GdaSqlTable *table); | |
| gchar *gda_sql_table_serialize (GdaSqlTable *table); | | gchar *gda_sql_table_serialize (GdaSqlTable *table); | |
| void _gda_sql_table_check_clean (GdaSqlTable *table); | | void _gda_sql_table_check_clean (GdaSqlTable *table); | |
| | | | |
| skipping to change at line 131 | | skipping to change at line 133 | |
| void gda_sql_table_take_name (GdaSqlTable *table, GValue *
value); | | void gda_sql_table_take_name (GdaSqlTable *table, GValue *
value); | |
| | | | |
| /* | | /* | |
| * A function with any number of arguments | | * A function with any number of arguments | |
| */ | | */ | |
| struct _GdaSqlFunction { | | struct _GdaSqlFunction { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| gchar *function_name; | | gchar *function_name; | |
| GSList *args_list; | | GSList *args_list; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlFunction *gda_sql_function_new (GdaSqlAnyPart *parent); | | GdaSqlFunction *gda_sql_function_new (GdaSqlAnyPart *parent); | |
| void gda_sql_function_free (GdaSqlFunction *function)
; | | void gda_sql_function_free (GdaSqlFunction *function)
; | |
| GdaSqlFunction *gda_sql_function_copy (GdaSqlFunction *function)
; | | GdaSqlFunction *gda_sql_function_copy (GdaSqlFunction *function)
; | |
| gchar *gda_sql_function_serialize (GdaSqlFunction *function)
; | | gchar *gda_sql_function_serialize (GdaSqlFunction *function)
; | |
| void gda_sql_function_check_clean (GdaSqlFunction *function)
; | | void gda_sql_function_check_clean (GdaSqlFunction *function)
; | |
| | | | |
| skipping to change at line 188 | | skipping to change at line 191 | |
| 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_type; | | GdaSqlOperatorType operator_type; | |
| GSList *operands; | | GSList *operands; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| 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); | |
| | | | |
| skipping to change at line 211 | | skipping to change at line 215 | |
| * A CASE expression | | * A CASE expression | |
| */ | | */ | |
| struct _GdaSqlCase | | struct _GdaSqlCase | |
| { | | { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| GdaSqlExpr *base_expr; | | GdaSqlExpr *base_expr; | |
| GSList *when_expr_list; | | GSList *when_expr_list; | |
| GSList *then_expr_list; | | GSList *then_expr_list; | |
| GdaSqlExpr *else_expr; | | GdaSqlExpr *else_expr; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlCase *gda_sql_case_new (GdaSqlAnyPart *parent); | | GdaSqlCase *gda_sql_case_new (GdaSqlAnyPart *parent); | |
| void gda_sql_case_free (GdaSqlCase *sc); | | void gda_sql_case_free (GdaSqlCase *sc); | |
| GdaSqlCase *gda_sql_case_copy (GdaSqlCase *sc); | | GdaSqlCase *gda_sql_case_copy (GdaSqlCase *sc); | |
| gchar *gda_sql_case_serialize (GdaSqlCase *sc); | | gchar *gda_sql_case_serialize (GdaSqlCase *sc); | |
| | | | |
| | | | |
| skipping to change at line 236 | | skipping to change at line 241 | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| GdaSqlExpr *expr; | | GdaSqlExpr *expr; | |
| gchar *field_name; /* may be NULL if expr does not refe
r to a table.field, can also be "*" */ | | gchar *field_name; /* may be NULL if expr does not refe
r to a table.field, can also be "*" */ | |
| gchar *table_name; /* may be NULL if expr does not refe
r to a table.field */ | | gchar *table_name; /* may be NULL if expr does not refe
r to a table.field */ | |
| gchar *as; | | gchar *as; | |
| | | | |
| /* validity check with a connection */ | | /* validity check with a connection */ | |
| GdaMetaDbObject *validity_meta_object; | | GdaMetaDbObject *validity_meta_object; | |
| GdaMetaTableColumn *validity_meta_table_column; | | GdaMetaTableColumn *validity_meta_table_column; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlSelectField *gda_sql_select_field_new (GdaSqlAnyPart *pare
nt); | | GdaSqlSelectField *gda_sql_select_field_new (GdaSqlAnyPart *pare
nt); | |
| void gda_sql_select_field_free (GdaSqlSelectField *
field); | | void gda_sql_select_field_free (GdaSqlSelectField *
field); | |
| GdaSqlSelectField *gda_sql_select_field_copy (GdaSqlSelectField *
field); | | GdaSqlSelectField *gda_sql_select_field_copy (GdaSqlSelectField *
field); | |
| gchar *gda_sql_select_field_serialize (GdaSqlSelectField *
field); | | gchar *gda_sql_select_field_serialize (GdaSqlSelectField *
field); | |
| void _gda_sql_select_field_check_clean (GdaSqlSelectField *
field); | | void _gda_sql_select_field_check_clean (GdaSqlSelectField *
field); | |
| | | | |
| skipping to change at line 264 | | skipping to change at line 270 | |
| struct _GdaSqlSelectTarget | | struct _GdaSqlSelectTarget | |
| { | | { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| GdaSqlExpr *expr; | | GdaSqlExpr *expr; | |
| gchar *table_name; /* may be NULL if expr does not refe
r to a table */ | | gchar *table_name; /* may be NULL if expr does not refe
r to a table */ | |
| gchar *as; | | gchar *as; | |
| | | | |
| /* validity check with a connection */ | | /* validity check with a connection */ | |
| GdaMetaDbObject *validity_meta_object; | | GdaMetaDbObject *validity_meta_object; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlSelectTarget *gda_sql_select_target_new (GdaSqlAnyPart *pa
rent); | | GdaSqlSelectTarget *gda_sql_select_target_new (GdaSqlAnyPart *pa
rent); | |
| void gda_sql_select_target_free (GdaSqlSelectTarge
t *target); | | void gda_sql_select_target_free (GdaSqlSelectTarge
t *target); | |
| GdaSqlSelectTarget *gda_sql_select_target_copy (GdaSqlSelectTarge
t *target); | | GdaSqlSelectTarget *gda_sql_select_target_copy (GdaSqlSelectTarge
t *target); | |
| gchar *gda_sql_select_target_serialize (GdaSqlSelectTarge
t *target); | | gchar *gda_sql_select_target_serialize (GdaSqlSelectTarge
t *target); | |
| void _gda_sql_select_target_check_clean (GdaSqlSelectTarge
t *target); | | void _gda_sql_select_target_check_clean (GdaSqlSelectTarge
t *target); | |
| | | | |
| skipping to change at line 298 | | skipping to change at line 305 | |
| 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 *use; /* list of GdaSqlField pointers */ | | GSList *use; /* list of GdaSqlField pointers */ | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| 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); | |
| | | | |
| | | | |
| skipping to change at line 319 | | skipping to change at line 327 | |
| | | | |
| /* | | /* | |
| * Any FROM ... in a SELECT statement | | * Any FROM ... in a SELECT statement | |
| */ | | */ | |
| struct _GdaSqlSelectFrom | | struct _GdaSqlSelectFrom | |
| { | | { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| GSList *targets; | | GSList *targets; | |
| GSList *joins; | | GSList *joins; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlSelectFrom *gda_sql_select_from_new (GdaSqlAnyPart *paren
t); | | GdaSqlSelectFrom *gda_sql_select_from_new (GdaSqlAnyPart *paren
t); | |
| void gda_sql_select_from_free (GdaSqlSelectFrom *fr
om); | | void gda_sql_select_from_free (GdaSqlSelectFrom *fr
om); | |
| GdaSqlSelectFrom *gda_sql_select_from_copy (GdaSqlSelectFrom *fr
om); | | GdaSqlSelectFrom *gda_sql_select_from_copy (GdaSqlSelectFrom *fr
om); | |
| gchar *gda_sql_select_from_serialize (GdaSqlSelectFrom *fr
om); | | gchar *gda_sql_select_from_serialize (GdaSqlSelectFrom *fr
om); | |
| | | | |
| | | | |
| skipping to change at line 342 | | skipping to change at line 351 | |
| /* | | /* | |
| * Any expression in a SELECT ... after the ORDER BY | | * Any expression in a SELECT ... after the ORDER BY | |
| */ | | */ | |
| struct _GdaSqlSelectOrder | | struct _GdaSqlSelectOrder | |
| { | | { | |
| GdaSqlAnyPart any; | | GdaSqlAnyPart any; | |
| GdaSqlExpr *expr; | | GdaSqlExpr *expr; | |
| gboolean asc; | | gboolean asc; | |
| gchar *collation_name; | | gchar *collation_name; | |
| | | | |
|
| | | /*< private >*/ | |
| /* Padding for future expansion */ | | /* Padding for future expansion */ | |
| gpointer _gda_reserved1; | | gpointer _gda_reserved1; | |
| gpointer _gda_reserved2; | | gpointer _gda_reserved2; | |
| }; | | }; | |
| | | | |
| GdaSqlSelectOrder *gda_sql_select_order_new (GdaSqlAnyPart *pare
nt); | | GdaSqlSelectOrder *gda_sql_select_order_new (GdaSqlAnyPart *pare
nt); | |
| void gda_sql_select_order_free (GdaSqlSelectOrder *
order); | | void gda_sql_select_order_free (GdaSqlSelectOrder *
order); | |
| GdaSqlSelectOrder *gda_sql_select_order_copy (GdaSqlSelectOrder *
order); | | GdaSqlSelectOrder *gda_sql_select_order_copy (GdaSqlSelectOrder *
order); | |
| gchar *gda_sql_select_order_serialize (GdaSqlSelectOrder *
order); | | gchar *gda_sql_select_order_serialize (GdaSqlSelectOrder *
order); | |
| | | | |
| | | | |
End of changes. 10 change blocks. |
| 0 lines changed or deleted | | 10 lines changed or added | |
|