libgda: headers diff between 4.0.2 and 4.0.3 versions

	gda-connection.h	gda-connection.h

	skipping to change at line 83	skipping to change at line 83
	void (dsn_changed) (GdaConnection obj);	void (dsn_changed) (GdaConnection obj);
	void (transaction_status_changed)(GdaConnection obj);	void (transaction_status_changed)(GdaConnection obj);

	/* 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);
	};	};


		/**
		* GdaConnectionOptions:
		* @GDA_CONNECTION_OPTIONS_NONE: no specific aspect
		* @GDA_CONNECTION_OPTIONS_READ_ONLY: this flag specifies that the connecti
		on to open should be in a read-only mode
		* (this policy is not correctly enforce
		d at the moment)
		* @GDA_CONNECTION_OPTIONS_THREAD_SAFE: this flag specifies that the connec
		tion to open will be used
		* by several threads at once so it has
		to be thread safe
		* @GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE: this flag specif
		ies that SQL identifiers submitted as input
		* to Libgda have to keep their case sen
		sitivity.
		*
		*
		* Specifies some aspects of a connection when opening it.
		*
		* Additionnal information about the GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS
		_CASE_SENSITIVE flag:
		* <itemizedlist>
		* <listitem><para>For example without this flag, if the table
		* name specified in a #GdaServerOperation to create a table is
		* <emphasis>MyTable</emphasis>, then usually the database will creat
		e a table named
		* <emphasis>mytable</emphasis>, whereas with this flag, the table wi
		ll be created
		* as <emphasis>MyTable</emphasis> (note that in the end the database
		may still decide
		* to name the table <emphasis>mytable</emphasis> or differently if i
		t can't do
		* otherwise).</para></listitem>
		* <listitem><para>Libgda will not apply this rule when parsing SQL code,
		the SQL code being parsed
		* has to be conform to the database it will be used with</para></lis
		titem>
		* </itemizedlist>
		*/
	typedef enum {	typedef enum {
	GDA_CONNECTION_OPTIONS_NONE = 0,	GDA_CONNECTION_OPTIONS_NONE = 0,

	GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0	GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0,
		GDA_CONNECTION_OPTIONS_SQL_IDENTIFIERS_CASE_SENSITIVE = 1 << 1
	} GdaConnectionOptions;	} GdaConnectionOptions;

	typedef enum {	typedef enum {
	GDA_CONNECTION_FEATURE_AGGREGATES,	GDA_CONNECTION_FEATURE_AGGREGATES,
	GDA_CONNECTION_FEATURE_BLOBS,	GDA_CONNECTION_FEATURE_BLOBS,
	GDA_CONNECTION_FEATURE_INDEXES,	GDA_CONNECTION_FEATURE_INDEXES,
	GDA_CONNECTION_FEATURE_INHERITANCE,	GDA_CONNECTION_FEATURE_INHERITANCE,
	GDA_CONNECTION_FEATURE_NAMESPACES,	GDA_CONNECTION_FEATURE_NAMESPACES,
	GDA_CONNECTION_FEATURE_PROCEDURES,	GDA_CONNECTION_FEATURE_PROCEDURES,
	GDA_CONNECTION_FEATURE_SEQUENCES,	GDA_CONNECTION_FEATURE_SEQUENCES,

	skipping to change at line 167	skipping to change at line 194
	const gchar gda_connection_get_cnc_string (GdaConnection cn c);	const gchar gda_connection_get_cnc_string (GdaConnection cn c);
	const gchar gda_connection_get_authentication (GdaConnection cn c);	const gchar gda_connection_get_authentication (GdaConnection cn c);

	const GList gda_connection_get_events (GdaConnection cn c);	const GList gda_connection_get_events (GdaConnection cn c);

	GdaSqlParser gda_connection_create_parser (GdaConnection cn c);	GdaSqlParser gda_connection_create_parser (GdaConnection cn c);
	GSList gda_connection_batch_execute (GdaConnection cn c,	GSList gda_connection_batch_execute (GdaConnection cn c,
	GdaBatch batch, G daSet params,	GdaBatch batch, G daSet params,
	GdaStatementModelU sage model_usage, GError **error);	GdaStatementModelU sage model_usage, GError **error);


		gchar gda_connection_quote_sql_identifier (GdaConnection cn c, const gchar *id);
	gchar gda_connection_statement_to_sql (GdaConnection cn c,	gchar gda_connection_statement_to_sql (GdaConnection cn c,
	GdaStatement stmt , GdaSet params, GdaStatementSqlFlag flags,	GdaStatement stmt , GdaSet params, GdaStatementSqlFlag flags,
	GSList params_us ed, GError error);	GSList params_us ed, GError error);
	gboolean gda_connection_statement_prepare (GdaConnection *cn c,	gboolean gda_connection_statement_prepare (GdaConnection *cn c,
	GdaStatement stmt , GError *error);	GdaStatement stmt , GError *error);
	GObject gda_connection_statement_execute (GdaConnection cn c, GdaStatement stmt, GdaSet params,	GObject gda_connection_statement_execute (GdaConnection cn c, GdaStatement stmt, GdaSet params,
	GdaStatementModelU sage model_usage, GdaSet **last_insert_row,	GdaStatementModelU sage model_usage, GdaSet **last_insert_row,
	GError **error);	GError **error);
	GdaDataModel gda_connection_statement_execute_select (GdaConnection cnc, GdaStatement *stmt,	GdaDataModel gda_connection_statement_execute_select (GdaConnection cnc, GdaStatement *stmt,
	GdaSet params , GError *error);	GdaSet params , GError *error);

End of changes. 3 change blocks.
	1 lines changed or deleted	42 lines changed or added

	gda-decl.h	gda-decl.h

	skipping to change at line 108	skipping to change at line 108
	typedef struct _GdaMetaStore GdaMetaStore;	typedef struct _GdaMetaStore GdaMetaStore;
	typedef struct _GdaMetaStoreClass GdaMetaStoreClass;	typedef struct _GdaMetaStoreClass GdaMetaStoreClass;
	typedef struct _GdaMetaStorePrivate GdaMetaStorePrivate;	typedef struct _GdaMetaStorePrivate GdaMetaStorePrivate;
	typedef struct _GdaMetaStoreClassPrivate GdaMetaStoreClassPrivate;	typedef struct _GdaMetaStoreClassPrivate GdaMetaStoreClassPrivate;

	typedef struct _GdaMetaStruct GdaMetaStruct;	typedef struct _GdaMetaStruct GdaMetaStruct;
	typedef struct _GdaMetaStructClass GdaMetaStructClass;	typedef struct _GdaMetaStructClass GdaMetaStructClass;
	typedef struct _GdaMetaStructPrivate GdaMetaStructPrivate;	typedef struct _GdaMetaStructPrivate GdaMetaStructPrivate;

	/*	/*

		* Determines if @word is a reserved SQL keyword
		*/
		typedef gboolean (GdaSqlReservedKeywordsFunc) (const gchar word);

		/*
	* Win32 adaptations	* Win32 adaptations
	*/	*/
	#ifdef G_OS_WIN32	#ifdef G_OS_WIN32
	#define strtok_r(s,d,p) strtok(s,d)	#define strtok_r(s,d,p) strtok(s,d)
	#endif	#endif

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	5 lines changed or added

	gda-meta-struct.h	gda-meta-struct.h

	skipping to change at line 95	skipping to change at line 95
	} GdaMetaStructFeature;	} GdaMetaStructFeature;

	/*	/*
	* Types of sorting	* Types of sorting
	*/	*/
	typedef enum {	typedef enum {
	GDA_META_SORT_ALHAPETICAL,	GDA_META_SORT_ALHAPETICAL,
	GDA_META_SORT_DEPENDENCIES	GDA_META_SORT_DEPENDENCIES
	} GdaMetaSortType;	} GdaMetaSortType;


	/*	/**
	* Complements the GdaMetaDbObject structure, for tables only	* GdaMetaTable:
	* contains predefined statements for data selection and modifications	* @columns: list of #GdaMetaTableColumn structures, one for each column in
		the table
		* @pk_cols_array: index of the columns part of the primary key for the tab
		le (WARNING: columns numbering
		* here start at 0)
		* @pk_cols_nb: size of the @pk_cols_array array
		* @reverse_fk_list: list of #GdaMetaTableForeignKey where the referenced t
		able is this table
		* @fk_list: list of #GdaMetaTableForeignKey for this table
		*
		* This structure specifies a #GdaMetaDbObject to represent a table's speci
		fic attributes,
		* its contents must not be modified.
	*/	*/
	typedef struct {	typedef struct {

	GSList columns; / list of GdaMetaTableColumn */	/< public >/
		GSList *columns;

	/* PK fields index */	/* PK fields index */
	gint *pk_cols_array;	gint *pk_cols_array;
	gint pk_cols_nb;	gint pk_cols_nb;

	/* Foreign keys */	/* Foreign keys */
	GSList reverse_fk_list; / list of GdaMetaTableForeignKey whe re @depend_on == this GdaMetaDbObject */	GSList reverse_fk_list; / list of GdaMetaTableForeignKey whe re @depend_on == this GdaMetaDbObject */
	GSList fk_list; / list of GdaMetaTableForeignKey where @meta _table == this GdaMetaDbObject */	GSList fk_list; / list of GdaMetaTableForeignKey where @meta _table == this GdaMetaDbObject */


		/< private >/
	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	gpointer _gda_reserved3;	gpointer _gda_reserved3;
	gpointer _gda_reserved4;	gpointer _gda_reserved4;
	} GdaMetaTable;	} GdaMetaTable;

	/**	/**

	* Complements the GdaMetaDbObject structure, for views only	* GdaMetaView:
	* contains more information than for tables	* @table: a view is also a table as it has columns
		* @view_def: views' definition
		* @is_updatable: tells if the view's contents can be updated
		*
		* This structure specifies a #GdaMetaDbObject to represent a view's specif
		ic attributes,
		* its contents must not be modified.
	*/	*/
	typedef struct {	typedef struct {

		/< public >/
	GdaMetaTable table;	GdaMetaTable table;
	gchar *view_def;	gchar *view_def;
	gboolean is_updatable;	gboolean is_updatable;


		/< private >/
	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	gpointer _gda_reserved3;	gpointer _gda_reserved3;
	gpointer _gda_reserved4;	gpointer _gda_reserved4;
	} GdaMetaView;	} GdaMetaView;


	/*	/**
	* Struture to hold information about each database object (tables, views,	* GdaMetaDbObject:
	triggers, ...)	* @extra: union for the actual object's contents, to be able to cast it us
		ing GDA_META_TABLE(), GDA_META_VIEW()
		* @obj_type: the type of object (table, view)
		* @outdated:
		* @obj_catalog: the catalog the object is in
		* @obj_schema: the schema the object is in
		* @obj_name: the object's name
		* @obj_short_name: the shortest way to name the object
		* @obj_full_name: the full name of the object (in the <schema>.<n
		ameagt; notation
		* @obj_owner: object's owner
		* @depend_list: list of #GdaMetaDbObject pointers on which this object dep
		ends (through foreign keys
		* or tables used for views)
		*
		* Struture to hold information about each database object (tables, views,
		...),
		* its contents must not be modified.
	*	*
	* Note: @obj_catalog, @obj_schema, @obj_name, @obj_short_name and @obj_ful l_name are case sensitive:	* Note: @obj_catalog, @obj_schema, @obj_name, @obj_short_name and @obj_ful l_name are case sensitive:

	* one must call gda_sql_identifier_needs_quotes() to know if is it i s necessary to surround by double quotes	* one must use gda_sql_identifier_quote() to know if is it is necess ary to surround by double quotes
	* before using in an SQL statement	* before using in an SQL statement
	*/	*/
	typedef struct {	typedef struct {

		/< public >/
	union {	union {
	GdaMetaTable meta_table;	GdaMetaTable meta_table;
	GdaMetaView meta_view;	GdaMetaView meta_view;
	} extra;	} extra;
	GdaMetaDbObjectType obj_type;	GdaMetaDbObjectType obj_type;
	gboolean outdated;	gboolean outdated;
	gchar *obj_catalog;	gchar *obj_catalog;
	gchar *obj_schema;	gchar *obj_schema;
	gchar *obj_name;	gchar *obj_name;
	gchar *obj_short_name;	gchar *obj_short_name;
	gchar *obj_full_name;	gchar *obj_full_name;
	gchar *obj_owner;	gchar *obj_owner;

	GSList depend_list; / list of GdaMetaDbObject poin ters on which this object depends */	GSList depend_list; / list of GdaMetaDbObject poin ters on which this object depends */


		/< private >/
	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	gpointer _gda_reserved3;	gpointer _gda_reserved3;
	gpointer _gda_reserved4;	gpointer _gda_reserved4;
	} GdaMetaDbObject;	} GdaMetaDbObject;
	#define GDA_META_DB_OBJECT(x) ((GdaMetaDbObject*)(x))	#define GDA_META_DB_OBJECT(x) ((GdaMetaDbObject*)(x))
	#define GDA_META_TABLE(dbobj) (&((dbobj)->extra.meta_table))	#define GDA_META_TABLE(dbobj) (&((dbobj)->extra.meta_table))
	#define GDA_META_VIEW(dbobj) (&((dbobj)->extra.meta_view))	#define GDA_META_VIEW(dbobj) (&((dbobj)->extra.meta_view))


		/**
		* GdaMetaTableColumn:
		* @column_name: the column's name
		* @column_type: the column's DBMS's type
		* @gtype: the detected column's #GType
		* @pkey: tells if the column is part of a primary key
		* @nullok: tells if the column can be %NULL
		* @default_value: the column's default value
		*
		* This structure represents a table of view's column, its contents must no
		t be modified.
		*/
	typedef struct {	typedef struct {

		/< public >/
	gchar *column_name;	gchar *column_name;
	gchar *column_type;	gchar *column_type;
	GType gtype;	GType gtype;
	gboolean pkey;	gboolean pkey;
	gboolean nullok;	gboolean nullok;
	gchar *default_value;	gchar *default_value;


		/< private >/
	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	gpointer _gda_reserved3;	gpointer _gda_reserved3;
	gpointer _gda_reserved4;	gpointer _gda_reserved4;
	} GdaMetaTableColumn;	} GdaMetaTableColumn;
	#define GDA_META_TABLE_COLUMN(x) ((GdaMetaTableColumn*)(x))	#define GDA_META_TABLE_COLUMN(x) ((GdaMetaTableColumn*)(x))
	const GValue gda_meta_table_column_get_attribute (GdaMetaTableColumn tcol , const gchar *attribute);	const GValue gda_meta_table_column_get_attribute (GdaMetaTableColumn tcol , const gchar *attribute);
	void gda_meta_table_column_set_attribute (GdaMetaTableColumn tcol , const gchar attribute, const GValue *value,	void gda_meta_table_column_set_attribute (GdaMetaTableColumn tcol , const gchar attribute, const GValue *value,
	GDestroyNotify destroy);	GDestroyNotify destroy);

	skipping to change at line 196	skipping to change at line 242
	* @column: a #GdaMetaTableColumn	* @column: a #GdaMetaTableColumn
	* @attribute: attribute's name	* @attribute: attribute's name
	* @value: a #GValue, or %NULL	* @value: a #GValue, or %NULL
	*	*
	* This function is similar to gda_meta_table_column_set_attribute() but fo r static strings	* This function is similar to gda_meta_table_column_set_attribute() but fo r static strings
	*/	*/
	#define gda_meta_table_column_set_attribute_static(column,attribute,value) gda_meta_table_column_set_attribute((column),(attribute),(value),NULL)	#define gda_meta_table_column_set_attribute_static(column,attribute,value) gda_meta_table_column_set_attribute((column),(attribute),(value),NULL)

	void gda_meta_table_column_foreach_attribute (GdaMetaTableColumn * tcol, GdaAttributesManagerFunc func, gpointer data);	void gda_meta_table_column_foreach_attribute (GdaMetaTableColumn * tcol, GdaAttributesManagerFunc func, gpointer data);


		/**
		* GdaMetaTableForeignKey:
		* @meta_table: the #GdaMetaDbObject for which this structure represents a
		foreign key
		* @depend_on: the #GdaMetaDbObject which is referenced by the foreign key
		* @cols_nb: the size of the @fk_cols_array, @fk_names_array, @ref_pk_cols_
		array and @ref_pk_names_array arrays
		* @fk_cols_array: the columns' indexes in @meta_table which participate in
		the constraint (WARNING: columns numbering
		* here start at 1)
		* @fk_names_array: the columns' names in @meta_table which participate in
		the constraint
		* @ref_pk_cols_array: the columns' indexes in @depend_on which participate
		in the constraint (WARNING: columns numbering
		* here start at 1)
		* @ref_pk_names_array: the columns' names in @depend_on which participate
		in the constraint
		*
		* This structure represents a foreign key constraint, its contents must no
		t be modified.
		*/
	typedef struct {	typedef struct {

		/< public >/
	GdaMetaDbObject *meta_table;	GdaMetaDbObject *meta_table;
	GdaMetaDbObject *depend_on;	GdaMetaDbObject *depend_on;

	gint cols_nb;	gint cols_nb;
	gint fk_cols_array; / FK fields index */	gint fk_cols_array; / FK fields index */
	gchar *fk_names_array; / FK fields names */	gchar *fk_names_array; / FK fields names */
	gint ref_pk_cols_array; / Ref PK fields index */	gint ref_pk_cols_array; / Ref PK fields index */
	gchar *ref_pk_names_array; / Ref PK fields names */	gchar *ref_pk_names_array; / Ref PK fields names */


		/< private >/
	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	gpointer _gda_reserved3;	gpointer _gda_reserved3;
	gpointer _gda_reserved4;	gpointer _gda_reserved4;
	} GdaMetaTableForeignKey;	} GdaMetaTableForeignKey;
	#define GDA_META_TABLE_FOREIGN_KEY(x) ((GdaMetaTableForeignKey*)(x))	#define GDA_META_TABLE_FOREIGN_KEY(x) ((GdaMetaTableForeignKey*)(x))

	GType gda_meta_struct_get_type (void) G_GNUC_CONST;	GType gda_meta_struct_get_type (void) G_GNUC_CONST;
	GdaMetaStruct gda_meta_struct_new (GdaMetaStore store , GdaMetaStructFeature features);	GdaMetaStruct gda_meta_struct_new (GdaMetaStore store , GdaMetaStructFeature features);

