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; | GSList *use; | |||
/*< 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 | |||
gda-value.h | gda-value.h | |||
---|---|---|---|---|
skipping to change at line 98 | skipping to change at line 98 | |||
gushort second; | gushort second; | |||
gulong fraction; | gulong fraction; | |||
glong timezone; /* # of seconds to the east UTC */ | glong timezone; /* # of seconds to the east UTC */ | |||
} GdaTimestamp; | } GdaTimestamp; | |||
typedef struct { | typedef struct { | |||
guchar *data; | guchar *data; | |||
glong binary_length; | glong binary_length; | |||
} GdaBinary; | } GdaBinary; | |||
/** | ||||
* GdaBlob | ||||
* @data: data buffer, as a #GdaBinary | ||||
* @op: a pointer to a #GdaBlopOp, or %NULL | ||||
* | ||||
* Represents some binary data, accessed through a #GdaBlobOp object. | ||||
* @op is generally set up by database providers when giving access to an e | ||||
xisting BLOB in | ||||
* a database, but can be modified if needed using gda_blob_set_op(). | ||||
*/ | ||||
typedef struct { | typedef struct { | |||
GdaBinary data; | GdaBinary data; | |||
GdaBlobOp *op; /* set up by providers if the GdaBlob is linked to so | GdaBlobOp *op; | |||
mething actually existing in the database, | ||||
useable by anyone */ | ||||
} GdaBlob; | } GdaBlob; | |||
typedef GList GdaValueList; | typedef GList GdaValueList; | |||
#define gda_value_isa(value, type) (G_VALUE_HOLDS(value, type)) | #define gda_value_isa(value, type) (G_VALUE_HOLDS(value, type)) | |||
GValue *gda_value_new (GType type); | GValue *gda_value_new (GType type); | |||
GValue *gda_value_new_binary (const guchar *val, glong size); | GValue *gda_value_new_binary (const guchar *val, glong size); | |||
GValue *gda_value_new_blob (const guchar *val, gl ong size); | GValue *gda_value_new_blob (const guchar *val, gl ong size); | |||
skipping to change at line 168 | skipping to change at line 176 | |||
gchar *gda_binary_to_string (const GdaBinary *bi n, guint maxlen); | gchar *gda_binary_to_string (const GdaBinary *bi n, guint maxlen); | |||
GdaBinary *gda_string_to_binary (const gchar *str); | GdaBinary *gda_string_to_binary (const gchar *str); | |||
gchar *gda_blob_to_string (GdaBlob *blob, guint maxlen); | gchar *gda_blob_to_string (GdaBlob *blob, guint maxlen); | |||
GdaBlob *gda_string_to_blob (const gchar *str); | GdaBlob *gda_string_to_blob (const gchar *str); | |||
/* Custom data types */ | /* Custom data types */ | |||
GType gda_numeric_get_type (void) G_GNUC_CONST; | GType gda_numeric_get_type (void) G_GNUC_CONST; | |||
gpointer gda_numeric_copy (gpointer boxed) G_GNUC_ | gpointer gda_numeric_copy (gpointer boxed); | |||
CONST; | void gda_numeric_free (gpointer boxed); | |||
void gda_numeric_free (gpointer boxed) G_GNUC_ | ||||
CONST; | ||||
GType gda_time_get_type (void) G_GNUC_CONST; | GType gda_time_get_type (void) G_GNUC_CONST; | |||
gpointer gda_time_copy (gpointer boxed) G_GNUC_CON | gpointer gda_time_copy (gpointer boxed); | |||
ST; | void gda_time_free (gpointer boxed); | |||
void gda_time_free (gpointer boxed) G_GNUC_CON | ||||
ST; | ||||
GType gda_timestamp_get_type (void) G_GNUC_CONS T; | GType gda_timestamp_get_type (void) G_GNUC_CONS T; | |||
gpointer gda_timestamp_copy (gpointer boxed) G_GNU | gpointer gda_timestamp_copy (gpointer boxed); | |||
C_CONST; | void gda_timestamp_free (gpointer boxed); | |||
void gda_timestamp_free (gpointer boxed) G_GNU | ||||
C_CONST; | ||||
GType gda_geometricpoint_get_type (void) G_GNUC _CONST; | GType gda_geometricpoint_get_type (void) G_GNUC _CONST; | |||
gpointer gda_geometricpoint_copy (gpointer boxed) | gpointer gda_geometricpoint_copy (gpointer boxed); | |||
G_GNUC_CONST; | void gda_geometricpoint_free (gpointer boxed); | |||
void gda_geometricpoint_free (gpointer boxed) | ||||
G_GNUC_CONST; | ||||
GType gda_binary_get_type (void) G_GNUC_CONST; | GType gda_binary_get_type (void) G_GNUC_CONST; | |||
gpointer gda_binary_copy (gpointer boxed) G_GNUC_C | gpointer gda_binary_copy (gpointer boxed); | |||
ONST; | void gda_binary_free (gpointer boxed); | |||
void gda_binary_free (gpointer boxed) G_GNUC_C | ||||
ONST; | ||||
GType gda_blob_get_type (void) G_GNUC_CONST; | GType gda_blob_get_type (void) G_GNUC_CONST; | |||
gpointer gda_blob_copy (gpointer boxed) G_GNUC_CON | gpointer gda_blob_copy (gpointer boxed); | |||
ST; | void gda_blob_free (gpointer boxed); | |||
void gda_blob_free (gpointer boxed) G_GNUC_CON | ||||
ST; | ||||
void gda_blob_set_op (GdaBlob *blob, GdaBlobOp *op); | void gda_blob_set_op (GdaBlob *blob, GdaBlobOp *op); | |||
GType gda_value_list_get_type (void) G_GNUC_CON ST; | GType gda_value_list_get_type (void) G_GNUC_CON ST; | |||
GType gda_short_get_type (void) G_GNUC_CONST; | GType gda_short_get_type (void) G_GNUC_CONST; | |||
GType gda_ushort_get_type (void) G_GNUC_CONST; | GType gda_ushort_get_type (void) G_GNUC_CONST; | |||
/* Helper macros */ | /* Helper macros */ | |||
#define gda_value_new_null() (g_new0 (GValue, 1)) | #define gda_value_new_null() (g_new0 (GValue, 1)) | |||
G_END_DECLS | G_END_DECLS | |||
End of changes. 8 change blocks. | ||||
27 lines changed or deleted | 23 lines changed or added | |||