End of changes. 16 change blocks.
	10 lines changed or deleted	88 lines changed or added

	gda-server-provider.h	gda-server-provider.h

	skipping to change at line 297	skipping to change at line 297
	gboolean (* cancel) (GdaServerProvider provider, GdaConnection cnc,	gboolean (* cancel) (GdaServerProvider provider, GdaConnection cnc,
	guint task_id, GEr ror **error);	guint task_id, GEr ror **error);
	GdaConnection ( create_connection) (GdaServerProvider *provider);	GdaConnection ( create_connection) (GdaServerProvider *provider);

	/* meta data reporting */	/* meta data reporting */
	GdaServerProviderMeta meta_funcs;	GdaServerProviderMeta meta_funcs;

	/* distributed transaction */	/* distributed transaction */
	GdaServerProviderXa xa_funcs; / it is a pointer! => set to % NULL if unsupported by provider */	GdaServerProviderXa xa_funcs; / it is a pointer! => set to % NULL if unsupported by provider */


		/* SQL identifiers quoting */
		gchar ( identifier_quote) (GdaServerProvider *
		provider, GdaConnection *cnc,
		const gchar *id,
		gboolean for_meta_s
		tore, gboolean force_quotes);

	/* Padding for future expansion */	/* Padding for future expansion */

	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);
	void (*_gda_reserved5) (void);	void (*_gda_reserved5) (void);
	void (*_gda_reserved6) (void);	void (*_gda_reserved6) (void);
	};	};

	GType gda_server_provider_get_type (void) G_GNUC_CONST;	GType gda_server_provider_get_type (void) G_GNUC_CONST;

	/* provider information */	/* provider information */

End of changes. 2 change blocks.
	1 lines changed or deleted	7 lines changed or added

	gda-statement-struct-compound.h	gda-statement-struct-compound.h

	skipping to change at line 28	skipping to change at line 28
	*/	*/

	#ifndef _GDA_STATEMENT_STRUCT_COMPOUND_H_	#ifndef _GDA_STATEMENT_STRUCT_COMPOUND_H_
	#define _GDA_STATEMENT_STRUCT_COMPOUND_H_	#define _GDA_STATEMENT_STRUCT_COMPOUND_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-select.h>	#include <sql-parser/gda-statement-struct-select.h>


		G_BEGIN_DECLS

	/*	/*
	* Kinds	* Kinds
	*/	*/
	typedef enum {	typedef enum {
	GDA_SQL_STATEMENT_COMPOUND_UNION,	GDA_SQL_STATEMENT_COMPOUND_UNION,
	GDA_SQL_STATEMENT_COMPOUND_UNION_ALL,	GDA_SQL_STATEMENT_COMPOUND_UNION_ALL,
	GDA_SQL_STATEMENT_COMPOUND_INTERSECT,	GDA_SQL_STATEMENT_COMPOUND_INTERSECT,
	GDA_SQL_STATEMENT_COMPOUND_INTERSECT_ALL,	GDA_SQL_STATEMENT_COMPOUND_INTERSECT_ALL,
	GDA_SQL_STATEMENT_COMPOUND_EXCEPT,	GDA_SQL_STATEMENT_COMPOUND_EXCEPT,
	GDA_SQL_STATEMENT_COMPOUND_EXCEPT_ALL	GDA_SQL_STATEMENT_COMPOUND_EXCEPT_ALL

	skipping to change at line 73	skipping to change at line 75
	*/	*/
	gint _gda_sql_statement_compound_get_n_cols (GdaSqlStatementCompound * compound, GError **error);	gint _gda_sql_statement_compound_get_n_cols (GdaSqlStatementCompound * compound, GError **error);
	GdaSqlAnyPart * _gda_sql_statement_compound_reduce (GdaSqlAnyPart *compound _or_select);	GdaSqlAnyPart * _gda_sql_statement_compound_reduce (GdaSqlAnyPart *compound _or_select);

	/*	/*
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_compound_set_type (GdaSqlStatement *stmt, GdaSqlStat ementCompoundType type);	void gda_sql_statement_compound_set_type (GdaSqlStatement *stmt, GdaSqlStat ementCompoundType type);
	void gda_sql_statement_compound_take_stmt (GdaSqlStatement stmt, GdaSqlSta tement s);	void gda_sql_statement_compound_take_stmt (GdaSqlStatement stmt, GdaSqlSta tement s);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-decl.h	gda-statement-struct-decl.h

	skipping to change at line 29	skipping to change at line 29

	#ifndef _GDA_STATEMENT_STRUCT_DECL_H	#ifndef _GDA_STATEMENT_STRUCT_DECL_H
	#define _GDA_STATEMENT_STRUCT_DECL_H	#define _GDA_STATEMENT_STRUCT_DECL_H

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <libgda/gda-decl.h>	#include <libgda/gda-decl.h>
	#include <libgda/gda-meta-store.h>	#include <libgda/gda-meta-store.h>
	#include <libgda/gda-meta-struct.h>	#include <libgda/gda-meta-struct.h>


		G_BEGIN_DECLS

	/* error reporting */	/* error reporting */
	extern GQuark gda_sql_error_quark (void);	extern GQuark gda_sql_error_quark (void);
	#define GDA_SQL_ERROR gda_sql_error_quark ()	#define GDA_SQL_ERROR gda_sql_error_quark ()

	typedef enum {	typedef enum {
	GDA_SQL_STRUCTURE_CONTENTS_ERROR,	GDA_SQL_STRUCTURE_CONTENTS_ERROR,
	GDA_SQL_MALFORMED_IDENTIFIER_ERROR,	GDA_SQL_MALFORMED_IDENTIFIER_ERROR,
	GDA_SQL_MISSING_IDENTIFIER_ERROR,	GDA_SQL_MISSING_IDENTIFIER_ERROR,
	GDA_SQL_VALIDATION_ERROR	GDA_SQL_VALIDATION_ERROR
	} GdaSqlErrorType;	} GdaSqlErrorType;

	skipping to change at line 168	skipping to change at line 170
	GdaMetaStore *store;	GdaMetaStore *store;
	GdaMetaStruct *mstruct;	GdaMetaStruct *mstruct;

	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	gpointer _gda_reserved3;	gpointer _gda_reserved3;
	gpointer _gda_reserved4;	gpointer _gda_reserved4;
	} GdaSqlStatementCheckValidityData;	} GdaSqlStatementCheckValidityData;


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-delete.h	gda-statement-struct-delete.h

	skipping to change at line 29	skipping to change at line 29

	#ifndef _GDA_STATEMENT_STRUCT_DELETE_H_	#ifndef _GDA_STATEMENT_STRUCT_DELETE_H_
	#define _GDA_STATEMENT_STRUCT_DELETE_H_	#define _GDA_STATEMENT_STRUCT_DELETE_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-select.h>	#include <sql-parser/gda-statement-struct-select.h>
	#include <sql-parser/gda-statement-struct-parts.h>	#include <sql-parser/gda-statement-struct-parts.h>


		G_BEGIN_DECLS

	/*	/*
	* Structure definition	* Structure definition
	*/	*/
	struct _GdaSqlStatementDelete {	struct _GdaSqlStatementDelete {
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	GdaSqlTable *table;	GdaSqlTable *table;
	GdaSqlExpr *cond;	GdaSqlExpr *cond;

	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;

	skipping to change at line 53	skipping to change at line 55
	* Common operations	* Common operations
	*/	*/
	GdaSqlStatementContentsInfo *_gda_sql_statement_delete_get_infos (void);	GdaSqlStatementContentsInfo *_gda_sql_statement_delete_get_infos (void);

	/*	/*
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_delete_take_table_name (GdaSqlStatement stmt, GValu e value);	void gda_sql_statement_delete_take_table_name (GdaSqlStatement stmt, GValu e value);
	void gda_sql_statement_delete_take_condition (GdaSqlStatement stmt, GdaSql Expr cond);	void gda_sql_statement_delete_take_condition (GdaSqlStatement stmt, GdaSql Expr cond);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-insert.h	gda-statement-struct-insert.h

	skipping to change at line 29	skipping to change at line 29

	#ifndef _GDA_STATEMENT_STRUCT_INSERT_H_	#ifndef _GDA_STATEMENT_STRUCT_INSERT_H_
	#define _GDA_STATEMENT_STRUCT_INSERT_H_	#define _GDA_STATEMENT_STRUCT_INSERT_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-select.h>	#include <sql-parser/gda-statement-struct-select.h>
	#include <sql-parser/gda-statement-struct-parts.h>	#include <sql-parser/gda-statement-struct-parts.h>


		G_BEGIN_DECLS

	/*	/*
	* Structure definition	* Structure definition
	*/	*/
	struct _GdaSqlStatementInsert {	struct _GdaSqlStatementInsert {
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	gchar on_conflict; / conflict resolution clause * /	gchar on_conflict; / conflict resolution clause * /
	GdaSqlTable *table;	GdaSqlTable *table;
	GSList fields_list; / list of GdaSqlField structur es */	GSList fields_list; / list of GdaSqlField structur es */
	GSList values_list; / list of list of GdaSqlExpr * /	GSList values_list; / list of list of GdaSqlExpr * /
	GdaSqlAnyPart select; / SELECT OR COMPOUND statements: Gd aSqlStatementSelect or GdaSqlStatementCompound */	GdaSqlAnyPart select; / SELECT OR COMPOUND statements: Gd aSqlStatementSelect or GdaSqlStatementCompound */

	skipping to change at line 61	skipping to change at line 63
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_insert_take_table_name (GdaSqlStatement stmt, GValu e value);	void gda_sql_statement_insert_take_table_name (GdaSqlStatement stmt, GValu e value);
	void gda_sql_statement_insert_take_on_conflict (GdaSqlStatement stmt, GVal ue value);	void gda_sql_statement_insert_take_on_conflict (GdaSqlStatement stmt, GVal ue value);
	void gda_sql_statement_insert_take_fields_list (GdaSqlStatement stmt, GSLi st list);	void gda_sql_statement_insert_take_fields_list (GdaSqlStatement stmt, GSLi st list);
	void gda_sql_statement_insert_take_1_values_list (GdaSqlStatement stmt, GS List list);	void gda_sql_statement_insert_take_1_values_list (GdaSqlStatement stmt, GS List list);
	void gda_sql_statement_insert_take_extra_values_list (GdaSqlStatement stmt , GSList list);	void gda_sql_statement_insert_take_extra_values_list (GdaSqlStatement stmt , GSList list);

	void gda_sql_statement_insert_take_select (GdaSqlStatement stmt, GdaSqlSta tement select);	void gda_sql_statement_insert_take_select (GdaSqlStatement stmt, GdaSqlSta tement select);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-parts.h	gda-statement-struct-parts.h

	skipping to change at line 30	skipping to change at line 30
	#ifndef _GDA_STATEMENT_STRUCT_PARTS_H	#ifndef _GDA_STATEMENT_STRUCT_PARTS_H
	#define _GDA_STATEMENT_STRUCT_PARTS_H	#define _GDA_STATEMENT_STRUCT_PARTS_H

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct.h>	#include <sql-parser/gda-statement-struct.h>
	#include <sql-parser/gda-statement-struct-pspec.h>	#include <sql-parser/gda-statement-struct-pspec.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <libgda/gda-meta-struct.h>	#include <libgda/gda-meta-struct.h>


		G_BEGIN_DECLS

	typedef struct _GdaSqlExpr GdaSqlExpr;	typedef struct _GdaSqlExpr GdaSqlExpr;
	typedef struct _GdaSqlField GdaSqlField;	typedef struct _GdaSqlField GdaSqlField;
	typedef struct _GdaSqlTable GdaSqlTable;	typedef struct _GdaSqlTable GdaSqlTable;
	typedef struct _GdaSqlFunction GdaSqlFunction;	typedef struct _GdaSqlFunction GdaSqlFunction;
	typedef struct _GdaSqlOperation GdaSqlOperation;	typedef struct _GdaSqlOperation GdaSqlOperation;
	typedef struct _GdaSqlCase GdaSqlCase;	typedef struct _GdaSqlCase GdaSqlCase;
	typedef struct _GdaSqlSelectField GdaSqlSelectField;	typedef struct _GdaSqlSelectField GdaSqlSelectField;
	typedef struct _GdaSqlSelectTarget GdaSqlSelectTarget;	typedef struct _GdaSqlSelectTarget GdaSqlSelectTarget;
	typedef struct _GdaSqlSelectJoin GdaSqlSelectJoin;	typedef struct _GdaSqlSelectJoin GdaSqlSelectJoin;
	typedef struct _GdaSqlSelectFrom GdaSqlSelectFrom;	typedef struct _GdaSqlSelectFrom GdaSqlSelectFrom;

	skipping to change at line 56	skipping to change at line 58
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	GValue *value;	GValue *value;
	GdaSqlParamSpec *param_spec;	GdaSqlParamSpec *param_spec;
	GdaSqlFunction *func;	GdaSqlFunction *func;
	GdaSqlOperation *cond;	GdaSqlOperation *cond;
	GdaSqlAnyPart select; / SELECT OR COMPOUND statements: GdaSqlSta tementSelect or GdaSqlStatementCompound */	GdaSqlAnyPart select; / SELECT OR COMPOUND statements: GdaSqlSta tementSelect or GdaSqlStatementCompound */
	GdaSqlCase *case_s;	GdaSqlCase *case_s;

	gchar *cast_as;	gchar *cast_as;


		gpointer value_is_ident; /* pointer to a boolean to keep ABI
		from 4.0.
		* Non NULL if @value represents an
		SQL identifier
		* Mem in _NOT_ allocated!
		*/

		/< private >/
	/* Padding for future expansion */	/* Padding for future expansion */

	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;
	};	};

	GdaSqlExpr gda_sql_expr_new (GdaSqlAnyPart parent);	GdaSqlExpr gda_sql_expr_new (GdaSqlAnyPart parent);
	void gda_sql_expr_free (GdaSqlExpr *expr);	void gda_sql_expr_free (GdaSqlExpr *expr);
	GdaSqlExpr gda_sql_expr_copy (GdaSqlExpr expr);	GdaSqlExpr gda_sql_expr_copy (GdaSqlExpr expr);
	gchar gda_sql_expr_serialize (GdaSqlExpr expr);	gchar gda_sql_expr_serialize (GdaSqlExpr expr);
	void _gda_sql_expr_check_clean (GdaSqlExpr *expr);	void _gda_sql_expr_check_clean (GdaSqlExpr *expr);

	void gda_sql_expr_take_select (GdaSqlExpr expr, GdaSqlState ment stmt);	void gda_sql_expr_take_select (GdaSqlExpr expr, GdaSqlState ment stmt);

	skipping to change at line 345	skipping to change at line 352
	/* 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);


		G_END_DECLS

	#endif	#endif

End of changes. 4 change blocks.
	1 lines changed or deleted	12 lines changed or added

	gda-statement-struct-pspec.h	gda-statement-struct-pspec.h

	skipping to change at line 26	skipping to change at line 26
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef _GDA_STATEMENT_STRUCT_PSPEC_H	#ifndef _GDA_STATEMENT_STRUCT_PSPEC_H
	#define _GDA_STATEMENT_STRUCT_PSPEC_H	#define _GDA_STATEMENT_STRUCT_PSPEC_H

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>


		G_BEGIN_DECLS

	typedef struct _GdaSqlParamSpec GdaSqlParamSpec;	typedef struct _GdaSqlParamSpec GdaSqlParamSpec;

	/*	/*
	* Structure to hold one parameter specification	* Structure to hold one parameter specification
	*/	*/
	struct _GdaSqlParamSpec	struct _GdaSqlParamSpec
	{	{
	gchar *name;	gchar *name;
	gchar *descr;	gchar *descr;
	gboolean is_param;	gboolean is_param;

	skipping to change at line 55	skipping to change at line 57
	GdaSqlParamSpec gda_sql_param_spec_new (GValue simple_spec);	GdaSqlParamSpec gda_sql_param_spec_new (GValue simple_spec);
	GdaSqlParamSpec gda_sql_param_spec_copy (GdaSqlParamSpec pspec);	GdaSqlParamSpec gda_sql_param_spec_copy (GdaSqlParamSpec pspec);
	void gda_sql_param_spec_take_name (GdaSqlParamSpec pspec, GVa lue value);	void gda_sql_param_spec_take_name (GdaSqlParamSpec pspec, GVa lue value);
	void gda_sql_param_spec_take_type (GdaSqlParamSpec pspec, GVa lue value);	void gda_sql_param_spec_take_type (GdaSqlParamSpec pspec, GVa lue value);
	void gda_sql_param_spec_take_descr (GdaSqlParamSpec pspec, GVa lue value);	void gda_sql_param_spec_take_descr (GdaSqlParamSpec pspec, GVa lue value);
	void gda_sql_param_spec_take_nullok(GdaSqlParamSpec pspec, GVa lue value);	void gda_sql_param_spec_take_nullok(GdaSqlParamSpec pspec, GVa lue value);

	void gda_sql_param_spec_free (GdaSqlParamSpec *pspec);	void gda_sql_param_spec_free (GdaSqlParamSpec *pspec);
	gchar gda_sql_param_spec_serialize (GdaSqlParamSpec pspec);	gchar gda_sql_param_spec_serialize (GdaSqlParamSpec pspec);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-select.h	gda-statement-struct-select.h

	skipping to change at line 28	skipping to change at line 28
	*/	*/

	#ifndef _GDA_STATEMENT_STRUCT_SELECT_H_	#ifndef _GDA_STATEMENT_STRUCT_SELECT_H_
	#define _GDA_STATEMENT_STRUCT_SELECT_H_	#define _GDA_STATEMENT_STRUCT_SELECT_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-parts.h>	#include <sql-parser/gda-statement-struct-parts.h>


		G_BEGIN_DECLS

	/*	/*
	* Structure definition	* Structure definition
	*/	*/
	struct _GdaSqlStatementSelect {	struct _GdaSqlStatementSelect {
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	gboolean distinct;	gboolean distinct;
	GdaSqlExpr *distinct_expr;	GdaSqlExpr *distinct_expr;

	GSList expr_list; / list of GdaSqlSelectField pointers */	GSList expr_list; / list of GdaSqlSelectField pointers */
	GdaSqlSelectFrom *from;	GdaSqlSelectFrom *from;

	skipping to change at line 71	skipping to change at line 73
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_select_take_distinct (GdaSqlStatement stmt, gboolea n distinct, GdaSqlExpr distinct_expr);	void gda_sql_statement_select_take_distinct (GdaSqlStatement stmt, gboolea n distinct, GdaSqlExpr distinct_expr);
	void gda_sql_statement_select_take_expr_list (GdaSqlStatement stmt, GSList expr_list);	void gda_sql_statement_select_take_expr_list (GdaSqlStatement stmt, GSList expr_list);
	void gda_sql_statement_select_take_from (GdaSqlStatement stmt, GdaSqlSelec tFrom from);	void gda_sql_statement_select_take_from (GdaSqlStatement stmt, GdaSqlSelec tFrom from);
	void gda_sql_statement_select_take_where_cond (GdaSqlStatement stmt, GdaSq lExpr expr);	void gda_sql_statement_select_take_where_cond (GdaSqlStatement stmt, GdaSq lExpr expr);
	void gda_sql_statement_select_take_group_by (GdaSqlStatement stmt, GSList group_by);	void gda_sql_statement_select_take_group_by (GdaSqlStatement stmt, GSList group_by);
	void gda_sql_statement_select_take_having_cond (GdaSqlStatement stmt, GdaS qlExpr expr);	void gda_sql_statement_select_take_having_cond (GdaSqlStatement stmt, GdaS qlExpr expr);
	void gda_sql_statement_select_take_order_by (GdaSqlStatement stmt, GSList order_by);	void gda_sql_statement_select_take_order_by (GdaSqlStatement stmt, GSList order_by);
	void gda_sql_statement_select_take_limits (GdaSqlStatement stmt, GdaSqlExp r count, GdaSqlExpr *offset);	void gda_sql_statement_select_take_limits (GdaSqlStatement stmt, GdaSqlExp r count, GdaSqlExpr *offset);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	5 lines changed or added

	gda-statement-struct-trans.h	gda-statement-struct-trans.h

	skipping to change at line 29	skipping to change at line 29

	#ifndef _GDA_STATEMENT_STRUCT_TRANS_H_	#ifndef _GDA_STATEMENT_STRUCT_TRANS_H_
	#define _GDA_STATEMENT_STRUCT_TRANS_H_	#define _GDA_STATEMENT_STRUCT_TRANS_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <libgda/gda-enums.h>	#include <libgda/gda-enums.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-parts.h>	#include <sql-parser/gda-statement-struct-parts.h>


		G_BEGIN_DECLS

	/*	/*
	* Structure definition	* Structure definition
	*/	*/
	struct _GdaSqlStatementTransaction {	struct _GdaSqlStatementTransaction {
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	GdaTransactionIsolation isolation_level;	GdaTransactionIsolation isolation_level;
	gchar trans_mode; / DEFERRED, IMMEDIATE, EXCLUSIV E, READ_WRITE, READ_ONLY */	gchar trans_mode; / DEFERRED, IMMEDIATE, EXCLUSIV E, READ_WRITE, READ_ONLY */
	gchar *trans_name;	gchar *trans_name;

	/* Padding for future expansion */	/* Padding for future expansion */

	skipping to change at line 61	skipping to change at line 63
	GdaSqlStatementContentsInfo *_gda_sql_statement_rollback_savepoint_get_info s (void);	GdaSqlStatementContentsInfo *_gda_sql_statement_rollback_savepoint_get_info s (void);
	GdaSqlStatementContentsInfo *_gda_sql_statement_delete_savepoint_get_infos (void);	GdaSqlStatementContentsInfo *_gda_sql_statement_delete_savepoint_get_infos (void);

	/*	/*
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_trans_take_mode (GdaSqlStatement stmt, GValue va lue);	void gda_sql_statement_trans_take_mode (GdaSqlStatement stmt, GValue va lue);
	void gda_sql_statement_trans_set_isol_level (GdaSqlStatement *stmt, GdaTr ansactionIsolation level);	void gda_sql_statement_trans_set_isol_level (GdaSqlStatement *stmt, GdaTr ansactionIsolation level);
	void gda_sql_statement_trans_take_name (GdaSqlStatement stmt, GValue va lue);	void gda_sql_statement_trans_take_name (GdaSqlStatement stmt, GValue va lue);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-unknown.h	gda-statement-struct-unknown.h

	skipping to change at line 28	skipping to change at line 28
	*/	*/

	#ifndef _GDA_STATEMENT_STRUCT_UNKNOWN_H_	#ifndef _GDA_STATEMENT_STRUCT_UNKNOWN_H_
	#define _GDA_STATEMENT_STRUCT_UNKNOWN_H_	#define _GDA_STATEMENT_STRUCT_UNKNOWN_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-parts.h>	#include <sql-parser/gda-statement-struct-parts.h>


		G_BEGIN_DECLS

	/*	/*
	* Structure definition	* Structure definition
	*/	*/
	struct _GdaSqlStatementUnknown {	struct _GdaSqlStatementUnknown {
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	GSList expressions; / list of GdaSqlExpr pointers */	GSList expressions; / list of GdaSqlExpr pointers */

	/* Padding for future expansion */	/* Padding for future expansion */
	gpointer _gda_reserved1;	gpointer _gda_reserved1;
	gpointer _gda_reserved2;	gpointer _gda_reserved2;

	skipping to change at line 50	skipping to change at line 52
	/*	/*
	* Common operations	* Common operations
	*/	*/
	GdaSqlStatementContentsInfo *_gda_sql_statement_unknown_get_infos (void);	GdaSqlStatementContentsInfo *_gda_sql_statement_unknown_get_infos (void);

	/*	/*
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_unknown_take_expressions (GdaSqlStatement stmt, GSL ist expressions);	void gda_sql_statement_unknown_take_expressions (GdaSqlStatement stmt, GSL ist expressions);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-update.h	gda-statement-struct-update.h

	skipping to change at line 29	skipping to change at line 29

	#ifndef _GDA_STATEMENT_STRUCT_UPDATE_H_	#ifndef _GDA_STATEMENT_STRUCT_UPDATE_H_
	#define _GDA_STATEMENT_STRUCT_UPDATE_H_	#define _GDA_STATEMENT_STRUCT_UPDATE_H_

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <sql-parser/gda-statement-struct-decl.h>	#include <sql-parser/gda-statement-struct-decl.h>
	#include <sql-parser/gda-statement-struct-select.h>	#include <sql-parser/gda-statement-struct-select.h>
	#include <sql-parser/gda-statement-struct-parts.h>	#include <sql-parser/gda-statement-struct-parts.h>


		G_BEGIN_DECLS

	/*	/*
	* Structure definition	* Structure definition
	*/	*/
	struct _GdaSqlStatementUpdate {	struct _GdaSqlStatementUpdate {
	GdaSqlAnyPart any;	GdaSqlAnyPart any;
	gchar on_conflict; / conflict resolution clause */	gchar on_conflict; / conflict resolution clause */
	GdaSqlTable *table;	GdaSqlTable *table;
	GSList fields_list; / list of GdaSqlField pointers */	GSList fields_list; / list of GdaSqlField pointers */
	GSList expr_list; / list of GdaSqlExpr pointers */	GSList expr_list; / list of GdaSqlExpr pointers */
	GdaSqlExpr *cond;	GdaSqlExpr *cond;

	skipping to change at line 58	skipping to change at line 60
	GdaSqlStatementContentsInfo *_gda_sql_statement_update_get_infos (void);	GdaSqlStatementContentsInfo *_gda_sql_statement_update_get_infos (void);

	/*	/*
	* Functions used by the parser	* Functions used by the parser
	*/	*/
	void gda_sql_statement_update_take_table_name (GdaSqlStatement stmt, GValu e value);	void gda_sql_statement_update_take_table_name (GdaSqlStatement stmt, GValu e value);
	void gda_sql_statement_update_take_on_conflict (GdaSqlStatement stmt, GVal ue value);	void gda_sql_statement_update_take_on_conflict (GdaSqlStatement stmt, GVal ue value);
	void gda_sql_statement_update_take_condition (GdaSqlStatement stmt, GdaSql Expr cond);	void gda_sql_statement_update_take_condition (GdaSqlStatement stmt, GdaSql Expr cond);
	void gda_sql_statement_update_take_set_value (GdaSqlStatement stmt, GValue fname, GdaSqlExpr *expr);	void gda_sql_statement_update_take_set_value (GdaSqlStatement stmt, GValue fname, GdaSqlExpr *expr);


		G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-statement-struct-util.h	gda-statement-struct-util.h

	skipping to change at line 26	skipping to change at line 26
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef _GDA_STATEMENT_STRUCT_UTIL_H	#ifndef _GDA_STATEMENT_STRUCT_UTIL_H
	#define _GDA_STATEMENT_STRUCT_UTIL_H	#define _GDA_STATEMENT_STRUCT_UTIL_H

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>


		G_BEGIN_DECLS

	/* utility functions */	/* utility functions */
	gchar _remove_quotes (gchar str);	gchar _remove_quotes (gchar str);

	gchar gda_sql_identifier_add_quotes (const gchar str);

	gchar _json_quote_string (const gchar str);	gchar _json_quote_string (const gchar str);


	gboolean _string_is_identifier (const gchar *str);	gboolean _string_is_identifier (const gchar *str);

	gboolean gda_sql_identifier_needs_quotes (const gchar *str);
	gboolean _split_identifier_string (gchar str, gchar remain, gchar *las t);	gboolean _split_identifier_string (gchar str, gchar remain, gchar *las t);


		#ifndef GDA_DISABLE_DEPRECATED
		gboolean gda_sql_identifier_needs_quotes (const gchar *str);
		gchar gda_sql_identifier_add_quotes (const gchar str);
	gchar gda_sql_identifier_remove_quotes (gchar str);	gchar gda_sql_identifier_remove_quotes (gchar str);

		#endif

	/* to be removed, only here for debug */	/* to be removed, only here for debug */
	gchar gda_sql_value_stringify (const GValue value);	gchar gda_sql_value_stringify (const GValue value);


		G_END_DECLS

	#endif	#endif

End of changes. 7 change blocks.
	4 lines changed or deleted	9 lines changed or added

	gda-util.h	gda-util.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 1998 - 2008 The GNOME Foundation.	* Copyright (C) 1998 - 2009 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*

	skipping to change at line 51	skipping to change at line 51

	/*	/*
	* SQL escaping	* SQL escaping
	*/	*/
	gchar gda_default_escape_string (const gchar string);	gchar gda_default_escape_string (const gchar string);
	gchar gda_default_unescape_string (const gchar string);	gchar gda_default_unescape_string (const gchar string);
	guint gda_identifier_hash (const gchar *id);	guint gda_identifier_hash (const gchar *id);
	gboolean gda_identifier_equal (const gchar id1, const gchar id2);	gboolean gda_identifier_equal (const gchar id1, const gchar id2);
	gchar *gda_completion_list_get (GdaConnection cnc, const gchar *sql, gint start, gint end);	gchar *gda_completion_list_get (GdaConnection cnc, const gchar *sql, gint start, gint end);
	gchar *gda_sql_identifier_split (const gchar id);	gchar *gda_sql_identifier_split (const gchar id);

		gchar gda_sql_identifier_quote (const gchar id, GdaConnection *cnc,
		GdaServerProvider *prov,
		gboolean meta_store_convention, gbool
		ean force_quotes);

	/*	/*
	* Param & model utilities	* Param & model utilities
	*/	*/
	gboolean gda_utility_check_data_model (GdaDataModel *model, gint nbcols , ...);	gboolean gda_utility_check_data_model (GdaDataModel *model, gint nbcols , ...);
	gboolean gda_utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlNodePtr parent,	gboolean gda_utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlNodePtr parent,
	const gint cols, gint nb_cols , const gint rows, gint nb_rows,	const gint cols, gint nb_cols , const gint rows, gint nb_rows,
	gboolean use_col_ids);	gboolean use_col_ids);
	const gchar gda_utility_data_model_find_column_description (GdaDataSelect model, const gchar *field_name);	const gchar gda_utility_data_model_find_column_description (GdaDataSelect model, const gchar *field_name);
	gboolean gda_utility_holder_load_attributes (GdaHolder holder, xmlNode Ptr node, GSList sources, GError **error);	gboolean gda_utility_holder_load_attributes (GdaHolder holder, xmlNode Ptr node, GSList sources, GError **error);

End of changes. 2 change blocks.
	1 lines changed or deleted	5 lines changed or added

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

	gda-data-access-wrapper.h	gda-data-access-wrapper.h

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_ACCESS_WRAPPER_H__	#ifndef __GDA_DATA_ACCESS_WRAPPER_H__
	#define __GDA_DATA_ACCESS_WRAPPER_H__	#define __GDA_DATA_ACCESS_WRAPPER_H__

	#include <libgda/gda-data-model.h>	#include <libgda/gda-data-model.h>

	#include <libxml/tree.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_DATA_ACCESS_WRAPPER (gda_data_access_wrapper_ge t_type())	#define GDA_TYPE_DATA_ACCESS_WRAPPER (gda_data_access_wrapper_ge t_type())
	#define GDA_DATA_ACCESS_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_DATA_ACCESS_WRAPPER, GdaDataAccessWrapper))	#define GDA_DATA_ACCESS_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_DATA_ACCESS_WRAPPER, GdaDataAccessWrapper))
	#define GDA_DATA_ACCESS_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (k lass, GDA_TYPE_DATA_ACCESS_WRAPPER, GdaDataAccessWrapperClass))	#define GDA_DATA_ACCESS_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (k lass, GDA_TYPE_DATA_ACCESS_WRAPPER, GdaDataAccessWrapperClass))
	#define GDA_IS_DATA_ACCESS_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_DATA_ACCESS_WRAPPER))	#define GDA_IS_DATA_ACCESS_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_DATA_ACCESS_WRAPPER))
	#define GDA_IS_DATA_ACCESS_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((k lass), GDA_TYPE_DATA_ACCESS_WRAPPER))	#define GDA_IS_DATA_ACCESS_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((k lass), GDA_TYPE_DATA_ACCESS_WRAPPER))

	typedef struct _GdaDataAccessWrapper GdaDataAccessWrapper;	typedef struct _GdaDataAccessWrapper GdaDataAccessWrapper;

End of changes. 1 change blocks.
	1 lines changed or deleted	0 lines changed or added

	gda-enum-types.h	gda-enum-types.h

	skipping to change at line 59	skipping to change at line 59
	/* enumerations from "gda-easy.h" */	/* enumerations from "gda-easy.h" */
	GType gda_easy_error_get_type (void);	GType gda_easy_error_get_type (void);
	#define GDA_TYPE_EASY_ERROR (gda_easy_error_get_type())	#define GDA_TYPE_EASY_ERROR (gda_easy_error_get_type())
	GType gda_easy_create_table_flag_get_type (void);	GType gda_easy_create_table_flag_get_type (void);
	#define GDA_TYPE_EASY_CREATE_TABLE_FLAG (gda_easy_create_table_flag_get_typ e())	#define GDA_TYPE_EASY_CREATE_TABLE_FLAG (gda_easy_create_table_flag_get_typ e())
	/* enumerations from "gda-enums.h" */	/* enumerations from "gda-enums.h" */
	GType gda_transaction_isolation_get_type (void);	GType gda_transaction_isolation_get_type (void);
	#define GDA_TYPE_TRANSACTION_ISOLATION (gda_transaction_isolation_get_type( ))	#define GDA_TYPE_TRANSACTION_ISOLATION (gda_transaction_isolation_get_type( ))
	GType gda_value_attribute_get_type (void);	GType gda_value_attribute_get_type (void);
	#define GDA_TYPE_VALUE_ATTRIBUTE (gda_value_attribute_get_type())	#define GDA_TYPE_VALUE_ATTRIBUTE (gda_value_attribute_get_type())

		GType gda_sql_identifier_style_get_type (void);
		#define GDA_TYPE_SQL_IDENTIFIER_STYLE (gda_sql_identifier_style_get_type())
	/* enumerations from "gda-holder.h" */	/* enumerations from "gda-holder.h" */
	GType gda_holder_error_get_type (void);	GType gda_holder_error_get_type (void);
	#define GDA_TYPE_HOLDER_ERROR (gda_holder_error_get_type())	#define GDA_TYPE_HOLDER_ERROR (gda_holder_error_get_type())
	/* enumerations from "gda-meta-store.h" */	/* enumerations from "gda-meta-store.h" */
	GType gda_meta_store_error_get_type (void);	GType gda_meta_store_error_get_type (void);
	#define GDA_TYPE_META_STORE_ERROR (gda_meta_store_error_get_type())	#define GDA_TYPE_META_STORE_ERROR (gda_meta_store_error_get_type())
	GType gda_meta_store_change_type_get_type (void);	GType gda_meta_store_change_type_get_type (void);
	#define GDA_TYPE_META_STORE_CHANGE_TYPE (gda_meta_store_change_type_get_typ e())	#define GDA_TYPE_META_STORE_CHANGE_TYPE (gda_meta_store_change_type_get_typ e())
	/* enumerations from "gda-meta-struct.h" */	/* enumerations from "gda-meta-struct.h" */
	GType gda_meta_struct_error_get_type (void);	GType gda_meta_struct_error_get_type (void);

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	gda-enums.h	gda-enums.h
	/* gda-enums.h	/* gda-enums.h
	*	*

	* Copyright (C) 2003 - 2006 Vivien Malerba	* Copyright (C) 2003 - 2009 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.

	skipping to change at line 48	skipping to change at line 48
	GDA_VALUE_ATTR_IS_DEFAULT = 1 << 2,	GDA_VALUE_ATTR_IS_DEFAULT = 1 << 2,
	GDA_VALUE_ATTR_CAN_BE_DEFAULT = 1 << 3,	GDA_VALUE_ATTR_CAN_BE_DEFAULT = 1 << 3,
	GDA_VALUE_ATTR_IS_UNCHANGED = 1 << 4,	GDA_VALUE_ATTR_IS_UNCHANGED = 1 << 4,
	GDA_VALUE_ATTR_ACTIONS_SHOWN = 1 << 5,	GDA_VALUE_ATTR_ACTIONS_SHOWN = 1 << 5,
	GDA_VALUE_ATTR_DATA_NON_VALID = 1 << 6,	GDA_VALUE_ATTR_DATA_NON_VALID = 1 << 6,
	GDA_VALUE_ATTR_HAS_VALUE_ORIG = 1 << 7,	GDA_VALUE_ATTR_HAS_VALUE_ORIG = 1 << 7,
	GDA_VALUE_ATTR_NO_MODIF = 1 << 8,	GDA_VALUE_ATTR_NO_MODIF = 1 << 8,
	GDA_VALUE_ATTR_UNUSED = 1 << 9	GDA_VALUE_ATTR_UNUSED = 1 << 9
	} GdaValueAttribute;	} GdaValueAttribute;


		/* how SQL identifiers are represented */
		typedef enum {
		GDA_SQL_IDENTIFIERS_LOWER_CASE = 1 << 0,
		GDA_SQL_IDENTIFIERS_UPPER_CASE = 1 << 1
		} GdaSqlIdentifierStyle;

	/* possible different keywords used when qualifying a table's column's extr a attributes */	/* possible different keywords used when qualifying a table's column's extr a attributes */
	#define GDA_EXTRA_AUTO_INCREMENT "AUTO_INCREMENT"	#define GDA_EXTRA_AUTO_INCREMENT "AUTO_INCREMENT"

	#endif	#endif

End of changes. 2 change blocks.
	1 lines changed or deleted	7 lines changed or added

	gda-meta-store.h	gda-meta-store.h

	skipping to change at line 111	skipping to change at line 111
	void (*_gda_reserved3) (void);	void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);	void (*_gda_reserved4) (void);
	};	};

	GType gda_meta_store_get_type (void) G_GNUC_CON ST;	GType gda_meta_store_get_type (void) G_GNUC_CON ST;
	GdaMetaStore gda_meta_store_new_with_file (const gchar fil e_name);	GdaMetaStore gda_meta_store_new_with_file (const gchar fil e_name);
	GdaMetaStore gda_meta_store_new (const gchar cnc _string);	GdaMetaStore gda_meta_store_new (const gchar cnc _string);
	gint gda_meta_store_get_version (GdaMetaStore *st ore);	gint gda_meta_store_get_version (GdaMetaStore *st ore);

	GdaConnection gda_meta_store_get_internal_connection (GdaMetaStore st ore);	GdaConnection gda_meta_store_get_internal_connection (GdaMetaStore st ore);

		gchar gda_meta_store_sql_identifier_quote (const gchar id, GdaConnection *cnc);
	GdaDataModel gda_meta_store_extract (GdaMetaStore st ore, const gchar select_sql, GError *error, ...);	GdaDataModel gda_meta_store_extract (GdaMetaStore st ore, const gchar select_sql, GError *error, ...);
	gboolean gda_meta_store_modify (GdaMetaStore st ore, const gchar table_name,	gboolean gda_meta_store_modify (GdaMetaStore st ore, const gchar table_name,
	GdaDataModel new _data, const gchar condition, GError **error, ...);	GdaDataModel new _data, const gchar condition, GError **error, ...);
	gboolean gda_meta_store_modify_with_context (GdaMetaStore st ore, GdaMetaContext context,	gboolean gda_meta_store_modify_with_context (GdaMetaStore st ore, GdaMetaContext context,
	GdaDataModel new _data, GError *error);	GdaDataModel new _data, GError *error);
	GdaDataModel gda_meta_store_create_modify_data_model (GdaMetaStore st ore, const gchar *table_name);	GdaDataModel gda_meta_store_create_modify_data_model (GdaMetaStore st ore, const gchar *table_name);


		void gda_meta_store_set_reserved_keywords_func(GdaMetaStore *s
		tore, GdaSqlReservedKeywordsFunc func);

	gboolean gda_meta_store_get_attribute_value (GdaMetaStore st ore, const gchar att_name,	gboolean gda_meta_store_get_attribute_value (GdaMetaStore st ore, const gchar att_name,
	gchar att_value , GError error);	gchar att_value , GError error);
	gboolean gda_meta_store_set_attribute_value (GdaMetaStore st ore, const gchar att_name,	gboolean gda_meta_store_set_attribute_value (GdaMetaStore st ore, const gchar att_name,
	const gchar att_ value, GError *error);	const gchar att_ value, GError *error);

	gboolean gda_meta_store_schema_add_custom_object (GdaMetaStore store, const gchar xml_description,	gboolean gda_meta_store_schema_add_custom_object (GdaMetaStore store, const gchar xml_description,
	GError **error );	GError **error );
	gboolean gda_meta_store_schema_remove_custom_object (GdaMetaStore store, const gchar obj_name, GError **error);	gboolean gda_meta_store_schema_remove_custom_object (GdaMetaStore store, const gchar obj_name, GError **error);

	GSList gda_meta_store_schema_get_all_tables (GdaMetaStore st ore);	GSList gda_meta_store_schema_get_all_tables (GdaMetaStore st ore);

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	gda-server-operation.h	gda-server-operation.h

	skipping to change at line 116	skipping to change at line 116
	void (*_gda_reserved4) (void);	void (*_gda_reserved4) (void);
	};	};

	GType gda_server_operation_get_type (vo id) G_GNUC_CONST;	GType gda_server_operation_get_type (vo id) G_GNUC_CONST;
	GdaServerOperation gda_server_operation_new (Gd aServerOperationType op_type, const gchar xml_file);	GdaServerOperation gda_server_operation_new (Gd aServerOperationType op_type, const gchar xml_file);
	GdaServerOperationType gda_server_operation_get_op_type (Gd aServerOperation *op);	GdaServerOperationType gda_server_operation_get_op_type (Gd aServerOperation *op);
	const gchar *gda_server_operation_op_type_to_string (Gd aServerOperationType type);	const gchar *gda_server_operation_op_type_to_string (Gd aServerOperationType type);
	GdaServerOperationNode gda_server_operation_get_node_info (Gd aServerOperation op, const gchar *path_format, ...);	GdaServerOperationNode gda_server_operation_get_node_info (Gd aServerOperation op, const gchar *path_format, ...);

	const GValue gda_server_operation_get_value_at (Gd aServerOperation op, const gchar *path_format, ...);	const GValue gda_server_operation_get_value_at (Gd aServerOperation op, const gchar *path_format, ...);

		gchar *gda_server_operation_get_sql_identifier_at (Gd
		aServerOperation *op,
		Gda
		Connection cnc, GdaServerProvider prov,
		con
		st gchar *path_format, ...);
	gboolean gda_server_operation_set_value_at (Gd aServerOperation op, const gchar value,	gboolean gda_server_operation_set_value_at (Gd aServerOperation op, const gchar value,
	GEr ror *error, const gchar path_format, ...);	GEr ror *error, const gchar path_format, ...);

	xmlNodePtr gda_server_operation_save_data_to_xml (Gd aServerOperation op, GError *error);	xmlNodePtr gda_server_operation_save_data_to_xml (Gd aServerOperation op, GError *error);
	gboolean gda_server_operation_load_data_from_xml (Gd aServerOperation *op,	gboolean gda_server_operation_load_data_from_xml (Gd aServerOperation *op,
	xml NodePtr node, GError **error);	xml NodePtr node, GError **error);

	gchar** gda_server_operation_get_root_nodes (Gd aServerOperation *op);	gchar** gda_server_operation_get_root_nodes (Gd aServerOperation *op);
	GdaServerOperationNodeType gda_server_operation_get_node_type (Gd aServerOperation op, const gchar path,	GdaServerOperationNodeType gda_server_operation_get_node_type (Gd aServerOperation op, const gchar path,
	Gda ServerOperationNodeStatus *status);	Gda ServerOperationNodeStatus *status);

End of changes. 1 change blocks.
	0 lines changed or deleted	6 lines changed or added