gda-attributes-manager.h		gda-attributes-manager.h
	/*		/* GDA common library
	* Copyright (C) 2008 - 2011 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2008 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_ATTRIBUTES_MANAGER_H__		#ifndef __GDA_ATTRIBUTES_MANAGER_H__
	#define __GDA_ATTRIBUTES_MANAGER_H__		#define __GDA_ATTRIBUTES_MANAGER_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* main struct */		/* main struct */
	skipping to change at line 47		skipping to change at line 50
	const gchar *att_n ame, const GValue *value);		const gchar *att_n ame, const GValue *value);
	void gda_attributes_manager_set_full (GdaAttributesMana ger *mgr, gpointer ptr,		void gda_attributes_manager_set_full (GdaAttributesMana ger *mgr, gpointer ptr,
	const gchar *att_n ame, const GValue *value, GDestroyNotify destroy);		const gchar *att_n ame, const GValue *value, GDestroyNotify destroy);
	const GValue *gda_attributes_manager_get (GdaAttributesMana ger *mgr, gpointer ptr, const gchar *att_name);		const GValue *gda_attributes_manager_get (GdaAttributesMana ger *mgr, gpointer ptr, const gchar *att_name);
	void gda_attributes_manager_copy (GdaAttributesMana ger *from_mgr, gpointer *from,		void gda_attributes_manager_copy (GdaAttributesMana ger *from_mgr, gpointer *from,
	GdaAttributesManag er *to_mgr, gpointer *to);		GdaAttributesManag er *to_mgr, gpointer *to);
	void gda_attributes_manager_clear (GdaAttributesMana ger *mgr, gpointer ptr);		void gda_attributes_manager_clear (GdaAttributesMana ger *mgr, gpointer ptr);
	void gda_attributes_manager_foreach (GdaAttributesMana ger *mgr, gpointer ptr,		void gda_attributes_manager_foreach (GdaAttributesMana ger *mgr, gpointer ptr,
	GdaAttributesManag erFunc func, gpointer data);		GdaAttributesManag erFunc func, gpointer data);
	/**
	* GDA_ATTRIBUTE_TREE_NODE_UNKNOWN_CHILDREN:
	* This attribute, if %TRUE specifies that a tree node may or may not have
	any children nodes (value has a G_TYPE_BOOLEAN type).
	*/
	#define GDA_ATTRIBUTE_TREE_NODE_UNKNOWN_CHILDREN "__gda_attr_tnuchild"
	/* possible predefined attribute names for gda_holder_get_attribute() or gd a_column_get_attribute() */		/* possible predefined attribute names for gda_holder_get_attribute() or gd a_column_get_attribute() */
	#define GDA_ATTRIBUTE_DESCRIPTION "__gda_attr_descr" /* G_TYPE_STRING */		#define GDA_ATTRIBUTE_DESCRIPTION "__gda_attr_descr" /* G_TYPE_STRING */
	#define GDA_ATTRIBUTE_NAME "__gda_attr_name" /* G_TYPE_STRING */		#define GDA_ATTRIBUTE_NAME "__gda_attr_name" /* G_TYPE_STRING */
	#define GDA_ATTRIBUTE_NUMERIC_PRECISION "__gda_attr_numeric_precision" /* G _TYPE_INT */		#define GDA_ATTRIBUTE_NUMERIC_PRECISION "__gda_attr_numeric_precision" /* G _TYPE_INT */
	#define GDA_ATTRIBUTE_NUMERIC_SCALE "__gda_attr_numeric_scale" /* G_TYPE_IN T */		#define GDA_ATTRIBUTE_NUMERIC_SCALE "__gda_attr_numeric_scale" /* G_TYPE_IN T */
	#define GDA_ATTRIBUTE_AUTO_INCREMENT "__gda_attr_autoinc" /* G_TYPE_BOOLEAN */		#define GDA_ATTRIBUTE_AUTO_INCREMENT "__gda_attr_autoinc" /* G_TYPE_BOOLEAN */
	#define GDA_ATTRIBUTE_IS_DEFAULT "__gda_attr_is_default" /* G_TYPE_BOOLEAN */		#define GDA_ATTRIBUTE_IS_DEFAULT "__gda_attr_is_default" /* G_TYPE_BOOLEAN */
	G_END_DECLS		G_END_DECLS
End of changes. 6 change blocks.
	19 lines changed or deleted		16 lines changed or added

	gda-batch.h		gda-batch.h
	/*		/* gda-batch.h
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
	* Copyright (C) 2000 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2007 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_BATCH_H_		#ifndef __GDA_BATCH_H_
	#define __GDA_BATCH_H_		#define __GDA_BATCH_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-statement.h>		#include <libgda/gda-statement.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	15 lines changed or deleted		14 lines changed or added

	gda-binreloc.h		gda-binreloc.h
	/*		/* GDA common library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2007 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2007 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_BINRELOC_H__		#ifndef __GDA_BINRELOC_H__
	#define __GDA_BINRELOC_H__		#define __GDA_BINRELOC_H__
	#include <glib.h>		#include <glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/*		/*
End of changes. 5 change blocks.
	16 lines changed or deleted		16 lines changed or added

	gda-blob-op.h		gda-blob-op.h
	/*		/* GDA Common Library
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Authors:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_BLOB_OP_H__		#ifndef __GDA_BLOB_OP_H__
	#define __GDA_BLOB_OP_H__		#define __GDA_BLOB_OP_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-value.h>		#include <libgda/gda-value.h>
End of changes. 5 change blocks.
	13 lines changed or deleted		16 lines changed or added

	gda-column.h		gda-column.h
	/*		/* GDA library
	* Copyright (C) 2005 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 1998 - 2009 The GNOME Foundation.
	* Copyright (C) 2005
	* Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		*
			* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_COLUMN_H__		#ifndef __GDA_COLUMN_H__
	#define __GDA_COLUMN_H__		#define __GDA_COLUMN_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-value.h>		#include <libgda/gda-value.h>
	#include <glib.h>		#include <glib.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	skipping to change at line 93		skipping to change at line 97
	void gda_column_set_default_value (GdaColumn *column, const GVa lue *default_value);		void gda_column_set_default_value (GdaColumn *column, const GVa lue *default_value);
	const GValue *gda_column_get_attribute (GdaColumn *column, const gch ar *attribute);		const GValue *gda_column_get_attribute (GdaColumn *column, const gch ar *attribute);
	void gda_column_set_attribute (GdaColumn *column, const gch ar *attribute, const GValue *value,		void gda_column_set_attribute (GdaColumn *column, const gch ar *attribute, const GValue *value,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	/**		/**
	* gda_column_set_attribute_static		* gda_column_set_attribute_static
	* @holder: a #GdaHolder		* @holder: a #GdaHolder
	* @attribute: attribute's name		* @attribute: attribute's name
	* @value: (allow-none): the value to set the attribute to, or %NULL		* @value: the value to set the attribute to, or %NULL
	*		*
	* This function is similar to gda_column_set_attribute() but for static st rings		* This function is similar to gda_column_set_attribute() but for static st rings
	*/		*/
	#define gda_column_set_attribute_static(holder,attribute,value) gda_column_ set_attribute((holder),(attribute),(value),NULL)		#define gda_column_set_attribute_static(holder,attribute,value) gda_column_ set_attribute((holder),(attribute),(value),NULL)
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	15 lines changed or deleted		20 lines changed or added

	gda-config.h		gda-config.h
	/*		/*
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2007 - 2011 The GNOME Foundation.
	* Copyright (C) 2000 - 2005 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
	* Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
	* Copyright (C) 2003 - 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2005 Andrew Hill <andru@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_CONFIG_H__		#ifndef __GDA_CONFIG_H__
	#define __GDA_CONFIG_H__		#define __GDA_CONFIG_H__
	#include "gda-decl.h"		#include "gda-decl.h"
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	17 lines changed or deleted		15 lines changed or added

	gda-connection-event.h		gda-connection-event.h
	/*		/*
	* Copyright (C) 2005 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 1998 - 2011 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_CONNECTION_EVENT_H__		#ifndef __GDA_CONNECTION_EVENT_H__
	#define __GDA_CONNECTION_EVENT_H__		#define __GDA_CONNECTION_EVENT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 42		skipping to change at line 47
	#define GDA_IS_CONNECTION_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klas s), GDA_TYPE_CONNECTION_EVENT))		#define GDA_IS_CONNECTION_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klas s), GDA_TYPE_CONNECTION_EVENT))
	struct _GdaConnectionEvent {		struct _GdaConnectionEvent {
	GObject object;		GObject object;
	GdaConnectionEventPrivate *priv;		GdaConnectionEventPrivate *priv;
	};		};
	struct _GdaConnectionEventClass {		struct _GdaConnectionEventClass {
	GObjectClass parent_class;		GObjectClass parent_class;
			/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	typedef enum {		typedef enum {
	GDA_CONNECTION_EVENT_NOTICE,		GDA_CONNECTION_EVENT_NOTICE,
	GDA_CONNECTION_EVENT_WARNING,		GDA_CONNECTION_EVENT_WARNING,
	skipping to change at line 84		skipping to change at line 90
	GDA_CONNECTION_EVENT_CODE_DUPLICATE_ALIAS,		GDA_CONNECTION_EVENT_CODE_DUPLICATE_ALIAS,
	GDA_CONNECTION_EVENT_CODE_DUPLICATE_OBJECT,		GDA_CONNECTION_EVENT_CODE_DUPLICATE_OBJECT,
	GDA_CONNECTION_EVENT_CODE_SYNTAX_ERROR,		GDA_CONNECTION_EVENT_CODE_SYNTAX_ERROR,
	GDA_CONNECTION_EVENT_CODE_UNKNOWN		GDA_CONNECTION_EVENT_CODE_UNKNOWN
	} GdaConnectionEventCode;		} GdaConnectionEventCode;
	#define GDA_SQLSTATE_NO_ERROR "00000"		#define GDA_SQLSTATE_NO_ERROR "00000"
	#define GDA_SQLSTATE_GENERAL_ERROR "HY000"		#define GDA_SQLSTATE_GENERAL_ERROR "HY000"
	GType gda_connection_event_get_type (void) G_GNUC_CONST;		GType gda_connection_event_get_type (void) G_GNUC_CONST;
	GdaConnectionEvent *gda_connection_event_new (GdaConnectionEventType ty pe);
	void gda_connection_event_set_event_type (GdaConnectionE vent *event, GdaConnectionEventType type);		void gda_connection_event_set_event_type (GdaConnectionE vent *event, GdaConnectionEventType type);
	GdaConnectionEventType gda_connection_event_get_event_type (GdaConnectionE vent *event);		GdaConnectionEventType gda_connection_event_get_event_type (GdaConnectionE vent *event);
	const gchar *gda_connection_event_get_description (GdaConnection Event *event);		const gchar *gda_connection_event_get_description (GdaConnection Event *event);
	void gda_connection_event_set_description (GdaConnection Event *event, const gchar *description);		void gda_connection_event_set_description (GdaConnection Event *event, const gchar *description);
	glong gda_connection_event_get_code (GdaConnectionEvent * event);		glong gda_connection_event_get_code (GdaConnectionEvent * event);
	void gda_connection_event_set_code (GdaConnectionEvent * event, glong code);		void gda_connection_event_set_code (GdaConnectionEvent * event, glong code);
	GdaConnectionEventCode gda_connection_event_get_gda_code (GdaConnectionEve nt *event);		GdaConnectionEventCode gda_connection_event_get_gda_code (GdaConnectionEve nt *event);
	void gda_connection_event_set_gda_code (GdaConnectionEve nt *event, GdaConnectionEventCode code);		void gda_connection_event_set_gda_code (GdaConnectionEve nt *event, GdaConnectionEventCode code);
End of changes. 7 change blocks.
	12 lines changed or deleted		18 lines changed or added

	gda-connection-private.h		gda-connection-private.h
	/*		/* GDA library
	* Copyright (C) 2006 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2006 - 2008 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_CONNECTION_PRIVATE_H_		#ifndef __GDA_CONNECTION_PRIVATE_H_
	#define __GDA_CONNECTION_PRIVATE_H_		#define __GDA_CONNECTION_PRIVATE_H_
	#include <libgda/gda-meta-store.h>		#include <libgda/gda-meta-store.h>
	#include <providers-support/gda-pstmt.h>		#include <providers-support/gda-pstmt.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-connection.h		gda-connection.h
	/*		/*
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 1998 - 2011 The GNOME Foundation.
	* Copyright (C) 2000 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Cleber Rodrigues <cleberrrjr@bol.com.br>
	* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
	* Copyright (C) 2003 Filip Van Raemdonck <mechanix@debian.org>
	* Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
	* Copyright (C) 2004 Jos
	* Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
	* Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2007 Leonardo Boshell <lb@kmc.com.co>
	* Copyright (C) 2010 David King <davidk@openismus.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		* Bas Driessen <bas.driessen@xobas.com>
			* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_CONNECTION_H__		#ifndef __GDA_CONNECTION_H__
	#define __GDA_CONNECTION_H__		#define __GDA_CONNECTION_H__
	#include "gda-decl.h"		#include "gda-decl.h"
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	#include <libgda/gda-connection-event.h>		#include <libgda/gda-connection-event.h>
	#include <libgda/gda-transaction-status.h>		#include <libgda/gda-transaction-status.h>
	#include <libgda/gda-statement.h>		#include <libgda/gda-statement.h>
	skipping to change at line 65		skipping to change at line 60
	GDA_CONNECTION_DSN_NOT_FOUND_ERROR,		GDA_CONNECTION_DSN_NOT_FOUND_ERROR,
	GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR,		GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR,
	GDA_CONNECTION_PROVIDER_ERROR,		GDA_CONNECTION_PROVIDER_ERROR,
	GDA_CONNECTION_NO_CNC_SPEC_ERROR,		GDA_CONNECTION_NO_CNC_SPEC_ERROR,
	GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR,		GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR,
	GDA_CONNECTION_OPEN_ERROR,		GDA_CONNECTION_OPEN_ERROR,
	GDA_CONNECTION_STATEMENT_TYPE_ERROR,		GDA_CONNECTION_STATEMENT_TYPE_ERROR,
	GDA_CONNECTION_CANT_LOCK_ERROR,		GDA_CONNECTION_CANT_LOCK_ERROR,
	GDA_CONNECTION_TASK_NOT_FOUND_ERROR,		GDA_CONNECTION_TASK_NOT_FOUND_ERROR,
	GDA_CONNECTION_UNSUPPORTED_THREADS_ERROR,		GDA_CONNECTION_UNSUPPORTED_THREADS_ERROR,
	GDA_CONNECTION_CLOSED_ERROR,		GDA_CONNECTION_CLOSED_ERROR
	GDA_CONNECTION_META_DATA_CONTEXT_ERROR
	} GdaConnectionError;		} GdaConnectionError;
	#define GDA_CONNECTION_NONEXIST_DSN_ERROR GDA_CONNECTION_DSN_NOT_FOUND_ERRO R		#define GDA_CONNECTION_NONEXIST_DSN_ERROR GDA_CONNECTION_DSN_NOT_FOUND_ERRO R
	struct _GdaConnection {		struct _GdaConnection {
	GObject object;		GObject object;
	GdaConnectionPrivate *priv;		GdaConnectionPrivate *priv;
	};		};
	struct _GdaConnectionClass {		struct _GdaConnectionClass {
	skipping to change at line 136		skipping to change at line 130
	*		*
	* Additional information about the GDA_CONNECTION_OPTIONS_THREAD_SAFE and GDA_CONNECTION_OPTIONS_THREAD_ISOLATED flags:		* Additional information about the GDA_CONNECTION_OPTIONS_THREAD_SAFE and GDA_CONNECTION_OPTIONS_THREAD_ISOLATED flags:
	* The GDA_CONNECTION_OPTIONS_THREAD_SAFE flag specifies that it has to be able to use the returned connection object from		* The GDA_CONNECTION_OPTIONS_THREAD_SAFE flag specifies that it has to be able to use the returned connection object from
	* several threads at once (locking is ensured by the #GdaConnection itself ). Depending on the database provider's		* several threads at once (locking is ensured by the #GdaConnection itself ). Depending on the database provider's
	* implementation and on the native libraries it uses, the "normal" connect ion object might not respect this requirement,		* implementation and on the native libraries it uses, the "normal" connect ion object might not respect this requirement,
	* and in this case a specific thread is started and used as the unique thr ead which will manipulate the actual connection,		* and in this case a specific thread is started and used as the unique thr ead which will manipulate the actual connection,
	* while a "wrapper connection" is actually returned and used by the caller (that wrapper connection passes method calls		* while a "wrapper connection" is actually returned and used by the caller (that wrapper connection passes method calls
	* from the calling thread to the actual connection's specific thread, and gets the results back).		* from the calling thread to the actual connection's specific thread, and gets the results back).
	*		*
	* The GDA_CONNECTION_OPTIONS_THREAD_ISOLATED forces using a specific threa d and a "wrapper connection" even if the		* The GDA_CONNECTION_OPTIONS_THREAD_ISOLATED forces using a specific threa d and a "wrapper connection" even if the
	* "normal" connection would itself be thread safe; this is useful for exam ple to be sure the asynchronous API can		* "normal" connection would itself be thread safe; this is usefull for exa mple to be sure the asynchronous API can
	* always be used (see gda_connection_async_statement_execute()).		* always be used (see gda_connection_async_statement_execute()).
	*		*
	* Having a specific thread and a "wrapper connection" definitely has an im pact on the performances (because it involves		* Having a specific thread and a "wrapper connection" definitely has an im pact on the performances (because it involves
	* messages passing between threads for every method call), so using the		* messages passing between threads for every method call), so using the
	* GDA_CONNECTION_OPTIONS_THREAD_SAFE or GDA_CONNECTION_OPTIONS_THREAD_ISOL ATED flags should be carefully considered.		* GDA_CONNECTION_OPTIONS_THREAD_SAFE or GDA_CONNECTION_OPTIONS_THREAD_ISOL ATED flags should be carefully considered.
	*		*
	* Note about the @GDA_CONNECTION_OPTIONS_AUTO_META_DATA flag:		* Note about the @GDA_CONNECTION_OPTIONS_AUTO_META_DATA flag:
	* <itemizedlist>		* <itemizedlist>
	* <listitem><para>Every time a DDL statement is successfully executed, th e associated mate data, if		* <listitem><para>Every time a DDL statement is successfully executed, th e associated mate data, if
	defined, will be updated, which has a impact on performances< /para></listitem>		defined, will be updated, which has a impact on performances< /para></listitem>
	skipping to change at line 208		skipping to change at line 202
	GDA_CONNECTION_FEATURE_USERS,		GDA_CONNECTION_FEATURE_USERS,
	GDA_CONNECTION_FEATURE_VIEWS,		GDA_CONNECTION_FEATURE_VIEWS,
	GDA_CONNECTION_FEATURE_XA_TRANSACTIONS,		GDA_CONNECTION_FEATURE_XA_TRANSACTIONS,
	GDA_CONNECTION_FEATURE_MULTI_THREADING,		GDA_CONNECTION_FEATURE_MULTI_THREADING,
	GDA_CONNECTION_FEATURE_LAST		GDA_CONNECTION_FEATURE_LAST
	} GdaConnectionFeature;		} GdaConnectionFeature;
	/**		/**
	* GdaConnectionSchema
	*
	* Deprecated: 4.2: This was a leftover from the pre 4.0 area
	*/
	typedef enum {
	GDA_CONNECTION_SCHEMA_AGGREGATES,
	GDA_CONNECTION_SCHEMA_DATABASES,
	GDA_CONNECTION_SCHEMA_FIELDS,
	GDA_CONNECTION_SCHEMA_INDEXES,
	GDA_CONNECTION_SCHEMA_LANGUAGES,
	GDA_CONNECTION_SCHEMA_NAMESPACES,
	GDA_CONNECTION_SCHEMA_PARENT_TABLES,
	GDA_CONNECTION_SCHEMA_PROCEDURES,
	GDA_CONNECTION_SCHEMA_SEQUENCES,
	GDA_CONNECTION_SCHEMA_TABLES,
	GDA_CONNECTION_SCHEMA_TRIGGERS,
	GDA_CONNECTION_SCHEMA_TYPES,
	GDA_CONNECTION_SCHEMA_USERS,
	GDA_CONNECTION_SCHEMA_VIEWS,
	GDA_CONNECTION_SCHEMA_CONSTRAINTS,
	GDA_CONNECTION_SCHEMA_TABLE_CONTENTS
	} GdaConnectionSchema;
	/**
	* GdaConnectionMetaType:		* GdaConnectionMetaType:
	* @GDA_CONNECTION_META_NAMESPACES: lists the <link linkend="GdaConnectionM etaTypeGDA_CONNECTION_META_NAMESPACES">namespaces</link> (or schemas for Po stgreSQL)		* @GDA_CONNECTION_META_NAMESPACES: lists the <link linkend="GdaConnectionM etaTypeGDA_CONNECTION_META_NAMESPACES">namespaces</link> (or schemas for Po stgreSQL)
	* @GDA_CONNECTION_META_TYPES: lists the <link linkend="GdaConnectionMetaTy peGDA_CONNECTION_META_TYPES">database types</link>		* @GDA_CONNECTION_META_TYPES: lists the <link linkend="GdaConnectionMetaTy peGDA_CONNECTION_META_TYPES">database types</link>
	* @GDA_CONNECTION_META_TABLES: lists the <link linkend="GdaConnectionMetaT ypeGDA_CONNECTION_META_TABLES">tables</link>		* @GDA_CONNECTION_META_TABLES: lists the <link linkend="GdaConnectionMetaT ypeGDA_CONNECTION_META_TABLES">tables</link>
	* @GDA_CONNECTION_META_VIEWS: lists the <link linkend="GdaConnectionMetaTy peGDA_CONNECTION_META_VIEWS">views</link>		* @GDA_CONNECTION_META_VIEWS: lists the <link linkend="GdaConnectionMetaTy peGDA_CONNECTION_META_VIEWS">views</link>
	* @GDA_CONNECTION_META_FIELDS: lists the <link linkend="GdaConnectionMetaT ypeGDA_CONNECTION_META_FIELDS">table's or view's fields</link>		* @GDA_CONNECTION_META_FIELDS: lists the <link linkend="GdaConnectionMetaT ypeGDA_CONNECTION_META_FIELDS">table's or view's fields</link>
	* @GDA_CONNECTION_META_INDEXES: lists the <link linkend="GdaConnectionMeta TypeGDA_CONNECTION_META_INDEXES">table's indexes</link>		* @GDA_CONNECTION_META_INDEXES: lists the <link linkend="GdaConnectionMeta TypeGDA_CONNECTION_META_INDEXES">table's indexes</link>
	*		*
	* Used with gda_connection_get_meta_store_data() to describe what meta dat a to extract from		* Used with gda_connection_get_meta_store_data() to describe what meta dat a to extract from
	* a connection's associated #GdaMetaStore.		* a connection's associated #GdaMetaStore.
End of changes. 8 change blocks.
	49 lines changed or deleted		20 lines changed or added

	gda-data-access-wrapper.h		gda-data-access-wrapper.h
	/*		/* GDA common library
	* Copyright (C) 2006 - 2011 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2006 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, 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>
	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())
	skipping to change at line 46		skipping to change at line 49
	struct _GdaDataAccessWrapper {		struct _GdaDataAccessWrapper {
	GObject object;		GObject object;
	GdaDataAccessWrapperPrivate *priv;		GdaDataAccessWrapperPrivate *priv;
	};		};
	struct _GdaDataAccessWrapperClass {		struct _GdaDataAccessWrapperClass {
	GObjectClass parent_class;		GObjectClass parent_class;
	/* Padding for future expansion */		/* Padding for future expansion */
	/*< private >*/
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	GType gda_data_access_wrapper_get_type (void) G_GNUC_CONST;		GType gda_data_access_wrapper_get_type (void) G_GNUC_CONST;
	GdaDataModel *gda_data_access_wrapper_new (GdaDataModel *model);		GdaDataModel *gda_data_access_wrapper_new (GdaDataModel *model);
	G_END_DECLS		G_END_DECLS
End of changes. 6 change blocks.
	13 lines changed or deleted		16 lines changed or added

	gda-data-comparator.h		gda-data-comparator.h
	/*		/* gda-data-comparator.h
	* Copyright (C) 2008 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2008 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_COMPARATOR_H_		#ifndef __GDA_DATA_COMPARATOR_H_
	#define __GDA_DATA_COMPARATOR_H_		#define __GDA_DATA_COMPARATOR_H_
	#include "gda-decl.h"		#include "gda-decl.h"
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-data-handler.h		gda-data-handler.h
	/*		/* gda-data-handler.h
	* Copyright (C) 2006 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2010 David King <davidk@openismus.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2006 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_HANDLER_H_		#ifndef __GDA_DATA_HANDLER_H_
	#define __GDA_DATA_HANDLER_H_		#define __GDA_DATA_HANDLER_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include "gda-decl.h"		#include "gda-decl.h"
	#include "gda-value.h"		#include "gda-value.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	14 lines changed or deleted		14 lines changed or added

	gda-data-model-array.h		gda-data-model-array.h
	/*		/* GDA common library
	* Copyright (C) 2001 Cleber Rodrigues <cleberrrjr@bol.com.br>		* Copyright (C) 1998 - 2009 The GNOME Foundation.
	* Copyright (C) 2001 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Vivien Malerba <malerba@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_ARRAY_H__		#ifndef __GDA_DATA_MODEL_ARRAY_H__
	#define __GDA_DATA_MODEL_ARRAY_H__		#define __GDA_DATA_MODEL_ARRAY_H__
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	#include <libgda/gda-row.h>		#include <libgda/gda-row.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 58		skipping to change at line 59
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	GType gda_data_model_array_get_type (void) G_GNUC_CON ST;		GType gda_data_model_array_get_type (void) G_GNUC_CON ST;
	GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...);		GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...);
	GdaDataModel *gda_data_model_array_new_with_g_types_v (gint cols, GTyp e *types);
	GdaDataModel *gda_data_model_array_new (gint cols);		GdaDataModel *gda_data_model_array_new (gint cols);
	GdaDataModelArray *gda_data_model_array_copy_model (GdaDataModel *sr c, GError **error);		GdaDataModelArray *gda_data_model_array_copy_model (GdaDataModel *sr c, GError **error);
	GdaRow *gda_data_model_array_get_row (GdaDataModelArra y *model, gint row, GError **error);		GdaRow *gda_data_model_array_get_row (GdaDataModelArra y *model, gint row, GError **error);
	void gda_data_model_array_set_n_columns (GdaDataModelArra y *model, gint cols);		void gda_data_model_array_set_n_columns (GdaDataModelArra y *model, gint cols);
	void gda_data_model_array_clear (GdaDataModelArra y *model);		void gda_data_model_array_clear (GdaDataModelArra y *model);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	16 lines changed or deleted		17 lines changed or added

	gda-data-model-bdb.h		gda-data-model-bdb.h
	/*		/* GDA common library
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_BDB_H__		#ifndef __GDA_DATA_MODEL_BDB_H__
	#define __GDA_DATA_MODEL_BDB_H__		#define __GDA_DATA_MODEL_BDB_H__
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define GDA_TYPE_DATA_MODEL_BDB (gda_data_model_bdb_get_type())		#define GDA_TYPE_DATA_MODEL_BDB (gda_data_model_bdb_get_type())
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-data-model-dir.h		gda-data-model-dir.h
	/*		/* GDA common library
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_DIR_H__		#ifndef __GDA_DATA_MODEL_DIR_H__
	#define __GDA_DATA_MODEL_DIR_H__		#define __GDA_DATA_MODEL_DIR_H__
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define GDA_TYPE_DATA_MODEL_DIR (gda_data_model_dir_get_type())		#define GDA_TYPE_DATA_MODEL_DIR (gda_data_model_dir_get_type())
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-data-model-extra.h		gda-data-model-extra.h
	/*		/* GDA common library
	* Copyright (C) 2001 Carlos Perell		* Copyright (C) 2006 - 2007 The GNOME Foundation.
	* Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 - 2008 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
	* Copyright (C) 2005 Cygwin Ports Maintainer <yselkowitz@users.sourceforge
	.net>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_EXTRA_H__		#ifndef __GDA_DATA_MODEL_EXTRA_H__
	#define __GDA_DATA_MODEL_EXTRA_H__		#define __GDA_DATA_MODEL_EXTRA_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	17 lines changed or deleted		16 lines changed or added

	gda-data-model-import.h		gda-data-model-import.h
	/*		/* GDA common library
	* Copyright (C) 2006 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2006 - 2010 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_IMPORT_H__		#ifndef __GDA_DATA_MODEL_IMPORT_H__
	#define __GDA_DATA_MODEL_IMPORT_H__		#define __GDA_DATA_MODEL_IMPORT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	#include <libgda/gda-set.h>		#include <libgda/gda-set.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-data-model-iter-extra.h		gda-data-model-iter-extra.h
	/*		/* gda-data-model-iter-extra.h
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2008 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2008 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_ITER_EXTRA_H_		#ifndef __GDA_DATA_MODEL_ITER_EXTRA_H_
	#define __GDA_DATA_MODEL_ITER_EXTRA_H_		#define __GDA_DATA_MODEL_ITER_EXTRA_H_
	#include "gda-data-model-iter.h"		#include "gda-data-model-iter.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	gboolean gda_data_model_iter_move_to_row_default (GdaDataModel *model, GdaD ataModelIter *iter, gint row);		gboolean gda_data_model_iter_move_to_row_default (GdaDataModel *model, GdaD ataModelIter *iter, gint row);
End of changes. 5 change blocks.
	16 lines changed or deleted		14 lines changed or added

	gda-data-model-iter.h		gda-data-model-iter.h
	/*		/* gda-data-model-iter.h
	* Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2005 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_ITER_H_		#ifndef __GDA_DATA_MODEL_ITER_H_
	#define __GDA_DATA_MODEL_ITER_H_		#define __GDA_DATA_MODEL_ITER_H_
	#include "gda-decl.h"		#include "gda-decl.h"
	#include "gda-set.h"		#include "gda-set.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 68		skipping to change at line 68
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	GType gda_data_model_iter_get_type (void) G_GNUC_CO NST;		GType gda_data_model_iter_get_type (void) G_GNUC_CO NST;
	const GValue *gda_data_model_iter_get_value_at (GdaDataModelIte r *iter, gint col);		const GValue *gda_data_model_iter_get_value_at (GdaDataModelIte r *iter, gint col);
	const GValue *gda_data_model_iter_get_value_at_e (GdaDataModelIte r *iter, gint col, GError **error);
	const GValue *gda_data_model_iter_get_value_for_field (GdaDataModelIte r *iter, const gchar *field_name);		const GValue *gda_data_model_iter_get_value_for_field (GdaDataModelIte r *iter, const gchar *field_name);
	gboolean gda_data_model_iter_set_value_at (GdaDataModelIte r *iter, gint col,		gboolean gda_data_model_iter_set_value_at (GdaDataModelIte r *iter, gint col,
	const GValue *va lue, GError **error);		const GValue *va lue, GError **error);
	gboolean gda_data_model_iter_move_to_row (GdaDataModelIte r *iter, gint row);		gboolean gda_data_model_iter_move_to_row (GdaDataModelIte r *iter, gint row);
	gboolean gda_data_model_iter_move_next (GdaDataModelIte r *iter);		gboolean gda_data_model_iter_move_next (GdaDataModelIte r *iter);
	gboolean gda_data_model_iter_move_prev (GdaDataModelIte r *iter);		gboolean gda_data_model_iter_move_prev (GdaDataModelIte r *iter);
	gint gda_data_model_iter_get_row (GdaDataModelIte r *iter);		gint gda_data_model_iter_get_row (GdaDataModelIte r *iter);
	void gda_data_model_iter_invalidate_contents (GdaDataModelIte r *iter);		void gda_data_model_iter_invalidate_contents (GdaDataModelIte r *iter);
End of changes. 6 change blocks.
	14 lines changed or deleted		14 lines changed or added

	gda-data-model-private.h		gda-data-model-private.h
	/*		/* GDA common library
	* Copyright (C) 2005 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 1998 - 2006 The GNOME Foundation.
	* Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc-desktop>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Vivien Malerba <malerba@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_PRIVATE_H__		#ifndef __GDA_DATA_MODEL_PRIVATE_H__
	#define __GDA_DATA_MODEL_PRIVATE_H__		#define __GDA_DATA_MODEL_PRIVATE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libxml/parser.h>		#include <libxml/parser.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	#include <libgda/gda-column.h>		#include <libgda/gda-column.h>
End of changes. 5 change blocks.
	13 lines changed or deleted		17 lines changed or added

	gda-data-model.h		gda-data-model.h
	/*		/* GDA common library
	* Copyright (C) 2001 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 1998 - 2008 The GNOME Foundation.
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
	* Copyright (C) 2003 Laurent Sansonetti <lrz@gnome.org>
	* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
	* Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2005
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Vivien Malerba <malerba@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_MODEL_H__		#ifndef __GDA_DATA_MODEL_H__
	#define __GDA_DATA_MODEL_H__		#define __GDA_DATA_MODEL_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libxml/parser.h>		#include <libxml/parser.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	#include <libgda/gda-column.h>		#include <libgda/gda-column.h>
	skipping to change at line 80		skipping to change at line 78
	typedef enum {		typedef enum {
	GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR,		GDA_DATA_MODEL_ROW_OUT_OF_RANGE_ERROR,
	GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,		GDA_DATA_MODEL_COLUMN_OUT_OF_RANGE_ERROR,
	GDA_DATA_MODEL_VALUES_LIST_ERROR,		GDA_DATA_MODEL_VALUES_LIST_ERROR,
	GDA_DATA_MODEL_VALUE_TYPE_ERROR,		GDA_DATA_MODEL_VALUE_TYPE_ERROR,
	GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,		GDA_DATA_MODEL_ROW_NOT_FOUND_ERROR,
	GDA_DATA_MODEL_ACCESS_ERROR,		GDA_DATA_MODEL_ACCESS_ERROR,
	GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,		GDA_DATA_MODEL_FEATURE_NON_SUPPORTED_ERROR,
	GDA_DATA_MODEL_FILE_EXIST_ERROR,		GDA_DATA_MODEL_FILE_EXIST_ERROR,
	GDA_DATA_MODEL_XML_FORMAT_ERROR,		GDA_DATA_MODEL_XML_FORMAT_ERROR
	GDA_DATA_MODEL_TRUNCATED_ERROR,
	GDA_DATA_MODEL_OTHER_ERROR
	} GdaDataModelError;		} GdaDataModelError;
	/* struct for the interface */		/* struct for the interface */
	struct _GdaDataModelIface {		struct _GdaDataModelIface {
	GTypeInterface g_iface;		GTypeInterface g_iface;
	/* virtual table */		/* virtual table */
	gint (* i_get_n_rows) (GdaDataModel *model);		gint (* i_get_n_rows) (GdaDataModel *model);
	gint (* i_get_n_columns) (GdaDataModel *model);		gint (* i_get_n_columns) (GdaDataModel *model);
	skipping to change at line 125		skipping to change at line 120
	void (* i_set_notify) (GdaDataModel *model, gb oolean do_notify_changes);		void (* i_set_notify) (GdaDataModel *model, gb oolean do_notify_changes);
	gboolean (* i_get_notify) (GdaDataModel *model);		gboolean (* i_get_notify) (GdaDataModel *model);
	void (* i_send_hint) (GdaDataModel *model, Gd aDataModelHint hint, const GValue *hint_value);		void (* i_send_hint) (GdaDataModel *model, Gd aDataModelHint hint, const GValue *hint_value);
	/* signals */		/* signals */
	void (* row_inserted) (GdaDataModel *model, gi nt row);		void (* row_inserted) (GdaDataModel *model, gi nt row);
	void (* row_updated) (GdaDataModel *model, gi nt row);		void (* row_updated) (GdaDataModel *model, gi nt row);
	void (* row_removed) (GdaDataModel *model, gi nt row);		void (* row_removed) (GdaDataModel *model, gi nt row);
	void (* changed) (GdaDataModel *model);		void (* changed) (GdaDataModel *model);
	void (* reset) (GdaDataModel *model);		void (* reset) (GdaDataModel *model);
	void (* access_changed) (GdaDataModel *model);
	/* getting more information about a data model */
	GError **(* i_get_exceptions) (GdaDataModel *model);
	};		};
	GType gda_data_model_get_type (void) G_GNUC_CON ST;		GType gda_data_model_get_type (void) G_GNUC_CON ST;
	GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *mo del);		GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *mo del);
	gint gda_data_model_get_n_rows (GdaDataModel *mo del);		gint gda_data_model_get_n_rows (GdaDataModel *mo del);
	gint gda_data_model_get_n_columns (GdaDataModel *mo del);		gint gda_data_model_get_n_columns (GdaDataModel *mo del);
	GdaColumn *gda_data_model_describe_column (GdaDataModel *mo del, gint col);		GdaColumn *gda_data_model_describe_column (GdaDataModel *mo del, gint col);
	skipping to change at line 163		skipping to change at line 154
	const GValue *val ue, GError **error);		const GValue *val ue, GError **error);
	gboolean gda_data_model_set_values (GdaDataModel *mo del, gint row,		gboolean gda_data_model_set_values (GdaDataModel *mo del, gint row,
	GList *values, GE rror **error);		GList *values, GE rror **error);
	gint gda_data_model_append_row (GdaDataModel *mo del, GError **error);		gint gda_data_model_append_row (GdaDataModel *mo del, GError **error);
	gint gda_data_model_append_values (GdaDataModel *mo del, const GList *values, GError **error);		gint gda_data_model_append_values (GdaDataModel *mo del, const GList *values, GError **error);
	gboolean gda_data_model_remove_row (GdaDataModel *mo del, gint row, GError **error);		gboolean gda_data_model_remove_row (GdaDataModel *mo del, gint row, GError **error);
	gint gda_data_model_get_row_from_values (GdaDataModel *mo del, GSList *values, gint *cols_index);		gint gda_data_model_get_row_from_values (GdaDataModel *mo del, GSList *values, gint *cols_index);
	void gda_data_model_send_hint (GdaDataModel *mo del, GdaDataModelHint hint, const GValue *hint_value);		void gda_data_model_send_hint (GdaDataModel *mo del, GdaDataModelHint hint, const GValue *hint_value);
	GError **gda_data_model_get_exceptions (GdaDataModel *mo
	del);
	/* contents saving and loading */		/* contents saving and loading */
	gchar *gda_data_model_export_to_string (GdaDataModel *mo del, GdaDataModelIOFormat format,		gchar *gda_data_model_export_to_string (GdaDataModel *mo del, GdaDataModelIOFormat format,
	const gint *cols, gint nb_cols,		const gint *cols, gint nb_cols,
	const gint *rows, gint nb_rows, GdaSet *options);		const gint *rows, gint nb_rows, GdaSet *options);
	gboolean gda_data_model_export_to_file (GdaDataModel *mo del, GdaDataModelIOFormat format,		gboolean gda_data_model_export_to_file (GdaDataModel *mo del, GdaDataModelIOFormat format,
	const gchar *file ,		const gchar *file ,
	const gint *cols, gint nb_cols,		const gint *cols, gint nb_cols,
	const gint *rows, gint nb_rows,		const gint *rows, gint nb_rows,
	GdaSet *options, GError **error);		GdaSet *options, GError **error);
End of changes. 8 change blocks.
	29 lines changed or deleted		18 lines changed or added

	gda-data-proxy.h		gda-data-proxy.h
	/*		/* gda-data-proxy.h
	* Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2005 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_PROXY_H_		#ifndef __GDA_DATA_PROXY_H_
	#define __GDA_DATA_PROXY_H_		#define __GDA_DATA_PROXY_H_
	#include "gda-decl.h"		#include "gda-decl.h"
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-value.h>		#include <libgda/gda-value.h>
	#include <libgda/gda-enums.h>		#include <libgda/gda-enums.h>
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-data-select-priv.h		gda-data-select-priv.h
	/*		/* GDA common library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2008 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_SELECT_PRIV_H__		#ifndef __GDA_DATA_SELECT_PRIV_H__
	#define __GDA_DATA_SELECT_PRIV_H__		#define __GDA_DATA_SELECT_PRIV_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-row.h>		#include <libgda/gda-row.h>
	#include <libgda/providers-support/gda-pstmt.h>		#include <libgda/providers-support/gda-pstmt.h>
	#include <sql-parser/gda-sql-statement.h>		#include <sql-parser/gda-sql-statement.h>
	#include <libgda/gda-data-select.h>		#include <libgda/gda-data-select.h>
	skipping to change at line 43		skipping to change at line 42
	G_BEGIN_DECLS		G_BEGIN_DECLS
	GType gda_data_select_get_type (void) G_GNUC_C ONST;		GType gda_data_select_get_type (void) G_GNUC_C ONST;
	/* API reserved to provider's implementations */		/* API reserved to provider's implementations */
	void gda_data_select_take_row (GdaDataSelect *model, GdaRow *row, gint rownum);		void gda_data_select_take_row (GdaDataSelect *model, GdaRow *row, gint rownum);
	GdaRow *gda_data_select_get_stored_row (GdaDataSelect *model, gint rownum);		GdaRow *gda_data_select_get_stored_row (GdaDataSelect *model, gint rownum);
	GdaConnection *gda_data_select_get_connection (GdaDataSelect *model);		GdaConnection *gda_data_select_get_connection (GdaDataSelect *model);
	void gda_data_select_set_columns (GdaDataSelect *model, GSList *columns);		void gda_data_select_set_columns (GdaDataSelect *model, GSList *columns);
	void gda_data_select_add_exception (GdaDataSelect
	*model, GError *error);
	/* internal API */		/* internal API */
	void _gda_data_select_share_private_data (GdaDataSelect *master, GdaDataSelect *slave);		void _gda_data_select_share_private_data (GdaDataSelect *master, GdaDataSelect *slave);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	19 lines changed or deleted		16 lines changed or added

	gda-data-select.h		gda-data-select.h
	/*		/* GDA common library
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2008 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_DATA_SELECT_H__		#ifndef __GDA_DATA_SELECT_H__
	#define __GDA_DATA_SELECT_H__		#define __GDA_DATA_SELECT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-row.h>		#include <libgda/gda-row.h>
	#include <providers-support/gda-pstmt.h>		#include <providers-support/gda-pstmt.h>
	#include <sql-parser/gda-sql-statement.h>		#include <sql-parser/gda-sql-statement.h>
	skipping to change at line 53		skipping to change at line 56
	typedef enum {		typedef enum {
	GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,		GDA_DATA_SELECT_MODIFICATION_STATEMENT_ERROR,
	GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,		GDA_DATA_SELECT_MISSING_MODIFICATION_STATEMENT_ERROR,
	GDA_DATA_SELECT_CONNECTION_ERROR,		GDA_DATA_SELECT_CONNECTION_ERROR,
	GDA_DATA_SELECT_ACCESS_ERROR,		GDA_DATA_SELECT_ACCESS_ERROR,
	GDA_DATA_SELECT_SQL_ERROR,		GDA_DATA_SELECT_SQL_ERROR,
	GDA_DATA_SELECT_SAFETY_LOCKED_ERROR		GDA_DATA_SELECT_SAFETY_LOCKED_ERROR
	} GdaDataSelectError;		} GdaDataSelectError;
	/**
	* GdaDataSelectConditionType:
	* @GDA_DATA_SELECT_COND_PK: only primary key fields are used
	* @GDA_DATA_SELECT_COND_ALL_COLUMNS: all the columns of the tables are use
	d
	*
	* Defines what criteria gda_data_select_compute_modification_statements_ex
	t() uses
	* to uniquely identify a single row in a table when creating modification
	statements.
	*/
	typedef enum {
	GDA_DATA_SELECT_COND_PK,
	GDA_DATA_SELECT_COND_ALL_COLUMNS
	} GdaDataSelectConditionType;
	struct _GdaDataSelect {		struct _GdaDataSelect {
	GObject object;		GObject object;
	GdaDataSelectPrivate *priv;		GdaDataSelectPrivate *priv;
	/* read only information */		/* read only information */
	GdaPStmt *prep_stmt; /* use the "prepared-stmt" property to set this */		GdaPStmt *prep_stmt; /* use the "prepared-stmt" property to set this */
	gint nb_stored_rows; /* number of GdaRow objects curren tly stored */		gint nb_stored_rows; /* number of GdaRow objects curren tly stored */
	gint advertized_nrows; /* set when the number of rows b ecomes known, -1 untill then */		gint advertized_nrows; /* set when the number of rows b ecomes known, -1 untill then */
	/* Padding for future expansion */		/* Padding for future expansion */
	skipping to change at line 123		skipping to change at line 113
	GType gda_data_select_get_type (void) G_GNUC_C ONST;		GType gda_data_select_get_type (void) G_GNUC_C ONST;
	gboolean gda_data_select_set_row_selection_condition (GdaDataSele ct *model, GdaSqlExpr *expr, GError **error);		gboolean gda_data_select_set_row_selection_condition (GdaDataSele ct *model, GdaSqlExpr *expr, GError **error);
	gboolean gda_data_select_set_row_selection_condition_sql (GdaDataSele ct *model, const gchar *sql_where, GError **error);		gboolean gda_data_select_set_row_selection_condition_sql (GdaDataSele ct *model, const gchar *sql_where, GError **error);
	gboolean gda_data_select_compute_row_selection_condition (GdaDataSele ct *model, GError **error);		gboolean gda_data_select_compute_row_selection_condition (GdaDataSele ct *model, GError **error);
	gboolean gda_data_select_set_modification_statement (GdaDataSele ct *model, GdaStatement *mod_stmt, GError **error);		gboolean gda_data_select_set_modification_statement (GdaDataSele ct *model, GdaStatement *mod_stmt, GError **error);
	gboolean gda_data_select_set_modification_statement_sql (GdaDataSele ct *model, const gchar *sql, GError **error);		gboolean gda_data_select_set_modification_statement_sql (GdaDataSele ct *model, const gchar *sql, GError **error);
	gboolean gda_data_select_compute_modification_statements (GdaDataSele ct *model, GError **error);		gboolean gda_data_select_compute_modification_statements (GdaDataSele ct *model, GError **error);
	gboolean gda_data_select_compute_modification_statements_ext (GdaData
	Select *model,
	GdaDataS
	electConditionType cond_type,
	GError *
	*error);
	gboolean gda_data_select_compute_columns_attributes (GdaDataSele ct *model, GError **error);		gboolean gda_data_select_compute_columns_attributes (GdaDataSele ct *model, GError **error);
	GdaConnection *gda_data_select_get_connection (GdaDataSele ct *model);		GdaConnection *gda_data_select_get_connection (GdaDataSele ct *model);
	gboolean gda_data_select_rerun (GdaDataSele ct *model, GError **error);		gboolean gda_data_select_rerun (GdaDataSele ct *model, GError **error);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 7 change blocks.
	34 lines changed or deleted		16 lines changed or added

	gda-debug-macros.h		gda-debug-macros.h
	/*		/*
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef _GDA_DEBUG_MACROS_H_		#ifndef _GDA_DEBUG_MACROS_H_
	#define _GDA_DEBUG_MACROS_H_		#define _GDA_DEBUG_MACROS_H_
	#include <glib.h>		#include <glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#define TO_IMPLEMENT g_print ("Implementation missing: %s() in %s line %d\n ", __FUNCTION__, __FILE__,__LINE__)		#define TO_IMPLEMENT g_print ("Implementation missing: %s() in %s line %d\n ", __FUNCTION__, __FILE__,__LINE__)
End of changes. 5 change blocks.
	11 lines changed or deleted		12 lines changed or added

	gda-decl.h		gda-decl.h
	/*		/* gda-decl.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2004 - 2006 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GLOBAL_DECL_H_		#ifndef __GLOBAL_DECL_H_
	#define __GLOBAL_DECL_H_		#define __GLOBAL_DECL_H_
	#include <glib.h>		#include <glib.h>
	#include <libgda/gda-debug-macros.h>		#include <libgda/gda-debug-macros.h>
	typedef struct _GdaConfig GdaConfig;		typedef struct _GdaConfig GdaConfig;
	typedef struct _GdaConfigClass GdaConfigClass;		typedef struct _GdaConfigClass GdaConfigClass;
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-enum-types.h		gda-enum-types.h
	#ifndef __LIBGDA_ENUM_TYPES_H__		#ifndef __LIBGDA_ENUM_TYPES_H__
	#define __LIBGDA_ENUM_TYPES_H__		#define __LIBGDA_ENUM_TYPES_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
			/* enumerations from "gda-batch.h" */
	GType gda_batch_error_get_type (void);		GType gda_batch_error_get_type (void);
	#define GDA_TYPE_BATCH_ERROR (gda_batch_error_get_type())		#define GDA_TYPE_BATCH_ERROR (gda_batch_error_get_type())
			/* enumerations from "gda-config.h" */
	GType gda_config_error_get_type (void);		GType gda_config_error_get_type (void);
	#define GDA_TYPE_CONFIG_ERROR (gda_config_error_get_type())		#define GDA_TYPE_CONFIG_ERROR (gda_config_error_get_type())
			/* enumerations from "gda-connection-event.h" */
	GType gda_connection_event_type_get_type (void);		GType gda_connection_event_type_get_type (void);
	#define GDA_TYPE_CONNECTION_EVENT_TYPE (gda_connection_event_type_get_type( ))		#define GDA_TYPE_CONNECTION_EVENT_TYPE (gda_connection_event_type_get_type( ))
	GType gda_connection_event_code_get_type (void);		GType gda_connection_event_code_get_type (void);
	#define GDA_TYPE_CONNECTION_EVENT_CODE (gda_connection_event_code_get_type( ))		#define GDA_TYPE_CONNECTION_EVENT_CODE (gda_connection_event_code_get_type( ))
			/* enumerations from "gda-connection.h" */
	GType gda_connection_error_get_type (void);		GType gda_connection_error_get_type (void);
	#define GDA_TYPE_CONNECTION_ERROR (gda_connection_error_get_type())		#define GDA_TYPE_CONNECTION_ERROR (gda_connection_error_get_type())
	GType gda_connection_options_get_type (void);		GType gda_connection_options_get_type (void);
	#define GDA_TYPE_CONNECTION_OPTIONS (gda_connection_options_get_type())		#define GDA_TYPE_CONNECTION_OPTIONS (gda_connection_options_get_type())
	GType gda_connection_feature_get_type (void);		GType gda_connection_feature_get_type (void);
	#define GDA_TYPE_CONNECTION_FEATURE (gda_connection_feature_get_type())		#define GDA_TYPE_CONNECTION_FEATURE (gda_connection_feature_get_type())
	GType gda_connection_schema_get_type (void);
	#define GDA_TYPE_CONNECTION_SCHEMA (gda_connection_schema_get_type())
	GType gda_connection_meta_type_get_type (void);		GType gda_connection_meta_type_get_type (void);
	#define GDA_TYPE_CONNECTION_META_TYPE (gda_connection_meta_type_get_type())		#define GDA_TYPE_CONNECTION_META_TYPE (gda_connection_meta_type_get_type())
			/* enumerations from "gda-data-comparator.h" */
	GType gda_data_comparator_error_get_type (void);		GType gda_data_comparator_error_get_type (void);
	#define GDA_TYPE_DATA_COMPARATOR_ERROR (gda_data_comparator_error_get_type( ))		#define GDA_TYPE_DATA_COMPARATOR_ERROR (gda_data_comparator_error_get_type( ))
	GType gda_diff_type_get_type (void);		GType gda_diff_type_get_type (void);
	#define GDA_TYPE_DIFF_TYPE (gda_diff_type_get_type())		#define GDA_TYPE_DIFF_TYPE (gda_diff_type_get_type())
			/* enumerations from "gda-data-model.h" */
	GType gda_data_model_access_flags_get_type (void);		GType gda_data_model_access_flags_get_type (void);
	#define GDA_TYPE_DATA_MODEL_ACCESS_FLAGS (gda_data_model_access_flags_get_t ype())		#define GDA_TYPE_DATA_MODEL_ACCESS_FLAGS (gda_data_model_access_flags_get_t ype())
	GType gda_data_model_hint_get_type (void);		GType gda_data_model_hint_get_type (void);
	#define GDA_TYPE_DATA_MODEL_HINT (gda_data_model_hint_get_type())		#define GDA_TYPE_DATA_MODEL_HINT (gda_data_model_hint_get_type())
	GType gda_data_model_io_format_get_type (void);		GType gda_data_model_io_format_get_type (void);
	#define GDA_TYPE_DATA_MODEL_IO_FORMAT (gda_data_model_io_format_get_type())		#define GDA_TYPE_DATA_MODEL_IO_FORMAT (gda_data_model_io_format_get_type())
	GType gda_data_model_error_get_type (void);		GType gda_data_model_error_get_type (void);
	#define GDA_TYPE_DATA_MODEL_ERROR (gda_data_model_error_get_type())		#define GDA_TYPE_DATA_MODEL_ERROR (gda_data_model_error_get_type())
	GType gda_ldap_search_scope_get_type (void);		/* enumerations from "gda-data-model-iter.h" */
	#define GDA_TYPE_LDAP_SEARCH_SCOPE (gda_ldap_search_scope_get_type())
	GType gda_data_model_iter_error_get_type (void);		GType gda_data_model_iter_error_get_type (void);
	#define GDA_TYPE_DATA_MODEL_ITER_ERROR (gda_data_model_iter_error_get_type( ))		#define GDA_TYPE_DATA_MODEL_ITER_ERROR (gda_data_model_iter_error_get_type( ))
			/* enumerations from "gda-data-proxy.h" */
	GType gda_data_proxy_error_get_type (void);		GType gda_data_proxy_error_get_type (void);
	#define GDA_TYPE_DATA_PROXY_ERROR (gda_data_proxy_error_get_type())		#define GDA_TYPE_DATA_PROXY_ERROR (gda_data_proxy_error_get_type())
			/* enumerations from "gda-data-select.h" */
	GType gda_data_select_error_get_type (void);		GType gda_data_select_error_get_type (void);
	#define GDA_TYPE_DATA_SELECT_ERROR (gda_data_select_error_get_type())		#define GDA_TYPE_DATA_SELECT_ERROR (gda_data_select_error_get_type())
	GType gda_data_select_condition_type_get_type (void);		/* enumerations from "gda-enums.h" */
	#define GDA_TYPE_DATA_SELECT_CONDITION_TYPE (gda_data_select_condition_type
	_get_type())
	GType gda_easy_error_get_type (void);
	#define GDA_TYPE_EASY_ERROR (gda_easy_error_get_type())
	GType gda_easy_create_table_flag_get_type (void);
	#define GDA_TYPE_EASY_CREATE_TABLE_FLAG (gda_easy_create_table_flag_get_typ
	e())
	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);		GType gda_sql_identifier_style_get_type (void);
	#define GDA_TYPE_SQL_IDENTIFIER_STYLE (gda_sql_identifier_style_get_type())		#define GDA_TYPE_SQL_IDENTIFIER_STYLE (gda_sql_identifier_style_get_type())
			/* 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" */
	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" */
	GType gda_meta_struct_error_get_type (void);		GType gda_meta_struct_error_get_type (void);
	#define GDA_TYPE_META_STRUCT_ERROR (gda_meta_struct_error_get_type())		#define GDA_TYPE_META_STRUCT_ERROR (gda_meta_struct_error_get_type())
	GType gda_meta_db_object_type_get_type (void);		GType gda_meta_db_object_type_get_type (void);
	#define GDA_TYPE_META_DB_OBJECT_TYPE (gda_meta_db_object_type_get_type())		#define GDA_TYPE_META_DB_OBJECT_TYPE (gda_meta_db_object_type_get_type())
	GType gda_meta_struct_feature_get_type (void);		GType gda_meta_struct_feature_get_type (void);
	#define GDA_TYPE_META_STRUCT_FEATURE (gda_meta_struct_feature_get_type())		#define GDA_TYPE_META_STRUCT_FEATURE (gda_meta_struct_feature_get_type())
	GType gda_meta_sort_type_get_type (void);		GType gda_meta_sort_type_get_type (void);
	#define GDA_TYPE_META_SORT_TYPE (gda_meta_sort_type_get_type())		#define GDA_TYPE_META_SORT_TYPE (gda_meta_sort_type_get_type())
	GType gda_meta_foreign_key_policy_get_type (void);		GType gda_meta_foreign_key_policy_get_type (void);
	#define GDA_TYPE_META_FOREIGN_KEY_POLICY (gda_meta_foreign_key_policy_get_t ype())		#define GDA_TYPE_META_FOREIGN_KEY_POLICY (gda_meta_foreign_key_policy_get_t ype())
	GType gda_meta_graph_info_get_type (void);		GType gda_meta_graph_info_get_type (void);
	#define GDA_TYPE_META_GRAPH_INFO (gda_meta_graph_info_get_type())		#define GDA_TYPE_META_GRAPH_INFO (gda_meta_graph_info_get_type())
			/* enumerations from "gda-set.h" */
	GType gda_set_error_get_type (void);		GType gda_set_error_get_type (void);
	#define GDA_TYPE_SET_ERROR (gda_set_error_get_type())		#define GDA_TYPE_SET_ERROR (gda_set_error_get_type())
			/* enumerations from "gda-server-operation.h" */
	GType gda_server_operation_type_get_type (void);		GType gda_server_operation_type_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_TYPE (gda_server_operation_type_get_type( ))		#define GDA_TYPE_SERVER_OPERATION_TYPE (gda_server_operation_type_get_type( ))
	GType gda_server_operation_error_get_type (void);		GType gda_server_operation_error_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_ERROR (gda_server_operation_error_get_typ e())		#define GDA_TYPE_SERVER_OPERATION_ERROR (gda_server_operation_error_get_typ e())
	GType gda_server_operation_create_table_flag_get_type (void);		GType gda_server_operation_create_table_flag_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_CREATE_TABLE_FLAG (gda_server_operation_c reate_table_flag_get_type())		#define GDA_TYPE_SERVER_OPERATION_CREATE_TABLE_FLAG (gda_server_operation_c reate_table_flag_get_type())
	GType gda_server_operation_node_type_get_type (void);		GType gda_server_operation_node_type_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_NODE_TYPE (gda_server_operation_node_type _get_type())		#define GDA_TYPE_SERVER_OPERATION_NODE_TYPE (gda_server_operation_node_type _get_type())
	GType gda_server_operation_node_status_get_type (void);		GType gda_server_operation_node_status_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_NODE_STATUS (gda_server_operation_node_st atus_get_type())		#define GDA_TYPE_SERVER_OPERATION_NODE_STATUS (gda_server_operation_node_st atus_get_type())
			/* enumerations from "gda-server-provider.h" */
	GType gda_server_provider_error_get_type (void);		GType gda_server_provider_error_get_type (void);
	#define GDA_TYPE_SERVER_PROVIDER_ERROR (gda_server_provider_error_get_type( ))		#define GDA_TYPE_SERVER_PROVIDER_ERROR (gda_server_provider_error_get_type( ))
			/* enumerations from "gda-statement.h" */
	GType gda_statement_error_get_type (void);		GType gda_statement_error_get_type (void);
	#define GDA_TYPE_STATEMENT_ERROR (gda_statement_error_get_type())		#define GDA_TYPE_STATEMENT_ERROR (gda_statement_error_get_type())
	GType gda_statement_model_usage_get_type (void);		GType gda_statement_model_usage_get_type (void);
	#define GDA_TYPE_STATEMENT_MODEL_USAGE (gda_statement_model_usage_get_type( ))		#define GDA_TYPE_STATEMENT_MODEL_USAGE (gda_statement_model_usage_get_type( ))
	GType gda_statement_sql_flag_get_type (void);		GType gda_statement_sql_flag_get_type (void);
	#define GDA_TYPE_STATEMENT_SQL_FLAG (gda_statement_sql_flag_get_type())		#define GDA_TYPE_STATEMENT_SQL_FLAG (gda_statement_sql_flag_get_type())
			/* enumerations from "gda-sql-builder.h" */
	GType gda_sql_builder_error_get_type (void);		GType gda_sql_builder_error_get_type (void);
	#define GDA_TYPE_SQL_BUILDER_ERROR (gda_sql_builder_error_get_type())		#define GDA_TYPE_SQL_BUILDER_ERROR (gda_sql_builder_error_get_type())
			/* enumerations from "gda-transaction-status.h" */
	GType gda_transaction_status_event_type_get_type (void);		GType gda_transaction_status_event_type_get_type (void);
	#define GDA_TYPE_TRANSACTION_STATUS_EVENT_TYPE (gda_transaction_status_even t_type_get_type())		#define GDA_TYPE_TRANSACTION_STATUS_EVENT_TYPE (gda_transaction_status_even t_type_get_type())
	GType gda_transaction_status_state_get_type (void);		GType gda_transaction_status_state_get_type (void);
	#define GDA_TYPE_TRANSACTION_STATUS_STATE (gda_transaction_status_state_get _type())		#define GDA_TYPE_TRANSACTION_STATUS_STATE (gda_transaction_status_state_get _type())
			/* enumerations from "gda-tree.h" */
	GType gda_tree_error_get_type (void);		GType gda_tree_error_get_type (void);
	#define GDA_TYPE_TREE_ERROR (gda_tree_error_get_type())		#define GDA_TYPE_TREE_ERROR (gda_tree_error_get_type())
			/* enumerations from "gda-tree-node.h" */
	GType gda_tree_node_error_get_type (void);		GType gda_tree_node_error_get_type (void);
	#define GDA_TYPE_TREE_NODE_ERROR (gda_tree_node_error_get_type())		#define GDA_TYPE_TREE_NODE_ERROR (gda_tree_node_error_get_type())
			/* enumerations from "gda-tree-manager.h" */
	GType gda_tree_manager_error_get_type (void);		GType gda_tree_manager_error_get_type (void);
	#define GDA_TYPE_TREE_MANAGER_ERROR (gda_tree_manager_error_get_type())		#define GDA_TYPE_TREE_MANAGER_ERROR (gda_tree_manager_error_get_type())
			/* enumerations from "gda-xa-transaction.h" */
	GType gda_xa_transaction_error_get_type (void);		GType gda_xa_transaction_error_get_type (void);
	#define GDA_TYPE_XA_TRANSACTION_ERROR (gda_xa_transaction_error_get_type())		#define GDA_TYPE_XA_TRANSACTION_ERROR (gda_xa_transaction_error_get_type())
	G_END_DECLS		G_END_DECLS
	#endif /* __LIBGDA_ENUM_TYPES_H__ */		#endif /* __LIBGDA_ENUM_TYPES_H__ */
End of changes. 24 change blocks.
	12 lines changed or deleted		23 lines changed or added

	gda-enums.h		gda-enums.h
	/*		/* gda-enums.h
	* Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_ENUMS__		#ifndef __GDA_ENUMS__
	#define __GDA_ENUMS__		#define __GDA_ENUMS__
	/* Isolation state of a transaction */		/* Isolation state of a transaction */
	typedef enum {		typedef enum {
	GDA_TRANSACTION_ISOLATION_UNKNOWN,		GDA_TRANSACTION_ISOLATION_UNKNOWN,
	GDA_TRANSACTION_ISOLATION_READ_COMMITTED,		GDA_TRANSACTION_ISOLATION_READ_COMMITTED,
	GDA_TRANSACTION_ISOLATION_READ_UNCOMMITTED,		GDA_TRANSACTION_ISOLATION_READ_UNCOMMITTED,
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-handler-bin.h		gda-handler-bin.h
	/*		/* gda-handler-bin.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2005 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HANDLER_BIN__		#ifndef __GDA_HANDLER_BIN__
	#define __GDA_HANDLER_BIN__		#define __GDA_HANDLER_BIN__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-handler.h>		#include <libgda/gda-data-handler.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	14 lines changed or deleted		14 lines changed or added

	gda-handler-boolean.h		gda-handler-boolean.h
	/*		/* gda-handler-boolean.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HANDLER_BOOLEAN__		#ifndef __GDA_HANDLER_BOOLEAN__
	#define __GDA_HANDLER_BOOLEAN__		#define __GDA_HANDLER_BOOLEAN__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-handler.h>		#include <libgda/gda-data-handler.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-handler-numerical.h		gda-handler-numerical.h
	/*		/* gda-handler-numerical.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HANDLER_NUMERICAL__		#ifndef __GDA_HANDLER_NUMERICAL__
	#define __GDA_HANDLER_NUMERICAL__		#define __GDA_HANDLER_NUMERICAL__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-handler.h>		#include <libgda/gda-data-handler.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-handler-string.h		gda-handler-string.h
	/*		/* gda-handler-string.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HANDLER_STRING__		#ifndef __GDA_HANDLER_STRING__
	#define __GDA_HANDLER_STRING__		#define __GDA_HANDLER_STRING__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-handler.h>		#include <libgda/gda-data-handler.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	14 lines changed or deleted		14 lines changed or added

	gda-handler-time.h		gda-handler-time.h
	/*		/* gda-handler-time.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HANDLER_TIME__		#ifndef __GDA_HANDLER_TIME__
	#define __GDA_HANDLER_TIME__		#define __GDA_HANDLER_TIME__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-handler.h>		#include <libgda/gda-data-handler.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 60		skipping to change at line 60
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	};		};
	GType gda_handler_time_get_type (void) G_GNUC_CONST;		GType gda_handler_time_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_time_new (void);		GdaDataHandler *gda_handler_time_new (void);
	GdaDataHandler *gda_handler_time_new_no_locale (void);		GdaDataHandler *gda_handler_time_new_no_locale (void);
	void gda_handler_time_set_sql_spec (GdaHandlerTime *dh, GDateDM Y first, GDateDMY sec,		void gda_handler_time_set_sql_spec (GdaHandlerTime *dh, GDateDM Y first, GDateDMY sec,
	GDateDMY third, gchar separa tor, gboolean twodigits_years);		GDateDMY third, gchar separa tor, gboolean twodigits_years);
	void gda_handler_time_set_str_spec (GdaHandlerTime *dh, GDateDM
	Y first, GDateDMY sec,
	GDateDMY third, gchar separa
	tor, gboolean twodigits_years);
	gchar *gda_handler_time_get_no_locale_str_from_value (GdaHandlerTi me *dh, const GValue *value);		gchar *gda_handler_time_get_no_locale_str_from_value (GdaHandlerTi me *dh, const GValue *value);
	gchar *gda_handler_time_get_format (GdaHandlerTime *dh, GType t ype);		gchar *gda_handler_time_get_format (GdaHandlerTime *dh, GType t ype);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	17 lines changed or deleted		15 lines changed or added

	gda-handler-type.h		gda-handler-type.h
	/*		/* gda-handler-type.h
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2005 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HANDLER_TYPE__		#ifndef __GDA_HANDLER_TYPE__
	#define __GDA_HANDLER_TYPE__		#define __GDA_HANDLER_TYPE__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-handler.h>		#include <libgda/gda-data-handler.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	13 lines changed or deleted		14 lines changed or added

	gda-holder.h		gda-holder.h
	/*		/* gda-holder.h
	* Copyright (C) 2008 Massimo Cora <maxcvs@email.it>
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2003 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_HOLDER_H_		#ifndef __GDA_HOLDER_H_
	#define __GDA_HOLDER_H_		#define __GDA_HOLDER_H_
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	#include "gda-value.h"		#include "gda-value.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 125		skipping to change at line 125
	gboolean gda_holder_take_value (GdaHolder *holder, GValue *value, GError **error);		gboolean gda_holder_take_value (GdaHolder *holder, GValue *value, GError **error);
	GValue *gda_holder_take_static_value (GdaHolder *holder, const GValue *value, gboolean *value_changed, GError **error);		GValue *gda_holder_take_static_value (GdaHolder *holder, const GValue *value, gboolean *value_changed, GError **error);
	gboolean gda_holder_set_value_str (GdaHolder *holder, GdaDataHandler *dh, const gchar *value, GError **error);		gboolean gda_holder_set_value_str (GdaHolder *holder, GdaDataHandler *dh, const gchar *value, GError **error);
	const GValue *gda_holder_get_default_value (GdaHolder *holder);		const GValue *gda_holder_get_default_value (GdaHolder *holder);
	void gda_holder_set_default_value (GdaHolder *holder, const GValue *value);		void gda_holder_set_default_value (GdaHolder *holder, const GValue *value);
	gboolean gda_holder_set_value_to_default (GdaHolder *holder);		gboolean gda_holder_set_value_to_default (GdaHolder *holder);
	gboolean gda_holder_value_is_default (GdaHolder *holder);		gboolean gda_holder_value_is_default (GdaHolder *holder);
	void gda_holder_force_invalid (GdaHolder *holder);		void gda_holder_force_invalid (GdaHolder *holder);
	void gda_holder_force_invalid_e (GdaHolder *holder, GError *error);
	gboolean gda_holder_is_valid (GdaHolder *holder);		gboolean gda_holder_is_valid (GdaHolder *holder);
	gboolean gda_holder_is_valid_e (GdaHolder *holder, GError **error);
	void gda_holder_set_not_null (GdaHolder *holder, gboolean not_null);		void gda_holder_set_not_null (GdaHolder *holder, gboolean not_null);
	gboolean gda_holder_get_not_null (GdaHolder *holder);		gboolean gda_holder_get_not_null (GdaHolder *holder);
	gboolean gda_holder_set_source_model (GdaHolder *holder, GdaDataModel *model,		gboolean gda_holder_set_source_model (GdaHolder *holder, GdaDataModel *model,
	gint col, GError ** error);		gint col, GError ** error);
	GdaDataModel *gda_holder_get_source_model (GdaHolder *holder, gint *col);		GdaDataModel *gda_holder_get_source_model (GdaHolder *holder, gint *col);
	gboolean gda_holder_set_bind (GdaHolder *holder, GdaHolder *bind_to, GError **error);		gboolean gda_holder_set_bind (GdaHolder *holder, GdaHolder *bind_to, GError **error);
	GdaHolder *gda_holder_get_bind (GdaHolder *holder) ;		GdaHolder *gda_holder_get_bind (GdaHolder *holder) ;
	const GValue *gda_holder_get_attribute (GdaHolder *holder, const gchar *attribute);		const GValue *gda_holder_get_attribute (GdaHolder *holder, const gchar *attribute);
	void gda_holder_set_attribute (GdaHolder *holder, const gchar *attribute, const GValue *value,		void gda_holder_set_attribute (GdaHolder *holder, const gchar *attribute, const GValue *value,
	GDestroyNotify dest roy);		GDestroyNotify dest roy);
	/**		/**
	* gda_holder_set_attribute_static		* gda_holder_set_attribute_static
	* @holder: a #GdaHolder		* @holder: a #GdaHolder
	* @attribute: attribute's name		* @attribute: attribute's name
	* @value: (allow-none): a #GValue, or %NULL		* @value: a #GValue, or %NULL
	*		*
	* This function is similar to gda_holder_set_attribute() but for static st rings		* This function is similar to gda_holder_set_attribute() but for static st rings
	*/		*/
	#define gda_holder_set_attribute_static(holder,attribute,value) gda_holder_ set_attribute((holder),(attribute),(value),NULL)		#define gda_holder_set_attribute_static(holder,attribute,value) gda_holder_ set_attribute((holder),(attribute),(value),NULL)
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 8 change blocks.
	16 lines changed or deleted		15 lines changed or added

	gda-lockable.h		gda-lockable.h
	/*		/* GDA common library
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2008 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_LOCKABLE_H__		#ifndef __GDA_LOCKABLE_H__
	#define __GDA_LOCKABLE_H__		#define __GDA_LOCKABLE_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define GDA_TYPE_LOCKABLE (gda_lockable_get_type())		#define GDA_TYPE_LOCKABLE (gda_lockable_get_type())
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-log.h		gda-log.h
	/*		/* GDA Common Library
	* Copyright (C) 2000 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 1998 - 2002 The GNOME Foundation.
	* Copyright (C) 2001 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_LOG_H__		#ifndef __GDA_LOG_H__
	#define __GDA_LOG_H__		#define __GDA_LOG_H__
	#include <glib.h>		#include <glib.h>
	#include <time.h>		#include <time.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	15 lines changed or deleted		13 lines changed or added

	gda-meta-column-types.h		gda-meta-column-types.h
	/*		/*
	* Copyright (C) 2009 Vivien Malerba <malerba@gnome-db.org>		* File generated by the tools/information-schema-types program from the
	*		* libgda/information_schema.xml file,
	* This library is free software; you can redistribute it and/or		* This file contains declaration of the expected data types when
	* modify it under the terms of the GNU Lesser General Public		* extracting meta data, it should be updated when the libgda/information_s
	* License as published by the Free Software Foundation; either		chema.xml file changes
	* version 2 of the License, or (at your option) any later version.		* DO NOT MODIFY
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
	* Boston, MA 02110-1301, USA.
	*/		*/
	/*		/*
	* TABLE: _attributes		* TABLE: _attributes
	*		*
	* Table to store (key,value) pairs (keys starting with '_' are reserved)		* Table to store (key,value) pairs (keys starting with '_' are reserved)
	*/		*/
	static GType _col_types_attributes[] = {		static GType _col_types_attributes[] = {
	G_TYPE_STRING /* column: att_name */		G_TYPE_STRING /* column: att_name */
	, G_TYPE_STRING /* column: att_value */		, G_TYPE_STRING /* column: att_value */
End of changes. 1 change blocks.
	16 lines changed or deleted		6 lines changed or added

	gda-meta-store.h		gda-meta-store.h
	/*		/* gda-meta-store.h
	* Copyright (C) 2008 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2008 - 2011 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2008 - 2011 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_META_STORE_H_		#ifndef __GDA_META_STORE_H_
	#define __GDA_META_STORE_H_		#define __GDA_META_STORE_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-enums.h>		#include <libgda/gda-enums.h>
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	skipping to change at line 114		skipping to change at line 114
	};		};
	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);		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, ...);
	GdaDataModel *gda_meta_store_extract_v (GdaMetaStore *st
	ore, const gchar *select_sql, GHashTable *vars,
	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_v (GdaMetaStore *st
	ore, const gchar *table_name,
	GdaDataModel *new
	_data, const gchar *condition,
	gint nvalues, con
	st gchar **value_names,
	const GValue **va
	lues, 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_identifiers_style (GdaMetaStore *st ore, GdaSqlIdentifierStyle style);		void gda_meta_store_set_identifiers_style (GdaMetaStore *st ore, GdaSqlIdentifierStyle style);
	void gda_meta_store_set_reserved_keywords_func(GdaMetaStore *s tore, GdaSqlReservedKeywordsFunc func);		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,
End of changes. 7 change blocks.
	24 lines changed or deleted		14 lines changed or added

	gda-meta-struct.h		gda-meta-struct.h
	/*		/* gda-meta-struct.h
	* Copyright (C) 2008 - 2011 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2008 - 2011 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_META_STRUCT_H_		#ifndef __GDA_META_STRUCT_H_
	#define __GDA_META_STRUCT_H_		#define __GDA_META_STRUCT_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	#include <libgda/gda-meta-store.h>		#include <libgda/gda-meta-store.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	#include <libgda/gda-attributes-manager.h>		#include <libgda/gda-attributes-manager.h>
	skipping to change at line 43		skipping to change at line 44
	#define GDA_META_STRUCT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_m eta_struct_get_type (), GdaMetaStructClass)		#define GDA_META_STRUCT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_m eta_struct_get_type (), GdaMetaStructClass)
	#define GDA_IS_META_STRUCT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_ meta_struct_get_type ())		#define GDA_IS_META_STRUCT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_ meta_struct_get_type ())
	/* error reporting */		/* error reporting */
	extern GQuark gda_meta_struct_error_quark (void);		extern GQuark gda_meta_struct_error_quark (void);
	#define GDA_META_STRUCT_ERROR gda_meta_struct_error_quark ()		#define GDA_META_STRUCT_ERROR gda_meta_struct_error_quark ()
	typedef enum {		typedef enum {
	GDA_META_STRUCT_UNKNOWN_OBJECT_ERROR,		GDA_META_STRUCT_UNKNOWN_OBJECT_ERROR,
	GDA_META_STRUCT_DUPLICATE_OBJECT_ERROR,		GDA_META_STRUCT_DUPLICATE_OBJECT_ERROR,
	GDA_META_STRUCT_INCOHERENCE_ERROR,		GDA_META_STRUCT_INCOHERENCE_ERROR
	GDA_META_STRUCT_XML_ERROR
	} GdaMetaStructError;		} GdaMetaStructError;
	/* struct for the object's data */		/* struct for the object's data */
	struct _GdaMetaStruct		struct _GdaMetaStruct
	{		{
	GObject object;		GObject object;
	GdaMetaStructPrivate *priv;		GdaMetaStructPrivate *priv;
	};		};
	/* struct for the object's class */		/* struct for the object's class */
	skipping to change at line 107		skipping to change at line 107
	*		*
	* 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;
	/**		/**
	* GdaMetaTable:		* GdaMetaTable:
	* @columns: (element-type Gda.MetaTableColumn): list of #GdaMetaTableColum n structures, one for each column in the table		* @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		* @pk_cols_array: index of the columns part of the primary key for the tab le (WARNING: columns numbering
	* here start at 0)		* here start at 0)
	* @pk_cols_nb: size of the @pk_cols_array array		* @pk_cols_nb: size of the @pk_cols_array array
	* @reverse_fk_list: (element-type Gda.MetaTableForeignKey): list of #GdaMe		* @reverse_fk_list: list of #GdaMetaTableForeignKey where the referenced t
	taTableForeignKey where the referenced table is this table		able is this table
	* @fk_list: (element-type Gda.MetaTableForeignKey): list of #GdaMetaTableF		* @fk_list: list of #GdaMetaTableForeignKey for this table
	oreignKey for this table
	*		*
	* This structure specifies a #GdaMetaDbObject to represent a table's speci fic attributes,		* This structure specifies a #GdaMetaDbObject to represent a table's speci fic attributes,
	* its contents must not be modified.		* its contents must not be modified.
	*
	* Note that in some cases, the columns cannot be determined for views, and
	in this case the
	* @columns will be %NULL (this can be the case for example with SQLite whe
	re a view
	* uses a function which is not natively provided by SQLite.
	*/		*/
	typedef struct {		typedef struct {
	/*< public >*/		/*< public >*/
	GSList *columns;		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 */
	skipping to change at line 175		skipping to change at line 171
	* GdaMetaDbObject:		* GdaMetaDbObject:
	* @extra: union for the actual object's contents, to be able to cast it us ing GDA_META_TABLE(), GDA_META_VIEW()		* @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)		* @obj_type: the type of object (table, view)
	* @outdated: set to %TRUE if the information in this #GdaMetaDbObject may be outdated because the #GdaMetaStore has been updated		* @outdated: set to %TRUE if the information in this #GdaMetaDbObject may be outdated because the #GdaMetaStore has been updated
	* @obj_catalog: the catalog the object is in		* @obj_catalog: the catalog the object is in
	* @obj_schema: the schema the object is in		* @obj_schema: the schema the object is in
	* @obj_name: the object's name		* @obj_name: the object's name
	* @obj_short_name: the shortest way to name the object		* @obj_short_name: the shortest way to name the object
	* @obj_full_name: the full name of the object (in the &lt;schema&gt;.&lt;n ameagt; notation		* @obj_full_name: the full name of the object (in the &lt;schema&gt;.&lt;n ameagt; notation
	* @obj_owner: object's owner		* @obj_owner: object's owner
	* @depend_list: (element-type Gda.MetaDbObject): list of #GdaMetaDbObject pointers on which this object depends (through foreign keys		* @depend_list: list of #GdaMetaDbObject pointers on which this object dep ends (through foreign keys
	* or tables used for views)		* or tables used for views)
	*		*
	* Struture to hold information about each database object (tables, views, ...),		* Struture to hold information about each database object (tables, views, ...),
	* its contents must not be modified.		* its contents must not be modified.
	*		*
	* Note: @obj_catalog, @obj_schema, @obj_name, @obj_short_name and @obj_ful l_name respect the		* Note: @obj_catalog, @obj_schema, @obj_name, @obj_short_name and @obj_ful l_name respect the
	* <link linkend="information_schema:sql_identifiers">SQL identifiers</link > convention used in		* <link linkend="information_schema:sql_identifiers">SQL identifiers</link > convention used in
	* #GdaMetaStore objects. Before using these SQL identifiers, you should ch eck the		* #GdaMetaStore objects. Before using these SQL identifiers, you should ch eck the
	* gda_sql_identifier_quote() to know if is it is necessary to surround by double quotes		* gda_sql_identifier_quote() to know if is it is necessary to surround by double quotes
	* before using in an SQL statement.		* before using in an SQL statement.
	skipping to change at line 249		skipping to change at line 245
	*/		*/
	#define GDA_META_VIEW(dbobj) (&((dbobj)->extra.meta_view))		#define GDA_META_VIEW(dbobj) (&((dbobj)->extra.meta_view))
	/**		/**
	* GdaMetaTableColumn:		* GdaMetaTableColumn:
	* @column_name: the column's name		* @column_name: the column's name
	* @column_type: the column's DBMS's type		* @column_type: the column's DBMS's type
	* @gtype: the detected column's #GType		* @gtype: the detected column's #GType
	* @pkey: tells if the column is part of a primary key		* @pkey: tells if the column is part of a primary key
	* @nullok: tells if the column can be %NULL		* @nullok: tells if the column can be %NULL
	* @default_value: (allow-none): the column's default value, represented as a valid SQL value (surrounded by simple quotes for strings, ...), or %NULL if column has no default value		* @default_value: the column's default value
	*		*
	* This structure represents a table of view's column, its contents must no t be modified.		* This structure represents a table of view's column, its contents must no t be modified.
	*/		*/
	typedef struct {		typedef struct {
	/*< public >*/		/*< 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;
	skipping to change at line 287		skipping to change at line 283
	*/		*/
	#define GDA_META_TABLE_COLUMN(col) ((GdaMetaTableColumn*)(col))		#define GDA_META_TABLE_COLUMN(col) ((GdaMetaTableColumn*)(col))
	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);
	/**		/**
	* gda_meta_table_column_set_attribute_static		* gda_meta_table_column_set_attribute_static
	* @column: a #GdaMetaTableColumn		* @column: a #GdaMetaTableColumn
	* @attribute: attribute's name		* @attribute: attribute's name
	* @value: (allow-none): 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);
	/**		/**
	* GdaMetaForeignKeyPolicy:		* GdaMetaForeignKeyPolicy:
	* @GDA_META_FOREIGN_KEY_UNKNOWN: unspecified policy		* @GDA_META_FOREIGN_KEY_UNKNOWN: unspecified policy
	skipping to change at line 344		skipping to change at line 340
	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 >*/		/*< private >*/
	gpointer on_update_policy; /* pointer containing the GdaMet aForeignKeyPolicy integer		GdaMetaForeignKeyPolicy on_update_policy; /* pointer containing the GdaMetaForeignKeyPolicy integer
	* to keep ABI from 4.0, use GIN T_TO_POINTER and		* to keep ABI from 4.0, use GIN T_TO_POINTER and
	* GPOINTER_TO_INT */		* GPOINTER_TO_INT */
	gpointer on_delete_policy; /* pointer containing the GdaMet aForeignKeyPolicy integer		GdaMetaForeignKeyPolicy on_delete_policy; /* pointer containing the GdaMetaForeignKeyPolicy integer
	* to keep ABI from 4.0, use GIN T_TO_POINTER and		* to keep ABI from 4.0, use GIN T_TO_POINTER and
	* GPOINTER_TO_INT */		* GPOINTER_TO_INT */
	gpointer declared; /* pointer to a boolean to keep ABI from 4.0.		gboolean declared; /* pointer to a boolean to keep ABI from 4.0.
	* Any non NULL if FK has been declared in meta data */		* Any non NULL if FK has been declared in meta data */
	/*< public >*/		/*< public >*/
	gchar *fk_name;		gchar *fk_name;
			/*< private >*/
			/* Padding for future expansion */
			gpointer _gda_reserved1;
			gpointer _gda_reserved2;
			gpointer _gda_reserved3;
			gpointer _gda_reserved4;
	} GdaMetaTableForeignKey;		} GdaMetaTableForeignKey;
	/**		/**
	* GDA_META_TABLE_FOREIGN_KEY		* GDA_META_TABLE_FOREIGN_KEY
	* @fk: a pointer		* @fk: a pointer
	*		*
	* Casts @fk to a #GdaMetaTableForeignKey (no check is actuelly being done on @fk's validity)		* Casts @fk to a #GdaMetaTableForeignKey (no check is actuelly being done on @fk's validity)
	*		*
	* Returns: @col, casted to a #GdaMetaTableForeignKey		* Returns: @col, casted to a #GdaMetaTableForeignKey
	*/		*/
	#define GDA_META_TABLE_FOREIGN_KEY(fk) ((GdaMetaTableForeignKey*)(fk))		#define GDA_META_TABLE_FOREIGN_KEY(fk) ((GdaMetaTableForeignKey*)(fk))
	/**		/**
	* GDA_META_TABLE_FOREIGN_KEY_ON_UPDATE_POLICY:		* GDA_META_TABLE_FOREIGN_KEY_ON_UPDATE_POLICY:
	* @fk: a pointer to a #GdaMetaTableForeignKey		* @fk: a pointer to a #GdaMetaTableForeignKey
	*		*
	* Tells the actual policy implemented by @fk when used in the context of a n UPDATE.		* Tells the actual policy implemented by @fk when used in the context of a n UPDATE.
	*		*
	* Returns: the policy as a #GdaMetaForeignKeyPolicy		* Returns: the policy as a #GdaMetaForeignKeyPolicy
	*/		*/
	#define GDA_META_TABLE_FOREIGN_KEY_ON_UPDATE_POLICY(fk) ((GdaMetaForeignKey Policy) GPOINTER_TO_INT ((GdaMetaTableForeignKey*)(fk)->on_update_policy))		#define GDA_META_TABLE_FOREIGN_KEY_ON_UPDATE_POLICY(fk) (((GdaMetaTableFore ignKey*)(fk))->on_update_policy)
	/**		/**
	* GDA_META_TABLE_FOREIGN_KEY_ON_DELETE_POLICY:		* GDA_META_TABLE_FOREIGN_KEY_ON_DELETE_POLICY:
	* @fk: a pointer to a #GdaMetaTableForeignKey		* @fk: a pointer to a #GdaMetaTableForeignKey
	*		*
	* Tells the actual policy implemented by @fk when used in the context of a DELETE.		* Tells the actual policy implemented by @fk when used in the context of a DELETE.
	*		*
	* Returns: the policy as a #GdaMetaForeignKeyPolicy		* Returns: the policy as a #GdaMetaForeignKeyPolicy
	*/		*/
	#define GDA_META_TABLE_FOREIGN_KEY_ON_DELETE_POLICY(fk) ((GdaMetaForeignKey Policy) GPOINTER_TO_INT ((GdaMetaTableForeignKey*)(fk)->on_delete_policy))		#define GDA_META_TABLE_FOREIGN_KEY_ON_DELETE_POLICY(fk) (((GdaMetaTableFore ignKey*)(fk))->on_delete_policy)
	/**		/**
	* GDA_META_TABLE_FOREIGN_KEY_IS_DECLARED		* GDA_META_TABLE_FOREIGN_KEY_IS_DECLARED
	* @fk: a pointer to a #GdaMetaTableForeignKey		* @fk: a pointer to a #GdaMetaTableForeignKey
	*		*
	* Tells if @fk is an actual foreign key defined in the database's schema, or if it is an indication which		* Tells if @fk is an actual foreign key defined in the database's schema, or if it is an indication which
	* has been added to help Libgda understand the database schema.		* has been added to help Libgda understand the database schema.
	*		*
	* Returns: %TRUE if @fk has been declared in the database's meta data and %FALSE if @fk is an actual foreign key defined in the database's schema		* Returns: %TRUE if @fk has been declared in the database's meta data and %FALSE if @fk is an actual foreign key defined in the database's schema
	*/		*/
	#define GDA_META_TABLE_FOREIGN_KEY_IS_DECLARED(fk) ((((GdaMetaTableForeignK ey*)(fk))->declared) ? TRUE : FALSE)		#define GDA_META_TABLE_FOREIGN_KEY_IS_DECLARED(fk) (((GdaMetaTableForeignKe y*)(fk))->declared)
	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);
	GdaMetaDbObject *gda_meta_struct_complement (GdaMetaStruct *mstr uct, GdaMetaDbObjectType type,		GdaMetaDbObject *gda_meta_struct_complement (GdaMetaStruct *mstr uct, GdaMetaDbObjectType type,
	const GValue *catalo g, const GValue *schema, const GValue *name,		const GValue *catalo g, const GValue *schema, const GValue *name,
	GError **error);		GError **error);
	gboolean gda_meta_struct_complement_schema (GdaMetaStruct *mstr uct,		gboolean gda_meta_struct_complement_schema (GdaMetaStruct *mstr uct,
	const GValue *catalo g, const GValue *schema, GError **error);		const GValue *catalo g, const GValue *schema, GError **error);
	gboolean gda_meta_struct_complement_default (GdaMetaStruct *mstr uct, GError **error);		gboolean gda_meta_struct_complement_default (GdaMetaStruct *mstr uct, GError **error);
	gboolean gda_meta_struct_complement_all (GdaMetaStruct *mstr uct, GError **error);		gboolean gda_meta_struct_complement_all (GdaMetaStruct *mstr uct, GError **error);
End of changes. 19 change blocks.
	34 lines changed or deleted		35 lines changed or added

	gda-mutex.h		gda-mutex.h
	/*		/* GDA library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2008 - 2011 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_MUTEX_H__		#ifndef __GDA_MUTEX_H__
	#define __GDA_MUTEX_H__		#define __GDA_MUTEX_H__
	#include <glib.h>		#include <glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _GdaMutex GdaMutex;		typedef struct _GdaMutex GdaMutex;
End of changes. 5 change blocks.
	16 lines changed or deleted		16 lines changed or added

	gda-pstmt.h		gda-pstmt.h
	/*		/* GDA common library
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2008 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_PSTMT_H__		#ifndef __GDA_PSTMT_H__
	#define __GDA_PSTMT_H__		#define __GDA_PSTMT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-statement.h>		#include <libgda/gda-statement.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define GDA_TYPE_PSTMT (gda_pstmt_get_type())		#define GDA_TYPE_PSTMT (gda_pstmt_get_type())
	#define GDA_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYP E_PSTMT, GdaPStmt))		#define GDA_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYP E_PSTMT, GdaPStmt))
	#define GDA_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE _PSTMT, GdaPStmtClass))		#define GDA_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE _PSTMT, GdaPStmtClass))
	#define GDA_IS_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE _PSTMT))		#define GDA_IS_PSTMT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE _PSTMT))
	#define GDA_IS_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYP E_PSTMT))		#define GDA_IS_PSTMT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYP E_PSTMT))
	typedef struct _GdaPStmt GdaPStmt;		typedef struct _GdaPStmt GdaPStmt;
	typedef struct _GdaPStmtPrivate GdaPStmtPrivate;		typedef struct _GdaPStmtPrivate GdaPStmtPrivate;
	typedef struct _GdaPStmtClass GdaPStmtClass;		typedef struct _GdaPStmtClass GdaPStmtClass;
	/**
	* GdaPStmt:
	* @sql: actual SQL code used for this prepared statement, mem freed by Gda
	PStmt
	* @param_ids: (element-type string): list of parameters' IDs (as gchar *),
	mem freed by GdaPStmt
	* @ncols: number of types in array
	* @types: (array length=ncols) (element-type GLib.Type): array of ncols ty
	pes
	* @tmpl_columns: (element-type Gda.Colum): list of #GdaColumn objects whic
	h data models created from this prep. statement can copy
	*
	*/
	struct _GdaPStmt {		struct _GdaPStmt {
	GObject object;		GObject object;
	GdaPStmtPrivate *priv;		GdaPStmtPrivate *priv;
	gchar *sql; /* actual SQL code used for this prepared stateme nt, mem freed by GdaPStmt */		gchar *sql; /* actual SQL code used for this prepared stateme nt, mem freed by GdaPStmt */
	GSList *param_ids; /* list of parameters' IDs (as gchar *), m em freed by GdaPStmt */		GSList *param_ids; /* list of parameters' IDs (as gchar *), m em freed by GdaPStmt */
	/* meta data */		/* meta data */
	gint ncols;		gint ncols;
	GType *types; /* array of ncols types */		GType *types; /* array of ncols types */
	GSList *tmpl_columns; /* list of #GdaColumn objects which data models created from this prep. statement		GSList *tmpl_columns; /* list of #GdaColumn objects which data models created from this prep. statement
	* can copy */		* can copy */
	/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
	};		};
	struct _GdaPStmtClass {		struct _GdaPStmtClass {
	GObjectClass parent_class;		GObjectClass parent_class;
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
End of changes. 7 change blocks.
	26 lines changed or deleted		16 lines changed or added

	gda-quark-list.h		gda-quark-list.h
	/*		/* GDA Common Library
	* Copyright (C) 2001 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 1998 - 2006 The GNOME Foundation.
	* Copyright (C) 2001 - 2007 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
	* Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Authors:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Vivien Malerba <malerba@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_QUARK_LIST_H__		#ifndef __GDA_QUARK_LIST_H__
	#define __GDA_QUARK_LIST_H__		#define __GDA_QUARK_LIST_H__
	#include <glib.h>		#include <glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	16 lines changed or deleted		17 lines changed or added

	gda-repetitive-statement.h		gda-repetitive-statement.h
	/*		/* GDA library
	* Copyright (C) 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) Daniel Espinosa Ortiz 2008 <esodan@gmail.com>
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef _GDA_REPETITIVE_STATEMENT_H_		#ifndef _GDA_REPETITIVE_STATEMENT_H_
	#define _GDA_REPETITIVE_STATEMENT_H_		#define _GDA_REPETITIVE_STATEMENT_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		14 lines changed or added

	gda-report-docbook-document.h		gda-report-docbook-document.h
	/*		/* GDA
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_REPORT_DOCBOOK_DOCUMENT_H__		#ifndef __GDA_REPORT_DOCBOOK_DOCUMENT_H__
	#define __GDA_REPORT_DOCBOOK_DOCUMENT_H__		#define __GDA_REPORT_DOCBOOK_DOCUMENT_H__
	#include <libgda-report/gda-report-document.h>		#include <libgda-report/gda-report-document.h>
	#define GDA_TYPE_REPORT_DOCBOOK_DOCUMENT (gda_report_docbook_doc ument_get_type())		#define GDA_TYPE_REPORT_DOCBOOK_DOCUMENT (gda_report_docbook_doc ument_get_type())
	#define GDA_REPORT_DOCBOOK_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_ CAST (obj, GDA_TYPE_REPORT_DOCBOOK_DOCUMENT, GdaReportDocbookDocument))		#define GDA_REPORT_DOCBOOK_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_ CAST (obj, GDA_TYPE_REPORT_DOCBOOK_DOCUMENT, GdaReportDocbookDocument))
	#define GDA_REPORT_DOCBOOK_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAS T (klass, GDA_TYPE_REPORT_DOCBOOK_DOCUMENT, GdaReportDocbookDocumentClass))		#define GDA_REPORT_DOCBOOK_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAS T (klass, GDA_TYPE_REPORT_DOCBOOK_DOCUMENT, GdaReportDocbookDocumentClass))
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-report-document.h		gda-report-document.h
	/*		/* GDA
	* Copyright (C) 2001 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	* Copyright (C) 2002 Carlos Perell
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2003 Santi Camps <santi@gnome-db.org>
	* Copyright (C) 2003 Santi Camps Taltavull <santi@src.gnome.org>
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_REPORT_DOCUMENT_H__		#ifndef __GDA_REPORT_DOCUMENT_H__
	#define __GDA_REPORT_DOCUMENT_H__		#define __GDA_REPORT_DOCUMENT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	#define GDA_TYPE_REPORT_DOCUMENT (gda_report_document_get_type() )		#define GDA_TYPE_REPORT_DOCUMENT (gda_report_document_get_type() )
	#define GDA_REPORT_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_REPORT_DOCUMENT, GdaReportDocument))		#define GDA_REPORT_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_REPORT_DOCUMENT, GdaReportDocument))
End of changes. 5 change blocks.
	17 lines changed or deleted		16 lines changed or added

	gda-report-engine.h		gda-report-engine.h
	/*		/* GDA
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_REPORT_ENGINE_H__		#ifndef __GDA_REPORT_ENGINE_H__
	#define __GDA_REPORT_ENGINE_H__		#define __GDA_REPORT_ENGINE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libxml/parser.h>		#include <libxml/parser.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	#include <libgda/gda-statement.h>		#include <libgda/gda-statement.h>
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-report-rml-document.h		gda-report-rml-document.h
	/*		/* GDA
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_REPORT_RML_DOCUMENT_H__		#ifndef __GDA_REPORT_RML_DOCUMENT_H__
	#define __GDA_REPORT_RML_DOCUMENT_H__		#define __GDA_REPORT_RML_DOCUMENT_H__
	#include <libgda-report/gda-report-document.h>		#include <libgda-report/gda-report-document.h>
	#define GDA_TYPE_REPORT_RML_DOCUMENT (gda_report_rml_document_ge t_type())		#define GDA_TYPE_REPORT_RML_DOCUMENT (gda_report_rml_document_ge t_type())
	#define GDA_REPORT_RML_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_REPORT_RML_DOCUMENT, GdaReportRmlDocument))		#define GDA_REPORT_RML_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_REPORT_RML_DOCUMENT, GdaReportRmlDocument))
	#define GDA_REPORT_RML_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (k lass, GDA_TYPE_REPORT_RML_DOCUMENT, GdaReportRmlDocumentClass))		#define GDA_REPORT_RML_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (k lass, GDA_TYPE_REPORT_RML_DOCUMENT, GdaReportRmlDocumentClass))
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-row.h		gda-row.h
	/*		/* GDA library
	* Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 1998 - 2009 The GNOME Foundation.
	* Copyright (C) 2001 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
	* Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
	* Copyright (C) 2003 Xabier Rodr
	* Copyright (C) 2004 Paisa Seeluangsawat <paisa@users.sf.net>
	* Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
	* Copyright (C) 2005
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_ROW_H__		#ifndef __GDA_ROW_H__
	#define __GDA_ROW_H__		#define __GDA_ROW_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 68		skipping to change at line 66
	};		};
	GType gda_row_get_type (void) G_GNUC_CONST;		GType gda_row_get_type (void) G_GNUC_CONST;
	GdaRow *gda_row_new (gint count);		GdaRow *gda_row_new (gint count);
	gint gda_row_get_length (GdaRow *row);		gint gda_row_get_length (GdaRow *row);
	GValue *gda_row_get_value (GdaRow *row, gint num);		GValue *gda_row_get_value (GdaRow *row, gint num);
	/* for database providers mainly */		/* for database providers mainly */
	void gda_row_invalidate_value (GdaRow *row, GValue *value);		void gda_row_invalidate_value (GdaRow *row, GValue *value);
	void gda_row_invalidate_value_e (GdaRow *row, GValue *value, GErro r *error);
	gboolean gda_row_value_is_valid (GdaRow *row, GValue *value);		gboolean gda_row_value_is_valid (GdaRow *row, GValue *value);
	gboolean gda_row_value_is_valid_e (GdaRow *row, GValue *value, GError **error);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 7 change blocks.
	21 lines changed or deleted		18 lines changed or added

	gda-server-operation.h		gda-server-operation.h
	/*		/*
	* Copyright (C) 2006 Murray Cumming <murrayc@murrayc.com>		* Copyright (C) 2006 - 2011 The GNOME Foundation.
	* Copyright (C) 2006 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2010 David King <davidk@openismus.com>
	* Copyright (C) 2010 Jonh Wendell <jwendell@gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SERVER_OPERATION_H__		#ifndef __GDA_SERVER_OPERATION_H__
	#define __GDA_SERVER_OPERATION_H__		#define __GDA_SERVER_OPERATION_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 75		skipping to change at line 75
	GDA_SERVER_OPERATION_LAST		GDA_SERVER_OPERATION_LAST
	} GdaServerOperationType;		} GdaServerOperationType;
	/* error reporting */		/* error reporting */
	extern GQuark gda_server_operation_error_quark (void);		extern GQuark gda_server_operation_error_quark (void);
	#define GDA_SERVER_OPERATION_ERROR gda_server_operation_error_quark ()		#define GDA_SERVER_OPERATION_ERROR gda_server_operation_error_quark ()
	typedef enum {		typedef enum {
	GDA_SERVER_OPERATION_OBJECT_NAME_ERROR,		GDA_SERVER_OPERATION_OBJECT_NAME_ERROR,
	GDA_SERVER_OPERATION_INCORRECT_VALUE_ERROR,		GDA_SERVER_OPERATION_INCORRECT_VALUE_ERROR
	GDA_SERVER_OPERATION_XML_ERROR
	} GdaServerOperationError;		} GdaServerOperationError;
	typedef enum		typedef enum
	{		{
	GDA_SERVER_OPERATION_CREATE_TABLE_NOTHING_FLAG = 1 << 0,		GDA_SERVER_OPERATION_CREATE_TABLE_NOTHING_FLAG = 1 << 0,
	GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_FLAG = 1 << 1,		GDA_SERVER_OPERATION_CREATE_TABLE_PKEY_FLAG = 1 << 1,
	GDA_SERVER_OPERATION_CREATE_TABLE_NOT_NULL_FLAG = 1 << 2,		GDA_SERVER_OPERATION_CREATE_TABLE_NOT_NULL_FLAG = 1 << 2,
	GDA_SERVER_OPERATION_CREATE_TABLE_UNIQUE_FLAG = 1 << 3,		GDA_SERVER_OPERATION_CREATE_TABLE_UNIQUE_FLAG = 1 << 3,
	GDA_SERVER_OPERATION_CREATE_TABLE_AUTOINC_FLAG = 1 << 4,		GDA_SERVER_OPERATION_CREATE_TABLE_AUTOINC_FLAG = 1 << 4,
	GDA_SERVER_OPERATION_CREATE_TABLE_FKEY_FLAG = 1 << 5,		GDA_SERVER_OPERATION_CREATE_TABLE_FKEY_FLAG = 1 << 5,
	skipping to change at line 146		skipping to change at line 145
	};		};
	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);
	GdaServerOperationType gda_server_operation_string_to_op_type (co nst gchar *str);		GdaServerOperationType gda_server_operation_string_to_op_type (co nst gchar *str);
	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, ...);
	const GValue *gda_server_operation_get_value_at_path (Gd aServerOperation *op, const gchar *path);
	gchar *gda_server_operation_get_sql_identifier_at (Gd aServerOperation *op,		gchar *gda_server_operation_get_sql_identifier_at (Gd aServerOperation *op,
	Gda Connection *cnc, GdaServerProvider *prov,		Gda Connection *cnc, GdaServerProvider *prov,
	con st gchar *path_format, ...);		con st gchar *path_format, ...);
	gchar *gda_server_operation_get_sql_identifier_at_path
	(GdaServerOperation *op,
	GdaConnection *cnc, GdaServerProvider *prov,
	const gchar *path);
	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, ...);
	gboolean gda_server_operation_set_value_at_path (Gd
	aServerOperation *op, const gchar *value,
	con
	st gchar *path, GError **error);
	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);
	gchar *gda_server_operation_get_node_parent (Gd aServerOperation *op, const gchar *path);		gchar *gda_server_operation_get_node_parent (Gd aServerOperation *op, const gchar *path);
	gchar *gda_server_operation_get_node_path_portion (Gd aServerOperation *op, const gchar *path);		gchar *gda_server_operation_get_node_path_portion (Gd aServerOperation *op, const gchar *path);
End of changes. 9 change blocks.
	27 lines changed or deleted		16 lines changed or added

	gda-server-provider-extra.h		gda-server-provider-extra.h
	/*		/*
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2005 - 2011 Vivien Malerba
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2009 Bas Driessen <bas.driessen@xobas.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SERVER_PROVIDER_EXTRA__		#ifndef __GDA_SERVER_PROVIDER_EXTRA__
	#define __GDA_SERVER_PROVIDER_EXTRA__		#define __GDA_SERVER_PROVIDER_EXTRA__
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	#include <libgda/gda-value.h>		#include <libgda/gda-value.h>
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/*		/*
	* GdaSqlParser associated to each provider		* GdaSqlParser associated to each provider
	*/		*/
	GdaSqlParser *gda_server_provider_internal_get_parser (GdaServerProvider *p rov);		GdaSqlParser *gda_server_provider_internal_get_parser (GdaServerProvider *p rov);
	/*		/*
	* Help to implement providers, so the schemas return the same
	* number of columns and column titles across the providers.
	*/
	gint gda_server_provider_get_schema_nb_columns (GdaConnectionSchema sc
	hema);
	gboolean gda_server_provider_init_schema_model (GdaDataModel *model, G
	daConnectionSchema schema);
	gboolean gda_server_provider_test_schema_model (GdaDataModel *model, G
	daConnectionSchema schema, GError **error);
	/*
	* Default perform operation		* Default perform operation
	*/		*/
	gboolean gda_server_provider_perform_operation_default (GdaServerProvider * provider, GdaConnection *cnc,		gboolean gda_server_provider_perform_operation_default (GdaServerProvider * provider, GdaConnection *cnc,
	GdaServerOperation * op, GError **error);		GdaServerOperation * op, GError **error);
	/* default data handler method */		/* default data handler method */
	GdaDataHandler *gda_server_provider_get_data_handler_default (GdaServerProv ider *provider, GdaConnection *cnc,		GdaDataHandler *gda_server_provider_get_data_handler_default (GdaServerProv ider *provider, GdaConnection *cnc,
	GType type, co nst gchar *dbms_type);		GType type, co nst gchar *dbms_type);
	/* Convert a SELECT statement with potentially some parameters to another S ELECT statement		/* Convert a SELECT statement with potentially some parameters to another S ELECT statement
End of changes. 6 change blocks.
	25 lines changed or deleted		12 lines changed or added

	gda-server-provider-private.h		gda-server-provider-private.h
	/*		/* gda-server-provider-private.h
	* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
	* Copyright (C) 2005 - 2008 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2005
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2005 - 2008 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SERVER_PROVIDER_PRIVATE__		#ifndef __GDA_SERVER_PROVIDER_PRIVATE__
	#define __GDA_SERVER_PROVIDER_PRIVATE__		#define __GDA_SERVER_PROVIDER_PRIVATE__
	#include <libgda/gda-meta-store.h>		#include <libgda/gda-meta-store.h>
	struct _GdaServerProviderPrivate {		struct _GdaServerProviderPrivate {
	GHashTable *data_handlers; /* key = a GdaServerProviderHandlerInf o pointer, value = a GdaDataHandler */		GHashTable *data_handlers; /* key = a GdaServerProviderHandlerInf o pointer, value = a GdaDataHandler */
	GdaSqlParser *parser;		GdaSqlParser *parser;
End of changes. 5 change blocks.
	15 lines changed or deleted		14 lines changed or added

	gda-server-provider.h		gda-server-provider.h
	/*		/* GDA library
	* Copyright (C) 2001 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 1998 - 2009 The GNOME Foundation.
	* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
	* Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
	* Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
	* Copyright (C) 2005 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Bas Driessen <bas.driessen@xobas.com>
	* version 2 of the License, or (at your option) any later version.		* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SERVER_PROVIDER_H__		#ifndef __GDA_SERVER_PROVIDER_H__
	#define __GDA_SERVER_PROVIDER_H__		#define __GDA_SERVER_PROVIDER_H__
	#include <libgda/gda-server-operation.h>		#include <libgda/gda-server-operation.h>
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	#include <libgda/gda-quark-list.h>		#include <libgda/gda-quark-list.h>
	#include <libgda/gda-statement.h>		#include <libgda/gda-statement.h>
	skipping to change at line 62		skipping to change at line 61
	GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,		GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
	GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR,		GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR,
	GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,		GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
	GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,		GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
	GDA_SERVER_PROVIDER_OPERATION_ERROR,		GDA_SERVER_PROVIDER_OPERATION_ERROR,
	GDA_SERVER_PROVIDER_INTERNAL_ERROR,		GDA_SERVER_PROVIDER_INTERNAL_ERROR,
	GDA_SERVER_PROVIDER_BUSY_ERROR,		GDA_SERVER_PROVIDER_BUSY_ERROR,
	GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,		GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR,
	GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,		GDA_SERVER_PROVIDER_SERVER_VERSION_ERROR,
	GDA_SERVER_PROVIDER_DATA_ERROR,		GDA_SERVER_PROVIDER_DATA_ERROR,
	GDA_SERVER_PROVIDER_DEFAULT_VALUE_HANDLING_ERROR,		GDA_SERVER_PROVIDER_DEFAULT_VALUE_HANDLING_ERROR
	GDA_SERVER_PROVIDER_MISUSE_ERROR,
	GDA_SERVER_PROVIDER_FILE_NOT_FOUND_ERROR
	} GdaServerProviderError;		} GdaServerProviderError;
	struct _GdaServerProvider {		struct _GdaServerProvider {
	GObject object;		GObject object;
	GdaServerProviderPrivate *priv;		GdaServerProviderPrivate *priv;
	};		};
	typedef struct {		typedef struct {
	/* _information_schema_catalog_name */		/* _information_schema_catalog_name */
	gboolean (*_info) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **);		gboolean (*_info) (GdaServerProvider *, GdaConnection *, GdaMetaStore *, GdaMetaContext *, GError **);
	skipping to change at line 284		skipping to change at line 281
	const gchar *name, GError **error);		const gchar *name, GError **error);
	gboolean (* add_savepoint) (GdaServerProvider *provider, GdaConnection *cnc,		gboolean (* add_savepoint) (GdaServerProvider *provider, GdaConnection *cnc,
	const gchar *name, GError **error);		const gchar *name, GError **error);
	gboolean (* rollback_savepoint) (GdaServerProvider *provider, GdaConnection *cnc,		gboolean (* rollback_savepoint) (GdaServerProvider *provider, GdaConnection *cnc,
	const gchar *name, GError **error);		const gchar *name, GError **error);
	gboolean (* delete_savepoint) (GdaServerProvider *provider, GdaConnection *cnc,		gboolean (* delete_savepoint) (GdaServerProvider *provider, GdaConnection *cnc,
	const gchar *name, GError **error);		const gchar *name, GError **error);
	/* GdaStatement */		/* GdaStatement */
	GdaSqlParser *(* create_parser) (GdaServerProvider *provider, GdaConnection *cnc);		GdaSqlParser *(* create_parser) (GdaServerProvider *provider, GdaConnection *cnc);
	/**
	* statement_to_sql:
	* @cnc: a #GdaConnection object
	* @stmt: a #GdaStatement object
	* @params: (allow-none): a #GdaSet object (which can be obtained us
	ing gda_statement_get_parameters()), or %NULL
	* @flags: SQL rendering flags, as #GdaStatementSqlFlag OR'ed values
	* @params_used: (allow-none) (element-type Gda.Holder) (out) (trans
	fer container): a place to store the list of individual #GdaHolder objects
	within @params which have been used
	* @error: a place to store errors, or %NULL
	*
	* Renders @stmt as an SQL statement, adapted to the SQL dialect use
	d by @cnc
	*
	* Returns: a new string, or %NULL if an error occurred
	*/
	gchar *(* statement_to_sql) (GdaServerProvider *provider, GdaConnection *cnc,		gchar *(* statement_to_sql) (GdaServerProvider *provider, GdaConnection *cnc,
	GdaStatement *stmt , GdaSet *params, GdaStatementSqlFlag flags,		GdaStatement *stmt , GdaSet *params, GdaStatementSqlFlag flags,
	GSList **params_us ed, GError **error);		GSList **params_us ed, GError **error);
	gboolean (* statement_prepare) (GdaServerProvider *provider, GdaConnection *cnc,		gboolean (* statement_prepare) (GdaServerProvider *provider, GdaConnection *cnc,
	GdaStatement *stmt , GError **error);		GdaStatement *stmt , GError **error);
	GObject *(* statement_execute) (GdaServerProvider *provider, GdaConnection *cnc,		GObject *(* statement_execute) (GdaServerProvider *provider, GdaConnection *cnc,
	GdaStatement *stmt , GdaSet *params,		GdaStatement *stmt , GdaSet *params,
	GdaStatementModelU sage model_usage,		GdaStatementModelU sage model_usage,
	GType *col_types, GdaSet **last_inserted_row,		GType *col_types, GdaSet **last_inserted_row,
	guint *task_id, Gd aServerProviderExecCallback exec_cb,		guint *task_id, Gd aServerProviderExecCallback exec_cb,
	skipping to change at line 334		skipping to change at line 317
	const gchar *id,		const gchar *id,
	gboolean for_meta_s tore, gboolean force_quotes);		gboolean for_meta_s tore, gboolean force_quotes);
	/* Async. handling */		/* Async. handling */
	gboolean (*handle_async) (GdaServerProvider * provider, GdaConnection *cnc, GError **error);		gboolean (*handle_async) (GdaServerProvider * provider, GdaConnection *cnc, GError **error);
	GdaSqlStatement *(*statement_rewrite) (GdaServerProvider * provider, GdaConnection *cnc,		GdaSqlStatement *(*statement_rewrite) (GdaServerProvider * provider, GdaConnection *cnc,
	GdaStatement *stmt, GdaSet *params, GError **error);		GdaStatement *stmt, GdaSet *params, GError **error);
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
			void (*_gda_reserved1) (void);
			void (*_gda_reserved2) (void);
			void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_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 */
	const gchar *gda_server_provider_get_name (GdaServerPro vider *provider);		const gchar *gda_server_provider_get_name (GdaServerPro vider *provider);
	const gchar *gda_server_provider_get_version (GdaServerPro vider *provider);		const gchar *gda_server_provider_get_version (GdaServerPro vider *provider);
End of changes. 8 change blocks.
	39 lines changed or deleted		22 lines changed or added

	gda-set.h		gda-set.h
	/*		/*
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2003 - 2011 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SET_H_		#ifndef __GDA_SET_H_
	#define __GDA_SET_H_		#define __GDA_SET_H_
	#include "gda-value.h"		#include "gda-value.h"
	#include <libxml/tree.h>		#include <libxml/tree.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 42		skipping to change at line 42
	/* error reporting */		/* error reporting */
	extern GQuark gda_set_error_quark (void);		extern GQuark gda_set_error_quark (void);
	#define GDA_SET_ERROR gda_set_error_quark ()		#define GDA_SET_ERROR gda_set_error_quark ()
	typedef enum		typedef enum
	{		{
	GDA_SET_XML_SPEC_ERROR,		GDA_SET_XML_SPEC_ERROR,
	GDA_SET_HOLDER_NOT_FOUND_ERROR,		GDA_SET_HOLDER_NOT_FOUND_ERROR,
	GDA_SET_INVALID_ERROR,		GDA_SET_INVALID_ERROR,
	GDA_SET_READ_ONLY_ERROR,		GDA_SET_READ_ONLY_ERROR
	GDA_SET_IMPLEMENTATION_ERROR
	} GdaSetError;		} GdaSetError;
	struct _GdaSetNode {		struct _GdaSetNode {
	GdaHolder *holder; /* Can't be NULL */		GdaHolder *holder; /* Can't be NULL */
	GdaDataModel *source_model; /* may be NULL */		GdaDataModel *source_model; /* may be NULL */
	gint source_column; /* unused if @source_model is NULL */		gint source_column; /* unused if @source_model is NULL */
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
	};		};
	/**
	* GdaSetGroup:
	* @nodes: (element-type Gda.SetNode): list of GdaSetNode, at least one ent
	ry
	* @nodes_source: (allow-none): if NULL, then @nodes contains exactly one
	entry
	*/
	struct _GdaSetGroup {		struct _GdaSetGroup {
	GSList *nodes; /* list of GdaSetNode, at least one entry */		GSList *nodes; /* list of GdaSetNode, at least one entry */
	GdaSetSource *nodes_source; /* if NULL, then @nodes contains exactly one entry */		GdaSetSource *nodes_source; /* if NULL, then @nodes contains exactly one entry */
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
	};		};
	/**
	* GdaSetSource:
	* @data_model: Can't be NULL
	* @nodes: (element-type Gda.SetNode): list of #GdaSetNode for which source
	_model == @data_model
	*
	**/
	struct _GdaSetSource {		struct _GdaSetSource {
	GdaDataModel *data_model; /* Can't be NULL */		GdaDataModel *data_model; /* Can't be NULL */
	GSList *nodes; /* list of #GdaSetNode for which sourc e_model == @data_model */		GSList *nodes; /* list of #GdaSetNode for which sourc e_model == @data_model */
	/*< private >*/		/*< 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;
	};		};
	#define GDA_SET_NODE(x) ((GdaSetNode *)(x))		#define GDA_SET_NODE(x) ((GdaSetNode *)(x))
	#define GDA_SET_SOURCE(x) ((GdaSetSource *)(x))		#define GDA_SET_SOURCE(x) ((GdaSetSource *)(x))
	#define GDA_SET_GROUP(x) ((GdaSetGroup *)(x))		#define GDA_SET_GROUP(x) ((GdaSetGroup *)(x))
	/* struct for the object's data */		/* struct for the object's data */
	/**
	* GdaSet:
	* @holders: (element-type Gda.Holder): list of GdaHolder objects
	* @nodes_list: (element-type Gda.SetNode): list of GdaSetNode
	* @sources_list: (element-type Gda.SetSource): list of GdaSetSource
	* @groups_list: (element-type Gda.SetGroup): list of GdaSetGroup
	*
	*/
	struct _GdaSet		struct _GdaSet
	{		{
	GObject object;		GObject object;
	GdaSetPrivate *priv;		GdaSetPrivate *priv;
	/*< public >*/		/*< public >*/
	GSList *holders; /* list of GdaHolder objects */		GSList *holders; /* list of GdaHolder objects */
	GSList *nodes_list; /* list of GdaSetNode */		GSList *nodes_list; /* list of GdaSetNode */
	GSList *sources_list; /* list of GdaSetSource */		GSList *sources_list; /* list of GdaSetSource */
	GSList *groups_list; /* list of GdaSetGroup */		GSList *groups_list; /* list of GdaSetGroup */
	skipping to change at line 132		skipping to change at line 111
	GError *(*validate_set) (GdaSet *set);		GError *(*validate_set) (GdaSet *set);
	void (*holder_changed) (GdaSet *set, GdaHold er *holder);		void (*holder_changed) (GdaSet *set, GdaHold er *holder);
	void (*holder_attr_changed) (GdaSet *set, GdaHold er *holder,		void (*holder_attr_changed) (GdaSet *set, GdaHold er *holder,
	const gchar *attr_na me, const GValue *attr_value);		const gchar *attr_na me, const GValue *attr_value);
	void (*public_data_changed) (GdaSet *set);		void (*public_data_changed) (GdaSet *set);
	void (*holder_type_set) (GdaSet *set, GdaHold er *holder);		void (*holder_type_set) (GdaSet *set, GdaHold er *holder);
	void (*source_model_changed) (GdaSet *set, GdaSetS ource *source);		void (*source_model_changed) (GdaSet *set, GdaSetS ource *source);
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
			void (*_gda_reserved1) (void);
			void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	GType gda_set_get_type (void) G_GNUC_CONST;		GType gda_set_get_type (void) G_GNUC_CONST;
	GdaSet *gda_set_new (GSList *holders);		GdaSet *gda_set_new (GSList *holders);
	GdaSet *gda_set_copy (GdaSet *set);		GdaSet *gda_set_copy (GdaSet *set);
	GdaSet *gda_set_new_inline (gint nb, ...);		GdaSet *gda_set_new_inline (gint nb, ...);
	GdaSet *gda_set_new_from_spec_string (const gchar *xml_spec, GErr or **error);		GdaSet *gda_set_new_from_spec_string (const gchar *xml_spec, GErr or **error);
End of changes. 10 change blocks.
	36 lines changed or deleted		15 lines changed or added

	gda-sql-builder.h		gda-sql-builder.h
	/*		/* gda-sql-builder.h
	* Copyright (C) 2009 - 2010 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2010 Jonh Wendell <jwendell@gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2009 - 2010 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SQL_BUILDER_H_		#ifndef __GDA_SQL_BUILDER_H_
	#define __GDA_SQL_BUILDER_H_		#define __GDA_SQL_BUILDER_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <sql-parser/gda-sql-statement.h>		#include <sql-parser/gda-sql-statement.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 127		skipping to change at line 126
	gboolean distinct, Gd aSqlBuilderId expr_id);		gboolean distinct, Gd aSqlBuilderId expr_id);
	void gda_sql_builder_select_set_limit (GdaSqlBuilder *builder,		void gda_sql_builder_select_set_limit (GdaSqlBuilder *builder,
	GdaSqlBuilderId limit_co unt_expr_id, GdaSqlBuilderId limit_offset_expr_id);		GdaSqlBuilderId limit_co unt_expr_id, GdaSqlBuilderId limit_offset_expr_id);
	void gda_sql_builder_select_set_having (GdaSqlBuilder *builder , GdaSqlBuilderId cond_id);		void gda_sql_builder_select_set_having (GdaSqlBuilder *builder , GdaSqlBuilderId cond_id);
	void gda_sql_builder_select_group_by (GdaSqlBuilder *builder, GdaSqlBuilderId expr_id);		void gda_sql_builder_select_group_by (GdaSqlBuilder *builder, GdaSqlBuilderId expr_id);
	/* COMPOUND SELECT Statement API */		/* COMPOUND SELECT Statement API */
	void gda_sql_builder_compound_set_type (GdaSqlBuilder *builder , GdaSqlStatementCompoundType compound_type);		void gda_sql_builder_compound_set_type (GdaSqlBuilder *builder , GdaSqlStatementCompoundType compound_type);
	void gda_sql_builder_compound_add_sub_select (GdaSqlBuilder *b uilder, GdaSqlStatement *sqlst);		void gda_sql_builder_compound_add_sub_select (GdaSqlBuilder *b uilder, GdaSqlStatement *sqlst);
	void gda_sql_builder_compound_add_sub_select_from_builder (Gda SqlBuilder *builder, GdaSqlBuilder *subselect);
	/* import/Export API */		/* import/Export API */
	GdaSqlExpr *gda_sql_builder_export_expression (GdaSqlBuilder *builder , GdaSqlBuilderId id);		GdaSqlExpr *gda_sql_builder_export_expression (GdaSqlBuilder *builder , GdaSqlBuilderId id);
	GdaSqlBuilderId gda_sql_builder_import_expression (GdaSqlBuilder *builder, GdaSqlExpr *expr);		GdaSqlBuilderId gda_sql_builder_import_expression (GdaSqlBuilder *builder, GdaSqlExpr *expr);
	GdaSqlBuilderId gda_sql_builder_import_expression_from_builder (GdaSqlBuild er *builder, GdaSqlBuilder *query, GdaSqlBuilderId expr_id);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 7 change blocks.
	16 lines changed or deleted		14 lines changed or added

	gda-sql-parser-enum-types.h		gda-sql-parser-enum-types.h
	#ifndef __LIBGDA_SQL_PARSER_ENUM_TYPES_H__		#ifndef __LIBGDA_SQL_PARSER_ENUM_TYPES_H__
	#define __LIBGDA_SQL_PARSER_ENUM_TYPES_H__		#define __LIBGDA_SQL_PARSER_ENUM_TYPES_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
			/* enumerations from "gda-sql-parser.h" */
	GType gda_sql_parser_error_get_type (void);		GType gda_sql_parser_error_get_type (void);
	#define GDA_TYPE_SQL_PARSER_ERROR (gda_sql_parser_error_get_type())		#define GDA_TYPE_SQL_PARSER_ERROR (gda_sql_parser_error_get_type())
	GType gda_sql_parser_mode_get_type (void);		GType gda_sql_parser_mode_get_type (void);
	#define GDA_TYPE_SQL_PARSER_MODE (gda_sql_parser_mode_get_type())		#define GDA_TYPE_SQL_PARSER_MODE (gda_sql_parser_mode_get_type())
	GType gda_sql_parser_flavour_get_type (void);		GType gda_sql_parser_flavour_get_type (void);
	#define GDA_TYPE_SQL_PARSER_FLAVOUR (gda_sql_parser_flavour_get_type())		#define GDA_TYPE_SQL_PARSER_FLAVOUR (gda_sql_parser_flavour_get_type())
			/* enumerations from "gda-statement-struct-decl.h" */
	GType gda_sql_error_get_type (void);		GType gda_sql_error_get_type (void);
	#define GDA_TYPE_SQL_ERROR (gda_sql_error_get_type())		#define GDA_TYPE_SQL_ERROR (gda_sql_error_get_type())
	GType gda_sql_statement_type_get_type (void);		GType gda_sql_statement_type_get_type (void);
	#define GDA_TYPE_SQL_STATEMENT_TYPE (gda_sql_statement_type_get_type())		#define GDA_TYPE_SQL_STATEMENT_TYPE (gda_sql_statement_type_get_type())
	GType gda_sql_any_part_type_get_type (void);		GType gda_sql_any_part_type_get_type (void);
	#define GDA_TYPE_SQL_ANY_PART_TYPE (gda_sql_any_part_type_get_type())		#define GDA_TYPE_SQL_ANY_PART_TYPE (gda_sql_any_part_type_get_type())
			/* enumerations from "gda-statement-struct-compound.h" */
	GType gda_sql_statement_compound_type_get_type (void);		GType gda_sql_statement_compound_type_get_type (void);
	#define GDA_TYPE_SQL_STATEMENT_COMPOUND_TYPE (gda_sql_statement_compound_ty pe_get_type())		#define GDA_TYPE_SQL_STATEMENT_COMPOUND_TYPE (gda_sql_statement_compound_ty pe_get_type())
			/* enumerations from "gda-statement-struct-parts.h" */
	GType gda_sql_operator_type_get_type (void);		GType gda_sql_operator_type_get_type (void);
	#define GDA_TYPE_SQL_OPERATOR_TYPE (gda_sql_operator_type_get_type())		#define GDA_TYPE_SQL_OPERATOR_TYPE (gda_sql_operator_type_get_type())
	GType gda_sql_select_join_type_get_type (void);		GType gda_sql_select_join_type_get_type (void);
	#define GDA_TYPE_SQL_SELECT_JOIN_TYPE (gda_sql_select_join_type_get_type())		#define GDA_TYPE_SQL_SELECT_JOIN_TYPE (gda_sql_select_join_type_get_type())
	G_END_DECLS		G_END_DECLS
	#endif /* __LIBGDA_ENUM_TYPES_H__ */		#endif /* __LIBGDA_ENUM_TYPES_H__ */
	/* Content designed to maitain API/ABI */
	#ifndef __LIBGDA_SQL_PARSER_ENUM_TYPES_KEEPAPI_H__
	#define __LIBGDA_SQL_PARSER_ENUM_TYPES_KEEPAPI_H__
	GType gda_sql_error_type_get_type (void);
	#define GDA_SQL_PARSER_TYPE_SQL_ERROR_TYPE (gda_sql_error_type_get_type())
	#define GDA_SQL_PARSER_TYPE_SQL_PARSER_ERROR (gda_sql_parser_error_get_type
	())
	#define GDA_SQL_PARSER_TYPE_SQL_PARSER_MODE (gda_sql_parser_mode_get_type()
	)
	#define GDA_SQL_PARSER_TYPE_SQL_PARSER_FLAVOUR (gda_sql_parser_flavour_get_
	type())
	#define GDA_SQL_PARSER_TYPE_SQL_ERROR (gda_sql_error_get_type())
	#define GDA_SQL_PARSER_TYPE_SQL_STATEMENT_TYPE (gda_sql_statement_type_get_
	type())
	#define GDA_SQL_PARSER_TYPE_SQL_ANY_PART_TYPE (gda_sql_any_part_type_get_ty
	pe())
	#define GDA_SQL_PARSER_TYPE_SQL_STATEMENT_COMPOUND_TYPE (gda_sql_statement_
	compound_type_get_type())
	#define GDA_SQL_PARSER_TYPE_SQL_OPERATOR_TYPE (gda_sql_operator_type_get_ty
	pe())
	#define GDA_SQL_PARSER_TYPE_SQL_SELECT_JOIN_TYPE (gda_sql_select_join_type_
	get_type())
	#endif
End of changes. 5 change blocks.
	0 lines changed or deleted		4 lines changed or added

	gda-sql-parser.h		gda-sql-parser.h
	/*		/* gda-sql-parser.h
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2007 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SQL_PARSER_H_		#ifndef __GDA_SQL_PARSER_H_
	#define __GDA_SQL_PARSER_H_		#define __GDA_SQL_PARSER_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-statement.h>		#include <libgda/gda-statement.h>
	#include <libgda/gda-batch.h>		#include <libgda/gda-batch.h>
	#include <sql-parser/gda-statement-struct.h>		#include <sql-parser/gda-statement-struct.h>
	#include <sql-parser/gda-statement-struct-util.h>		#include <sql-parser/gda-statement-struct-util.h>
End of changes. 5 change blocks.
	12 lines changed or deleted		14 lines changed or added

	gda-sql-statement.h		gda-sql-statement.h
	/*		/* GDA library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2008 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2008 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SQL_STATEMENT_H__		#ifndef __GDA_SQL_STATEMENT_H__
	#define __GDA_SQL_STATEMENT_H__		#define __GDA_SQL_STATEMENT_H__
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#include <sql-parser/gda-statement-struct-select.h>		#include <sql-parser/gda-statement-struct-select.h>
	#include <sql-parser/gda-statement-struct-insert.h>		#include <sql-parser/gda-statement-struct-insert.h>
	#include <sql-parser/gda-statement-struct-update.h>		#include <sql-parser/gda-statement-struct-update.h>
End of changes. 5 change blocks.
	16 lines changed or deleted		16 lines changed or added

	gda-sqlite-provider.h		gda-sqlite-provider.h
	/*		/* GDA SQLite provider
	* Copyright (C) 2001 - 2002 Carlos Perell		* Copyright (C) 1998 - 2009 The GNOME Foundation.
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Carlos Perell
	* version 2 of the License, or (at your option) any later version.		* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_SQLITE_PROVIDER_H__		#ifndef __GDA_SQLITE_PROVIDER_H__
	#define __GDA_SQLITE_PROVIDER_H__		#define __GDA_SQLITE_PROVIDER_H__
	#include <libgda/gda-server-provider.h>		#include <libgda/gda-server-provider.h>
	#define GDA_TYPE_SQLITE_PROVIDER (gda_sqlite_provider_get_type() )		#define GDA_TYPE_SQLITE_PROVIDER (gda_sqlite_provider_get_type() )
	#define GDA_SQLITE_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_SQLITE_PROVIDER, GdaSqliteProvider))		#define GDA_SQLITE_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_SQLITE_PROVIDER, GdaSqliteProvider))
	#define GDA_SQLITE_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass , GDA_TYPE_SQLITE_PROVIDER, GdaSqliteProviderClass))		#define GDA_SQLITE_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass , GDA_TYPE_SQLITE_PROVIDER, GdaSqliteProviderClass))
End of changes. 5 change blocks.
	15 lines changed or deleted		18 lines changed or added

	gda-statement-extra.h		gda-statement-extra.h
	/*		/* gda-statement-extra.h
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2005 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_STATEMENT_EXTRA__		#ifndef __GDA_STATEMENT_EXTRA__
	#define __GDA_STATEMENT_EXTRA__		#define __GDA_STATEMENT_EXTRA__
	#include <sql-parser/gda-sql-statement.h>		#include <sql-parser/gda-sql-statement.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* private information to implement custom		/* private information to implement custom
	* SQL renderers for GdaStatement objects		* SQL renderers for GdaStatement objects
	*/		*/
	typedef struct _GdaSqlRenderingContext GdaSqlRenderingContext;		typedef struct _GdaSqlRenderingContext GdaSqlRenderingContext;
	typedef gchar *(*GdaSqlRenderingFunc) (GdaSqlAnyPart *node, GdaSqlRend eringContext *context, GError **error);		typedef gchar *(*GdaSqlRenderingFunc) (GdaSqlAnyPart *node, GdaSqlRend eringContext *context, GError **error);
	typedef gchar *(*GdaSqlRenderingExpr) (GdaSqlExpr *expr, GdaSqlRenderi ngContext *context,		typedef gchar *(*GdaSqlRenderingExpr) (GdaSqlExpr *expr, GdaSqlRenderi ngContext *context,
	gboolean *is_default, gboolean * is_null,		gboolean *is_default, gboolean * is_null,
	GError **error);		GError **error);
	/**
	* GdaSqlRenderingPSpecFunc:
	* @pspec: #GdaSqlParamSpec to render
	* @expr: (allow-none): #GdaSqlExpr which may hold the default value for th
	e parameter, or %NULL
	* @context: the rendering context
	* @is_default: pointer to a #gboolean which is set to TRUE if value should
	be considered as a default value
	* @is_null: pointer to a #gboolean which is set to TRUE if value should be
	considered as NULL
	* @error: a place to store errors, or %NULL
	* @Returns: a new string, or %NULL if an error occurred
	*
	* Rendering function type to render a #GdaSqlParamSpec
	*/
	typedef gchar *(*GdaSqlRenderingPSpecFunc) (GdaSqlParamSpec *pspec, GdaSqlE xpr *expr, GdaSqlRenderingContext *context,		typedef gchar *(*GdaSqlRenderingPSpecFunc) (GdaSqlParamSpec *pspec, GdaSqlE xpr *expr, GdaSqlRenderingContext *context,
	gboolean *is_default, gboolean * is_null,		gboolean *is_default, gboolean * is_null,
	GError **error);		GError **error);
	typedef gchar *(*GdaSqlRenderingValue) (const GValue *value, GdaSqlRend eringContext *context, GError **error);		typedef gchar *(*GdaSqlRenderingValue) (const GValue *value, GdaSqlRend eringContext *context, GError **error);
	/**
	* GdaSqlRenderingContext:
	* @flags:
	* @params:
	* @params_used: (element-type Gda.Holder):
	* @provider: (allow-none):
	* @cnc: (allow-none):
	*
	* Specifies the context in which a #GdaSqlStatement is being converted to
	SQL.
	*/
	struct _GdaSqlRenderingContext {		struct _GdaSqlRenderingContext {
	GdaStatementSqlFlag flags;		GdaStatementSqlFlag flags;
	GdaSet *params;		GdaSet *params;
	GSList *params_used;		GSList *params_used;
	GdaServerProvider *provider; /* may be NULL */		GdaServerProvider *provider; /* may be NULL */
	GdaConnection *cnc; /* may be NULL */		GdaConnection *cnc; /* may be NULL */
	/* rendering functions */		/* rendering functions */
	GdaSqlRenderingValue render_value;		GdaSqlRenderingValue render_value;
	GdaSqlRenderingPSpecFunc render_param_spec;		GdaSqlRenderingPSpecFunc render_param_spec;
	skipping to change at line 102		skipping to change at line 79
	GdaSqlRenderingFunc render_field;		GdaSqlRenderingFunc render_field;
	GdaSqlRenderingFunc render_table;		GdaSqlRenderingFunc render_table;
	GdaSqlRenderingFunc render_function;		GdaSqlRenderingFunc render_function;
	GdaSqlRenderingFunc render_operation;		GdaSqlRenderingFunc render_operation;
	GdaSqlRenderingFunc render_case;		GdaSqlRenderingFunc render_case;
	GdaSqlRenderingFunc render_select_field;		GdaSqlRenderingFunc render_select_field;
	GdaSqlRenderingFunc render_select_target;		GdaSqlRenderingFunc render_select_target;
	GdaSqlRenderingFunc render_select_join;		GdaSqlRenderingFunc render_select_join;
	GdaSqlRenderingFunc render_select_from;		GdaSqlRenderingFunc render_select_from;
	GdaSqlRenderingFunc render_select_order;		GdaSqlRenderingFunc render_select_order;
	GdaSqlRenderingFunc render_distinct;
	/* 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);
	void (*_gda_reserved5) (void);		void (*_gda_reserved5) (void);
	void (*_gda_reserved6) (void);		void (*_gda_reserved6) (void);
	void (*_gda_reserved7) (void);		void (*_gda_reserved7) (void);
			void (*_gda_reserved8) (void);
	};		};
	gchar *gda_statement_to_sql_real (GdaStatement *stmt, GdaSqlRenderingContex t *context, GError **error);		gchar *gda_statement_to_sql_real (GdaStatement *stmt, GdaSqlRenderingContex t *context, GError **error);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 9 change blocks.
	41 lines changed or deleted		15 lines changed or added

	gda-statement-struct-compound.h		gda-statement-struct-compound.h
	/*		/*
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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		G_BEGIN_DECLS
	/*		/*
	* Kinds		* Kinds
	*/		*/
	/**
	* GdaSqlStatementCompoundType:
	* @GDA_SQL_STATEMENT_COMPOUND_UNION:
	* @GDA_SQL_STATEMENT_COMPOUND_UNION_ALL:
	* @GDA_SQL_STATEMENT_COMPOUND_INTERSECT:
	* @GDA_SQL_STATEMENT_COMPOUND_INTERSECT_ALL:
	* @GDA_SQL_STATEMENT_COMPOUND_EXCEPT:
	* @GDA_SQL_STATEMENT_COMPOUND_EXCEPT_ALL:
	*
	**/
	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
	} GdaSqlStatementCompoundType;		} GdaSqlStatementCompoundType;
	/*		/*
	* Structure definition		* Structure definition
	*/		*/
	/**
	* GdaSqlStatementCompound: (skip)
	* @any:
	* @compound_type:
	* @stmt_list:
	*
	**/
	struct _GdaSqlStatementCompound {		struct _GdaSqlStatementCompound {
	GdaSqlAnyPart any;		GdaSqlAnyPart any;
	GdaSqlStatementCompoundType compound_type;		GdaSqlStatementCompoundType compound_type;
	GSList *stmt_list; /* list of SELECT or COMPOUN D statements */		GSList *stmt_list; /* list of SELECT or COMPOUN D statements */
	/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
	};		};
	/*		/*
	* Common operations		* Common operations
	*/		*/
	gpointer _gda_sql_statement_compound_copy (gpointer src);		gpointer _gda_sql_statement_compound_copy (gpointer src);
	void _gda_sql_statement_compound_free (gpointer stmt);		void _gda_sql_statement_compound_free (gpointer stmt);
End of changes. 8 change blocks.
	31 lines changed or deleted		12 lines changed or added

	gda-statement-struct-decl.h		gda-statement-struct-decl.h
	/*		/*
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2008 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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		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 ()
	/*
	* GdaSqlError: (skip)
	*
	**/
	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
	} GdaSqlError;		} GdaSqlError;
	/*
	* GdaSqlErrorType: (skip)
	*
	**/
	typedef GdaSqlError GdaSqlErrorType;		typedef GdaSqlError GdaSqlErrorType;
	/*		/*
	* Struct declarations		* Struct declarations
	*/		*/
	/*
	* GdaSqlAnyPart: (skip)
	*
	**/
	typedef struct _GdaSqlAnyPart GdaSqlAnyPart;		typedef struct _GdaSqlAnyPart GdaSqlAnyPart;
	/*
	* GdaSqlStatement: (skip)
	*
	**/
	typedef struct _GdaSqlStatement GdaSqlStatement;		typedef struct _GdaSqlStatement GdaSqlStatement;
	/*
	* GdaSqlStatementUnknown: (skip)
	*
	**/
	typedef struct _GdaSqlStatementUnknown GdaSqlStatementUnknown;		typedef struct _GdaSqlStatementUnknown GdaSqlStatementUnknown;
	/*
	* GdaSqlStatementTransaction: (skip)
	*
	**/
	typedef struct _GdaSqlStatementTransaction GdaSqlStatementTransaction;		typedef struct _GdaSqlStatementTransaction GdaSqlStatementTransaction;
	/*
	* GdaSqlStatementSelect: (skip)
	*
	**/
	typedef struct _GdaSqlStatementSelect GdaSqlStatementSelect;		typedef struct _GdaSqlStatementSelect GdaSqlStatementSelect;
	/*
	* GdaSqlStatementInsert: (skip)
	*
	**/
	typedef struct _GdaSqlStatementInsert GdaSqlStatementInsert;		typedef struct _GdaSqlStatementInsert GdaSqlStatementInsert;
	/*
	* GdaSqlStatementDelete: (skip)
	*
	**/
	typedef struct _GdaSqlStatementDelete GdaSqlStatementDelete;		typedef struct _GdaSqlStatementDelete GdaSqlStatementDelete;
	/*
	* GdaSqlStatementUpdate: (skip)
	*
	**/
	typedef struct _GdaSqlStatementUpdate GdaSqlStatementUpdate;		typedef struct _GdaSqlStatementUpdate GdaSqlStatementUpdate;
	/*
	* GdaSqlStatementCompound: (skip)
	*
	**/
	typedef struct _GdaSqlStatementCompound GdaSqlStatementCompound;		typedef struct _GdaSqlStatementCompound GdaSqlStatementCompound;
	/*		/*
	* Statement type		* Statement type
	*/		*/
	/**
	* GdaSqlStatementType:
	* @GDA_SQL_STATEMENT_SELECT: a SELECT statement
	* @GDA_SQL_STATEMENT_INSERT: an INSERT statement
	* @GDA_SQL_STATEMENT_UPDATE: an UPDATE statement
	* @GDA_SQL_STATEMENT_DELETE: a DELETE statement
	* @GDA_SQL_STATEMENT_COMPOUND: a compound statement: multiple SELECT state
	ments grouped together using an operator
	* @GDA_SQL_STATEMENT_BEGIN: start of transaction statement
	* @GDA_SQL_STATEMENT_ROLLBACK: transaction abort statement
	* @GDA_SQL_STATEMENT_COMMIT: transaction commit statement
	* @GDA_SQL_STATEMENT_SAVEPOINT: new savepoint definition statement
	* @GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT: return to savepoint statement
	* @GDA_SQL_STATEMENT_DELETE_SAVEPOINT: savepoint deletion statement
	* @GDA_SQL_STATEMENT_UNKNOWN: unknown statement, only identifies variables
	* @GDA_SQL_STATEMENT_NONE: not used
	*
	* Known types of statements
	*/
	typedef enum {		typedef enum {
	GDA_SQL_STATEMENT_SELECT,		GDA_SQL_STATEMENT_SELECT,
	GDA_SQL_STATEMENT_INSERT,		GDA_SQL_STATEMENT_INSERT,
	GDA_SQL_STATEMENT_UPDATE,		GDA_SQL_STATEMENT_UPDATE,
	GDA_SQL_STATEMENT_DELETE,		GDA_SQL_STATEMENT_DELETE,
	GDA_SQL_STATEMENT_COMPOUND,		GDA_SQL_STATEMENT_COMPOUND,
	GDA_SQL_STATEMENT_BEGIN,		GDA_SQL_STATEMENT_BEGIN,
	GDA_SQL_STATEMENT_ROLLBACK,		GDA_SQL_STATEMENT_ROLLBACK,
	GDA_SQL_STATEMENT_COMMIT,		GDA_SQL_STATEMENT_COMMIT,
	skipping to change at line 144		skipping to change at line 81
	GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT,		GDA_SQL_STATEMENT_ROLLBACK_SAVEPOINT,
	GDA_SQL_STATEMENT_DELETE_SAVEPOINT,		GDA_SQL_STATEMENT_DELETE_SAVEPOINT,
	GDA_SQL_STATEMENT_UNKNOWN,		GDA_SQL_STATEMENT_UNKNOWN,
	GDA_SQL_STATEMENT_NONE		GDA_SQL_STATEMENT_NONE
	} GdaSqlStatementType;		} GdaSqlStatementType;
	/*		/*
	* Structures identification		* Structures identification
	*/		*/
	/**
	* GdaSqlAnyPartType: (skip)
	* @GDA_SQL_ANY_STMT_SELECT: structure is a #GdaSqlStatementSelect
	* @GDA_SQL_ANY_STMT_INSERT: structure is a #GdaSqlStatementInsert
	* @GDA_SQL_ANY_STMT_UPDATE: structure is a #GdaSqlStatementUpdate
	* @GDA_SQL_ANY_STMT_DELETE: structure is a #GdaSqlStatementDelete
	* @GDA_SQL_ANY_STMT_COMPOUND: structure is a #GdaSqlStatementCompound
	* @GDA_SQL_ANY_STMT_BEGIN: structure is a #GdaSqlStatementTransaction
	* @GDA_SQL_ANY_STMT_ROLLBACK: structure is a #GdaSqlStatementTransaction
	* @GDA_SQL_ANY_STMT_COMMIT: structure is a #GdaSqlStatementTransaction
	* @GDA_SQL_ANY_STMT_SAVEPOINT: structure is a #GdaSqlStatementTransaction
	* @GDA_SQL_ANY_STMT_ROLLBACK_SAVEPOINT: structure is a #GdaSqlStatementTra
	nsaction
	* @GDA_SQL_ANY_STMT_DELETE_SAVEPOINT: structure is a #GdaSqlStatementTrans
	action
	* @GDA_SQL_ANY_STMT_UNKNOWN: structure is a #GdaSqlStatementUnknown
	* @GDA_SQL_ANY_EXPR: structure is a #GdaSqlExpr
	* @GDA_SQL_ANY_SQL_FIELD: structure is a #GdaSqlField
	* @GDA_SQL_ANY_SQL_TABLE: structure is a #GdaSqlTable
	* @GDA_SQL_ANY_SQL_FUNCTION: structure is a #GdaSqlFunction
	* @GDA_SQL_ANY_SQL_OPERATION: structure is a #GdaSqlOperation
	* @GDA_SQL_ANY_SQL_CASE: structure is a #GdaSqlCase
	* @GDA_SQL_ANY_SQL_SELECT_FIELD: structure is a #GdaSqlSelectField
	* @GDA_SQL_ANY_SQL_SELECT_TARGET: structure is a #GdaSqlSelectTarget
	* @GDA_SQL_ANY_SQL_SELECT_JOIN: structure is a #GdaSqlSelectJoin
	* @GDA_SQL_ANY_SQL_SELECT_FROM: structure is a #GdaSqlSelectFrom
	* @GDA_SQL_ANY_SQL_SELECT_ORDER: structure is a #GdaSqlSelectOrder
	*
	* Type of part.
	*/
	typedef enum {		typedef enum {
	/* complete statements */		/* complete statements */
	GDA_SQL_ANY_STMT_SELECT = GDA_SQL_STATEMENT_SELECT,		GDA_SQL_ANY_STMT_SELECT = GDA_SQL_STATEMENT_SELECT,
	GDA_SQL_ANY_STMT_INSERT = GDA_SQL_STATEMENT_INSERT,		GDA_SQL_ANY_STMT_INSERT = GDA_SQL_STATEMENT_INSERT,
	GDA_SQL_ANY_STMT_UPDATE = GDA_SQL_STATEMENT_UPDATE,		GDA_SQL_ANY_STMT_UPDATE = GDA_SQL_STATEMENT_UPDATE,
	GDA_SQL_ANY_STMT_DELETE = GDA_SQL_STATEMENT_DELETE,		GDA_SQL_ANY_STMT_DELETE = GDA_SQL_STATEMENT_DELETE,
	GDA_SQL_ANY_STMT_COMPOUND = GDA_SQL_STATEMENT_COMPOUND,		GDA_SQL_ANY_STMT_COMPOUND = GDA_SQL_STATEMENT_COMPOUND,
	GDA_SQL_ANY_STMT_BEGIN = GDA_SQL_STATEMENT_BEGIN,		GDA_SQL_ANY_STMT_BEGIN = GDA_SQL_STATEMENT_BEGIN,
	GDA_SQL_ANY_STMT_ROLLBACK = GDA_SQL_STATEMENT_ROLLBACK,		GDA_SQL_ANY_STMT_ROLLBACK = GDA_SQL_STATEMENT_ROLLBACK,
	GDA_SQL_ANY_STMT_COMMIT = GDA_SQL_STATEMENT_COMMIT,		GDA_SQL_ANY_STMT_COMMIT = GDA_SQL_STATEMENT_COMMIT,
	skipping to change at line 201		skipping to change at line 110
	GDA_SQL_ANY_SQL_FUNCTION,		GDA_SQL_ANY_SQL_FUNCTION,
	GDA_SQL_ANY_SQL_OPERATION,		GDA_SQL_ANY_SQL_OPERATION,
	GDA_SQL_ANY_SQL_CASE,		GDA_SQL_ANY_SQL_CASE,
	GDA_SQL_ANY_SQL_SELECT_FIELD,		GDA_SQL_ANY_SQL_SELECT_FIELD,
	GDA_SQL_ANY_SQL_SELECT_TARGET,		GDA_SQL_ANY_SQL_SELECT_TARGET,
	GDA_SQL_ANY_SQL_SELECT_JOIN,		GDA_SQL_ANY_SQL_SELECT_JOIN,
	GDA_SQL_ANY_SQL_SELECT_FROM,		GDA_SQL_ANY_SQL_SELECT_FROM,
	GDA_SQL_ANY_SQL_SELECT_ORDER		GDA_SQL_ANY_SQL_SELECT_ORDER
	} GdaSqlAnyPartType;		} GdaSqlAnyPartType;
	/**
	* GdaSqlAnyPart: (skip)
	* @type: type of structure, as a #GdaSqlAnyPartType enum.
	* @parent: pointer to the parent #GdaSqlAnyPart structure
	*
	* Base structure of which all structures (except #GdaSqlStatement) "inheri
	t".
	* its type and its parent in the structure hierarchy.
	*/
	struct _GdaSqlAnyPart {		struct _GdaSqlAnyPart {
	GdaSqlAnyPartType type;		GdaSqlAnyPartType type;
	GdaSqlAnyPart *parent;		GdaSqlAnyPart *parent;
	};		};
	#define GDA_SQL_ANY_PART(x) ((GdaSqlAnyPart*)(x))		#define GDA_SQL_ANY_PART(x) ((GdaSqlAnyPart*)(x))
	#define gda_sql_any_part_set_parent(a,p) \		#define gda_sql_any_part_set_parent(a,p) \
	if (a) GDA_SQL_ANY_PART(a)->parent = GDA_SQL_ANY_PART(p)		if (a) GDA_SQL_ANY_PART(a)->parent = GDA_SQL_ANY_PART(p)
	/*		/*
	* Iteration		* Iteration
	*/		*/
	/* returns FALSE if a recursive walking should be stopped (mandatory is @er ror is set) */		/* returns FALSE if a recursive walking should be stopped (mandatory is @er ror is set) */
	/**		typedef gboolean (*GdaSqlForeachFunc) (GdaSqlAnyPart *, gpointer, GError **
	* GdaSqlForeachFunc: (skip)		);
	* @part: the current #GdaSqlAnyPart node
	* @data: user data passed to gda_sql_any_part_foreach().
	* @error: pointer to a place to store errors
	* @Returns: FALSE if the gda_sql_any_part_foreach() should stop at this po
	int and fail
	*
	* Specifies the type of functions passed to gda_sql_any_part_foreach().
	*/
	typedef gboolean (*GdaSqlForeachFunc) (GdaSqlAnyPart *part, gpointer data,
	GError **error);
	gboolean gda_sql_any_part_foreach (GdaSqlAnyPart *node, GdaSqlForeachFunc f unc, gpointer data, GError **error);		gboolean gda_sql_any_part_foreach (GdaSqlAnyPart *node, GdaSqlForeachFunc f unc, gpointer data, GError **error);
	/*		/*
	* Structure validation		* Structure validation
	*/		*/
	gboolean gda_sql_any_part_check_structure (GdaSqlAnyPart *node, GError **er ror);		gboolean gda_sql_any_part_check_structure (GdaSqlAnyPart *node, GError **er ror);
	/*		/*
	* Contents' infos		* Contents' infos
	*/		*/
	/**
	* GdaSqlStatementContentsInfo: (skip)
	*
	*/
	typedef struct {		typedef struct {
	GdaSqlStatementType type;		GdaSqlStatementType type;
	gchar *name;		gchar *name;
	gpointer (*construct) (void);		gpointer (*construct) (void);
	void (*free) (gpointer);		void (*free) (gpointer);
	gpointer (*copy) (gpointer);		gpointer (*copy) (gpointer);
	gchar *(*serialize) (gpointer);		gchar *(*serialize) (gpointer);
	/* augmenting information precision using a dictionary */		/* augmenting information precision using a dictionary */
	GdaSqlForeachFunc check_structure_func;		GdaSqlForeachFunc check_structure_func;
	skipping to change at line 270		skipping to change at line 158
	/* 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;
	} GdaSqlStatementContentsInfo;		} GdaSqlStatementContentsInfo;
	/*		/*
	* Validation against a dictionary		* Validation against a dictionary
	*/		*/
	/**
	* GdaSqlStatementCheckValidityData: (skip)
	*
	* Validation against a dictionary
	*/
	typedef struct {		typedef struct {
	GdaConnection *cnc;		GdaConnection *cnc;
	GdaMetaStore *store;		GdaMetaStore *store;
	GdaMetaStruct *mstruct;		GdaMetaStruct *mstruct;
	/*< 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;
	} GdaSqlStatementCheckValidityData;		} GdaSqlStatementCheckValidityData;
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 23 change blocks.
	136 lines changed or deleted		15 lines changed or added

	gda-statement-struct-delete.h		gda-statement-struct-delete.h
	/*		/*
	* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2005 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2005
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	* Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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>
End of changes. 5 change blocks.
	15 lines changed or deleted		12 lines changed or added

	gda-statement-struct-insert.h		gda-statement-struct-insert.h
	/*		/*
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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>
End of changes. 5 change blocks.
	12 lines changed or deleted		12 lines changed or added

	gda-statement-struct-parts.h		gda-statement-struct-parts.h
	/*		/*
	* Copyright (C) 2008 Bas Driessen <bas.driessen@xobas.com>		* Copyright (C) 2007 - 2011 The GNOME Foundation.
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2009 - 2010 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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		G_BEGIN_DECLS
	/*
	* GdaSqlExpr: (skip)
	*
	**/
	typedef struct _GdaSqlExpr GdaSqlExpr;		typedef struct _GdaSqlExpr GdaSqlExpr;
	/*
	* GdaSqlField: (skip)
	*
	**/
	typedef struct _GdaSqlField GdaSqlField;		typedef struct _GdaSqlField GdaSqlField;
	/*
	* GdaSqlTable: (skip)
	*
	**/
	typedef struct _GdaSqlTable GdaSqlTable;		typedef struct _GdaSqlTable GdaSqlTable;
	/*
	* GdaSqlFunction: (skip)
	*
	**/
	typedef struct _GdaSqlFunction GdaSqlFunction;		typedef struct _GdaSqlFunction GdaSqlFunction;
	/*
	* GdaSqlOperation: (skip)
	*
	**/
	typedef struct _GdaSqlOperation GdaSqlOperation;		typedef struct _GdaSqlOperation GdaSqlOperation;
	/*
	* GdaSqlCase: (skip)
	*
	**/
	typedef struct _GdaSqlCase GdaSqlCase;		typedef struct _GdaSqlCase GdaSqlCase;
	/*
	* GdaSqlSelectField: (skip)
	*
	**/
	typedef struct _GdaSqlSelectField GdaSqlSelectField;		typedef struct _GdaSqlSelectField GdaSqlSelectField;
	/*
	* GdaSqlSelectTarget: (skip)
	*
	**/
	typedef struct _GdaSqlSelectTarget GdaSqlSelectTarget;		typedef struct _GdaSqlSelectTarget GdaSqlSelectTarget;
	/*
	* GdaSqlSelectJoin: (skip)
	*
	**/
	typedef struct _GdaSqlSelectJoin GdaSqlSelectJoin;		typedef struct _GdaSqlSelectJoin GdaSqlSelectJoin;
	/*
	* GdaSqlSelectFrom: (skip)
	*
	**/
	typedef struct _GdaSqlSelectFrom GdaSqlSelectFrom;		typedef struct _GdaSqlSelectFrom GdaSqlSelectFrom;
	/*
	* GdaSqlSelectOrder: (skip)
	*
	**/
	typedef struct _GdaSqlSelectOrder GdaSqlSelectOrder;		typedef struct _GdaSqlSelectOrder GdaSqlSelectOrder;
	/*		/*
	* Any Expression		* Any Expression
	*/		*/
	/**		/**
	* GdaSqlExpr: (skip)		* GdaSqlExpr:
	* @any: inheritance structure		* @any: inheritance structure
	* @value: (allow-none): a #GValue, or %NULL. Please see specific note abou		* @value: a #GValue, or %NULL. Please see specific note about this field.
	t this field.		* @param_spec: a #GdaSqlParamSpec, or %NULL if this is not a variable
	* @param_spec: (allow-none): a #GdaSqlParamSpec, or %NULL if this is not a		* @func: not %NULL if expression is a function or aggregate
	variable		* @cond: not %NULL if expression is a condition or an operation
	* @func: (allow-none): not %NULL if expression is a function or aggregate		* @select: not %NULL if expression is a sub select statement (#GdaSqlState
	* @cond: (allow-none): not %NULL if expression is a condition or an operat		mentSelect or #GdaSqlStatementCompound)
	ion		* @case_s: not %NULL if expression is a CASE WHEN ... expression
	* @select: (allow-none): not %NULL if expression is a sub select statement		* @cast_as: not %NULL if expression must be cast to another data type
	(#GdaSqlStatementSelect or #GdaSqlStatementCompound)
	* @case_s: (allow-none): not %NULL if expression is a CASE WHEN ... expres
	sion
	* @cast_as: (allow-none): not %NULL if expression must be cast to another
	data type
	* @value_is_ident: Please see specific note about the @value field		* @value_is_ident: Please see specific note about the @value field
	*		*
	* This structure contains any expression, either as a value (the @value pa rt is set),		* This structure contains any expression, either as a value (the @value pa rt is set),
	* a variable (the @param_spec is set), or as other types of expressions.		* a variable (the @param_spec is set), or as other types of expressions.
	*		*
	* Note 1 about the @value field: if the expression represents a string val ue in the SQL statement,		* Note 1 about the @value field: if the expression represents a string val ue in the SQL statement,
	* the string itself must be represented as it would be in the actual SQL, ie. it should be		* the string itself must be represented as it would be in the actual SQL, ie. it should be
	* escaped (accordingly to the escaping rules of the database which will us e the SQL). For		* escaped (accordingly to the escaping rules of the database which will us e the SQL). For
	* example a string representing the <userinput>'joe'</userinput> value sho uld be		* example a string representing the <userinput>'joe'</userinput> value sho uld be
	* <userinput>"'joe'"</userinput> and not <userinput>"joe"</userinput>.		* <userinput>"'joe'"</userinput> and not <userinput>"joe"</userinput>.
	*		*
	* Note 2 about the @value field: if the expression represents an SQL ident ifier (such as a table		* Note 2 about the @value field: if the expression represents an SQL ident ifier (such as a table
	* or field name), then the @value_is_ident should be set to %0x01, and @va lue should be a string		* or field name), then the @value_is_ident should be set to %TRUE, and @va lue should be a string
	* which may contain double quotes around SQL identifiers which also are re served keywords or which		* which may contain double quotes around SQL identifiers which also are re served keywords or which
	* are case sensitive.		* are case sensitive.
	*/		*/
	struct _GdaSqlExpr {		struct _GdaSqlExpr {
	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		gboolean value_is_ident;
	from 4.0.
	* Non NULL if @value represents an
	SQL identifier
	* Mem in _NOT_ allocated!
	*/
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
			gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
			gpointer _gda_reserved3;
			gpointer _gda_reserved4;
	};		};
	#define GDA_TYPE_SQL_EXPR (gda_sql_expr_get_type())		#define GDA_TYPE_SQL_EXPR (gda_sql_expr_get_type())
	GType gda_sql_expr_get_type (void) G_GNUC_CONST;		GType gda_sql_expr_get_type (void) G_GNUC_CONST;
	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);
	/*		/*
	* Any Table's field		* Any Table's field
	*/		*/
	/**
	* GdaSqlField: (skip)
	* any:
	* @field_name:
	* @validity_meta_table_column:
	*
	* This structure represents the name of a 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 >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	skipping to change at line 187		skipping to change at line 135
	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);
	void gda_sql_field_take_name (GdaSqlField *field, GValue * value);		void gda_sql_field_take_name (GdaSqlField *field, GValue * value);
	/*		/*
	* Any table		* Any table
	*/		*/
	/**
	* GdaSqlTable: (skip)
	* @any:
	* @table_name:
	* @validity_meta_object:
	*
	* This structure represents the name of a 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 >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	skipping to change at line 220		skipping to change at line 160
	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);
	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
	*/		*/
	/**
	* GdaSqlFunction: (skip)
	* @any: inheritance structure
	* @function_name: name of the function , in the form [[catalog.]schema.]fu
	ncti
	* @args_list: list of #GdaSqlExpr expressions, one for each argument
	*
	* This structure represents a function or an aggregate with zero or more a
	rgum
	**/
	struct _GdaSqlFunction {		struct _GdaSqlFunction {
	GdaSqlAnyPart any;		GdaSqlAnyPart any;
	gchar *function_name;		gchar *function_name;
	GSList *args_list;		GSList *args_list;
	/*< private >*/		/*< private >*/
	/* 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 251		skipping to change at line 183
	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) ;
	void gda_sql_function_take_name (GdaSqlFunction *function, GValue *value);		void gda_sql_function_take_name (GdaSqlFunction *function, GValue *value);
	void gda_sql_function_take_args_list (GdaSqlFunction *function, GSList *args);		void gda_sql_function_take_args_list (GdaSqlFunction *function, GSList *args);
	/*		/*
	* An operation on one or more expressions		* An operation on one or more expressions
	*/		*/
	/**
	* GdaSqlOperatorType:
	* @GDA_SQL_OPERATOR_TYPE_AND:
	* @GDA_SQL_OPERATOR_TYPE_OR:
	* @GDA_SQL_OPERATOR_TYPE_EQ:
	* @GDA_SQL_OPERATOR_TYPE_IS:
	* @GDA_SQL_OPERATOR_TYPE_LIKE:
	* @GDA_SQL_OPERATOR_TYPE_ILIKE:
	* @GDA_SQL_OPERATOR_TYPE_BETWEEN:
	* @GDA_SQL_OPERATOR_TYPE_GT:
	* @GDA_SQL_OPERATOR_TYPE_LT:
	* @GDA_SQL_OPERATOR_TYPE_GEQ:
	* @GDA_SQL_OPERATOR_TYPE_LEQ:
	* @GDA_SQL_OPERATOR_TYPE_DIFF:
	* @GDA_SQL_OPERATOR_TYPE_REGEXP:
	* @GDA_SQL_OPERATOR_TYPE_REGEXP_CI:
	* @GDA_SQL_OPERATOR_TYPE_NOT_REGEXP:
	* @GDA_SQL_OPERATOR_TYPE_NOT_REGEXP_CI:
	* @GDA_SQL_OPERATOR_TYPE_SIMILAR:
	* @GDA_SQL_OPERATOR_TYPE_ISNULL:
	* @GDA_SQL_OPERATOR_TYPE_ISNOTNULL:
	* @GDA_SQL_OPERATOR_TYPE_NOT:
	* @GDA_SQL_OPERATOR_TYPE_IN:
	* @GDA_SQL_OPERATOR_TYPE_NOTIN:
	* @GDA_SQL_OPERATOR_TYPE_CONCAT:
	* @GDA_SQL_OPERATOR_TYPE_PLUS:
	* @GDA_SQL_OPERATOR_TYPE_MINUS:
	* @GDA_SQL_OPERATOR_TYPE_STAR:
	* @GDA_SQL_OPERATOR_TYPE_DIV:
	* @GDA_SQL_OPERATOR_TYPE_REM:
	* @GDA_SQL_OPERATOR_TYPE_BITAND:
	* @GDA_SQL_OPERATOR_TYPE_BITOR:
	* @GDA_SQL_OPERATOR_TYPE_BITNOT:
	*/
	typedef enum {		typedef enum {
	GDA_SQL_OPERATOR_TYPE_AND,		GDA_SQL_OPERATOR_TYPE_AND,
	GDA_SQL_OPERATOR_TYPE_OR,		GDA_SQL_OPERATOR_TYPE_OR,
	GDA_SQL_OPERATOR_TYPE_EQ,		GDA_SQL_OPERATOR_TYPE_EQ,
	GDA_SQL_OPERATOR_TYPE_IS,		GDA_SQL_OPERATOR_TYPE_IS,
	GDA_SQL_OPERATOR_TYPE_LIKE,		GDA_SQL_OPERATOR_TYPE_LIKE,
	GDA_SQL_OPERATOR_TYPE_BETWEEN,		GDA_SQL_OPERATOR_TYPE_BETWEEN,
	GDA_SQL_OPERATOR_TYPE_GT,		GDA_SQL_OPERATOR_TYPE_GT,
	GDA_SQL_OPERATOR_TYPE_LT,		GDA_SQL_OPERATOR_TYPE_LT,
	skipping to change at line 317		skipping to change at line 215
	GDA_SQL_OPERATOR_TYPE_NOTIN,		GDA_SQL_OPERATOR_TYPE_NOTIN,
	GDA_SQL_OPERATOR_TYPE_CONCAT,		GDA_SQL_OPERATOR_TYPE_CONCAT,
	GDA_SQL_OPERATOR_TYPE_PLUS,		GDA_SQL_OPERATOR_TYPE_PLUS,
	GDA_SQL_OPERATOR_TYPE_MINUS,		GDA_SQL_OPERATOR_TYPE_MINUS,
	GDA_SQL_OPERATOR_TYPE_STAR,		GDA_SQL_OPERATOR_TYPE_STAR,
	GDA_SQL_OPERATOR_TYPE_DIV,		GDA_SQL_OPERATOR_TYPE_DIV,
	GDA_SQL_OPERATOR_TYPE_REM,		GDA_SQL_OPERATOR_TYPE_REM,
	GDA_SQL_OPERATOR_TYPE_BITAND,		GDA_SQL_OPERATOR_TYPE_BITAND,
	GDA_SQL_OPERATOR_TYPE_BITOR,		GDA_SQL_OPERATOR_TYPE_BITOR,
	GDA_SQL_OPERATOR_TYPE_BITNOT,		GDA_SQL_OPERATOR_TYPE_BITNOT
	GDA_SQL_OPERATOR_TYPE_ILIKE
	} GdaSqlOperatorType;		} GdaSqlOperatorType;
	/**
	* GdaSqlOperation: (skip)
	* @any: inheritance structure
	* @operator_type:
	* @operands: (element-type Gda.SqlExpr): list of #GdaSqlExpr operands
	*
	* This structure represents an operation between one or more operands.
	*/
	struct _GdaSqlOperation {		struct _GdaSqlOperation {
	GdaSqlAnyPart any;		GdaSqlAnyPart any;
	GdaSqlOperatorType operator_type;		GdaSqlOperatorType operator_type;
	GSList *operands;		GSList *operands;
	/*< private >*/		/*< private >*/
	/* 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 350		skipping to change at line 239
	GdaSqlOperation *gda_sql_operation_new (GdaSqlAnyPart *parent);		GdaSqlOperation *gda_sql_operation_new (GdaSqlAnyPart *parent);
	void gda_sql_operation_free (GdaSqlOperation *operat ion);		void gda_sql_operation_free (GdaSqlOperation *operat ion);
	GdaSqlOperation *gda_sql_operation_copy (GdaSqlOperation *operat ion);		GdaSqlOperation *gda_sql_operation_copy (GdaSqlOperation *operat ion);
	gchar *gda_sql_operation_serialize (GdaSqlOperation *operat ion);		gchar *gda_sql_operation_serialize (GdaSqlOperation *operat ion);
	const gchar *gda_sql_operation_operator_to_string (GdaSqlOperatorType op);		const gchar *gda_sql_operation_operator_to_string (GdaSqlOperatorType op);
	GdaSqlOperatorType gda_sql_operation_operator_from_string (const gchar * op);		GdaSqlOperatorType gda_sql_operation_operator_from_string (const gchar * op);
	/*		/*
	* A CASE expression		* A CASE expression
	*/		*/
	/**
	* GdaSqlCase: (skip)
	* @any: inheritance structure
	* @base_expr: expression to test
	* @when_expr_list: list of #GdaSqlExpr, one for each WHEN clause
	* @then_expr_list: list of #GdaSqlExpr, one for each THEN clause
	* @else_expr: default expression for the CASE
	*
	* This structure represents a CASE WHEN... construct
	**/
	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 >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	skipping to change at line 382		skipping to change at line 261
	};		};
	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);
	/*		/*
	* Any expression in a SELECT ... before the FROM clause		* Any expression in a SELECT ... before the FROM clause
	*/		*/
	/**
	* GdaSqlSelectField: (skip)
	* @any: inheritance structure
	* @expr: expression
	* @field_name: field name part of @expr if @expr represents a field
	* @table_name: table name part of @expr if @expr represents a field
	* @as: alias
	* @validity_meta_object:
	* @validity_meta_table_column:
	*
	* This structure represents a selected item in a SELECT statement (when ex
	ecut
	* will have one column per selected item). Note that the @table_name and
	* @field_name field parts <emphasis>will be</emphasis> overwritten by &LIB
	GDA;
	* set the value of @expr->value instead.
	**/
	struct _GdaSqlSelectField		struct _GdaSqlSelectField
	{		{
	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;
	skipping to change at line 428		skipping to change at line 292
	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);
	void gda_sql_select_field_take_star_value(GdaSqlSelectField * field, GValue *value);		void gda_sql_select_field_take_star_value(GdaSqlSelectField * field, GValue *value);
	void gda_sql_select_field_take_expr (GdaSqlSelectField * field, GdaSqlExpr *expr);		void gda_sql_select_field_take_expr (GdaSqlSelectField * field, GdaSqlExpr *expr);
	void gda_sql_select_field_take_alias (GdaSqlSelectField * field, GValue *alias);		void gda_sql_select_field_take_alias (GdaSqlSelectField * field, GValue *alias);
	/*		/*
	* Any TARGET ... in a SELECT statement		* Any TARGET ... in a SELECT statement
	*/		*/
	/**
	* GdaSqlSelectTarget: (skip)
	* @any: inheritance structure
	* @expr: expression
	* @table_name: table name part of @expr if @expr represents a table
	* @as: alias
	* @validity_meta_object:
	*
	* This structure represents a target used to fetch data from in a SELECT s
	tate
	* a sub select. Note that the @table_name
	* part <emphasis>will be</emphasis> overwritten by &LIBGDA;,
	* set the value of @expr->value instead.
	*/
	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;
	skipping to change at line 470		skipping to change at line 321
	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);
	void gda_sql_select_target_take_table_name (GdaSqlSelectTarg et *target, GValue *value);		void gda_sql_select_target_take_table_name (GdaSqlSelectTarg et *target, GValue *value);
	void gda_sql_select_target_take_select (GdaSqlSelectTarget * target, GdaSqlStatement *stmt);		void gda_sql_select_target_take_select (GdaSqlSelectTarget * target, GdaSqlStatement *stmt);
	void gda_sql_select_target_take_alias (GdaSqlSelectTarget *t arget, GValue *alias);		void gda_sql_select_target_take_alias (GdaSqlSelectTarget *t arget, GValue *alias);
	/*		/*
	* Any JOIN ... in a SELECT statement		* Any JOIN ... in a SELECT statement
	*/		*/
	/**
	* GdaSqlSelectJoinType:
	* @GDA_SQL_SELECT_JOIN_CROSS:
	* @GDA_SQL_SELECT_JOIN_NATURAL:
	* @GDA_SQL_SELECT_JOIN_INNER:
	* @GDA_SQL_SELECT_JOIN_LEFT:
	* @GDA_SQL_SELECT_JOIN_RIGHT:
	* @GDA_SQL_SELECT_JOIN_FULL:
	*/
	typedef enum {		typedef enum {
	GDA_SQL_SELECT_JOIN_CROSS,		GDA_SQL_SELECT_JOIN_CROSS,
	GDA_SQL_SELECT_JOIN_NATURAL,		GDA_SQL_SELECT_JOIN_NATURAL,
	GDA_SQL_SELECT_JOIN_INNER,		GDA_SQL_SELECT_JOIN_INNER,
	GDA_SQL_SELECT_JOIN_LEFT,		GDA_SQL_SELECT_JOIN_LEFT,
	GDA_SQL_SELECT_JOIN_RIGHT,		GDA_SQL_SELECT_JOIN_RIGHT,
	GDA_SQL_SELECT_JOIN_FULL		GDA_SQL_SELECT_JOIN_FULL
	} GdaSqlSelectJoinType;		} GdaSqlSelectJoinType;
	/**
	* GdaSqlSelectJoin: (skip)
	* @any: inheritance structure
	* @type: type of join
	* @position: represents a join between a target at (pos &lt; @position) an
	d the one at @position
	* @expr: (allow-none): joining expression, or %NULL
	* @use: (allow-none): list of #GdaSqlField pointers to use when joining, o
	r %NULL
	*
	* This structure represents a join between two targets in a SELECT stateme
	nt.
	*/
	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 >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	skipping to change at line 522		skipping to change at line 353
	GdaSqlSelectJoin *gda_sql_select_join_new (GdaSqlAnyPart *paren t);		GdaSqlSelectJoin *gda_sql_select_join_new (GdaSqlAnyPart *paren t);
	void gda_sql_select_join_free (GdaSqlSelectJoin *jo in);		void gda_sql_select_join_free (GdaSqlSelectJoin *jo in);
	GdaSqlSelectJoin *gda_sql_select_join_copy (GdaSqlSelectJoin *jo in);		GdaSqlSelectJoin *gda_sql_select_join_copy (GdaSqlSelectJoin *jo in);
	gchar *gda_sql_select_join_serialize (GdaSqlSelectJoin *jo in);		gchar *gda_sql_select_join_serialize (GdaSqlSelectJoin *jo in);
	const gchar *gda_sql_select_join_type_to_string (GdaSqlSelectJoinType type);		const gchar *gda_sql_select_join_type_to_string (GdaSqlSelectJoinType type);
	/*		/*
	* Any FROM ... in a SELECT statement		* Any FROM ... in a SELECT statement
	*/		*/
	/**
	* GdaSqlSelectFrom: (skip)
	* @any: inheritance structure
	* @targets: (element-type Gda.SqlSelectTarget): list of #GdaSqlSelectTarge
	t
	* @joins: (element-type Gda.SqlSelectJoin): list of #GdaSqlSelectJoin
	*
	* This structure represents the FROM clause of a SELECT statement, it list
	s targets and joins
	*/
	struct _GdaSqlSelectFrom		struct _GdaSqlSelectFrom
	{		{
	GdaSqlAnyPart any;		GdaSqlAnyPart any;
	GSList *targets;		GSList *targets;
	GSList *joins;		GSList *joins;
	/*< private >*/		/*< private >*/
	/* 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 553		skipping to change at line 376
	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);
	void gda_sql_select_from_take_new_target(GdaSqlSelectFrom *fr om, GdaSqlSelectTarget *target);		void gda_sql_select_from_take_new_target(GdaSqlSelectFrom *fr om, GdaSqlSelectTarget *target);
	void gda_sql_select_from_take_new_join (GdaSqlSelectFrom *fr om, GdaSqlSelectJoin *join);		void gda_sql_select_from_take_new_join (GdaSqlSelectFrom *fr om, GdaSqlSelectJoin *join);
	/*		/*
	* Any expression in a SELECT ... after the ORDER BY		* Any expression in a SELECT ... after the ORDER BY
	*/		*/
	/**
	* GdaSqlSelectOrder: (skip)
	* @any: inheritance structure
	* @expr: expression to order on
	* @asc: TRUE is ordering is ascending
	* @collation_name: name of the collation to use for ordering
	*
	* This structure represents the ordering of a SELECT statement.
	*/
	struct _GdaSqlSelectOrder		struct _GdaSqlSelectOrder
	{		{
	GdaSqlAnyPart any;		GdaSqlAnyPart any;
	GdaSqlExpr *expr;		GdaSqlExpr *expr;
	gboolean asc;		gboolean asc;
	gchar *collation_name;		gchar *collation_name;
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
End of changes. 35 change blocks.
	232 lines changed or deleted		30 lines changed or added

	gda-statement-struct-pspec.h		gda-statement-struct-pspec.h
	/*		/*
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, 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		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		12 lines changed or added

	gda-statement-struct-select.h		gda-statement-struct-select.h
	/*		/*
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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>
End of changes. 5 change blocks.
	12 lines changed or deleted		12 lines changed or added

	gda-statement-struct-trans.h		gda-statement-struct-trans.h
	/*		/*
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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>
End of changes. 5 change blocks.
	12 lines changed or deleted		12 lines changed or added

	gda-statement-struct-unknown.h		gda-statement-struct-unknown.h
	/*		/*
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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>
End of changes. 5 change blocks.
	16 lines changed or deleted		12 lines changed or added

	gda-statement-struct-update.h		gda-statement-struct-update.h
	/*		/*
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#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>
End of changes. 5 change blocks.
	12 lines changed or deleted		12 lines changed or added

	gda-statement-struct-util.h		gda-statement-struct-util.h
	/*		/*
	* Copyright (C) 2005 Dan Winship <danw@src.gnome.org>		* Copyright (C) 2007 - 2011 The GNOME Foundation.
	* Copyright (C) 2005 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2005
	* Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, 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		G_BEGIN_DECLS
	/* utility functions */		/* utility functions */
	gchar *_remove_quotes (gchar *str);		gchar *_remove_quotes (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 _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		gchar *gda_sql_identifier_force_quotes (const gchar *str);
	gboolean gda_sql_identifier_needs_quotes (const gchar *str);		gchar *gda_sql_identifier_prepare_for_compare (gchar *str);
	gchar *gda_sql_identifier_add_quotes (const 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		G_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	19 lines changed or deleted		17 lines changed or added

	gda-statement-struct.h		gda-statement-struct.h
	/*		/*
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 Vivien Malerba
	* Copyright (C) 2010 Murray Cumming <murrayc@murrayc.com>
	*		*
	* 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 Lesser General Public		* modify it under the terms of the GNU Library General Public License as
	* License as published by the Free Software Foundation; either		* published by the Free Software Foundation; either version 2 of the
	* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef _GDA_STATEMENT_STRUCT_H_		#ifndef _GDA_STATEMENT_STRUCT_H_
	#define _GDA_STATEMENT_STRUCT_H_		#define _GDA_STATEMENT_STRUCT_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 <libgda/gda-meta-store.h>		#include <libgda/gda-meta-store.h>
End of changes. 5 change blocks.
	12 lines changed or deleted		12 lines changed or added

	gda-statement.h		gda-statement.h
	/*		/* gda-statement.h
	* Copyright (C) 2008 - 2009 Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is free software; you can redistribute it and/or		* Copyright (C) 2007 - 2009 Vivien Malerba
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef _GDA_STATEMENT_H_		#ifndef _GDA_STATEMENT_H_
	#define _GDA_STATEMENT_H_		#define _GDA_STATEMENT_H_
	#include <glib-object.h>		#include <glib-object.h>
	#include <sql-parser/gda-statement-struct.h>		#include <sql-parser/gda-statement-struct.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		14 lines changed or added

	gda-thread-wrapper.h		gda-thread-wrapper.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2011 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_THREAD_WRAPPER_H__		#ifndef __GDA_THREAD_WRAPPER_H__
	#define __GDA_THREAD_WRAPPER_H__		#define __GDA_THREAD_WRAPPER_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define GDA_TYPE_THREAD_WRAPPER (gda_thread_wrapper_get_type())		#define GDA_TYPE_THREAD_WRAPPER (gda_thread_wrapper_get_type())
	skipping to change at line 62		skipping to change at line 65
	GObjectClass object_class;		GObjectClass object_class;
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	/**
	* GdaThreadNotificationType:
	* @GDA_THREAD_NOTIFICATION_SIGNAL: the notification regards a signal
	* @GDA_THREAD_NOTIFICATION_JOB: the notification regards a job finished
	*
	* Defines the kind of notification which can be obtained when reading from
	te #GIOChannel
	* returned by gda_thread_wrapper_get_io_channel().
	*/
	typedef enum {
	GDA_THREAD_NOTIFICATION_JOB = 0x01,
	GDA_THREAD_NOTIFICATION_SIGNAL = 0x02
	} GdaThreadNotificationType;
	/**
	* GdaThreadNotification:
	* @type: the notification type
	* @job_id: the job ID, if @type is a #GDA_THREAD_NOTIFICATION_JOB
	*
	* A notification to be read through the #GIOChannel which is returned by g
	da_thread_wrapper_get_io_channel(),
	* for example:
	* <programlisting><![CDATA[
	* gboolean
	* wrapper_ioc_cb (GIOChannel *source, GIOCondition condition, gpointer dat
	a)
	* {
	* GIOStatus status;
	* gsize nread;
	* GdaThreadNotification notif;
	* if (condition & G_IO_IN) {
	* status = g_io_channel_read_chars (source, (gchar*) &notif, sizeof
	(notif), &nread, NULL);
	* if ((status != G_IO_STATUS_NORMAL) || (nread != sizeof (notif)))
	* goto onerror;
	* switch (notif.type) {
	* case GDA_THREAD_NOTIFICATION_JOB:
	* check_for_wrapper_result (bcnc);
	* break;
	* case GDA_THREAD_NOTIFICATION_SIGNAL:
	* gda_thread_wrapper_iterate (bcnc->priv->wrapper, FALSE);
	* break;
	* default:
	* goto onerror;
	* break;
	* }
	* }
	* if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
	* goto onerror;
	* return TRUE; // keep callback
	*
	* onerror:
	* g_io_channel_shutdown (bcnc->priv->ioc, FALSE, NULL);
	* return FALSE; // removed callback
	* }
	*
	* {
	* [...]
	* GIOChannel *ioc;
	* ioc = gda_thread_wrapper_get_io_channel (wrapper);
	* if (!ioc)
	* [handle error]
	* else {
	* guint watch_id;
	* watch_id = g_io_add_watch (ioc, G_IO_IN | G_IO_HUP | G_IO_ERR |
	G_IO_NVAL,
	* (GIOFunc) wrapper_ioc_cb, NULL);
	* }
	* }
	* ]]></programlisting>
	*/
	typedef struct {
	GdaThreadNotificationType type;
	guint job_id;
	} GdaThreadNotification;
	/**
	* GdaThreadWrapperFunc:
	* @arg: pointer to the data (which is the @arg argument passed to gda_thre
	ad_wrapper_execute_void())
	* @error: a place to store errors
	* @Returns: a pointer to some data which will be returned by gda_thread_wr
	apper_fetch_result()
	*
	* Specifies the type of function to be passed to gda_thread_wrapper_execut
	e().
	*/
	typedef gpointer (*GdaThreadWrapperFunc) (gpointer arg, GError **error);		typedef gpointer (*GdaThreadWrapperFunc) (gpointer arg, GError **error);
	typedef void (*GdaThreadWrapperVoidFunc) (gpointer arg, GError **error);		typedef void (*GdaThreadWrapperVoidFunc) (gpointer arg, GError **error);
	typedef void (*GdaThreadWrapperCallback) (GdaThreadWrapper *wrapper, gpoint er instance, const gchar *signame,		typedef void (*GdaThreadWrapperCallback) (GdaThreadWrapper *wrapper, gpoint er instance, const gchar *signame,
	gint n_param_values, const GValue *param_values, gpointer gda_reserved,		gint n_param_values, const GValue *param_values, gpointer gda_reserved,
	gpointer data);		gpointer data);
	/**
	* SECTION:gda-thread-wrapper
	* @short_description: Execute functions in a sub thread
	* @title: GdaThreadWrapper
	* @stability: Stable
	* @see_also:
	*
	* The purpose of the #GdaThreadWrapper object is to execute functions in a
	n isolated sub thread. As the
	* #GdaThreadWrapper is thread safe, one is able to isolate some code's exe
	cution is a <emphasis>private</emphasis>
	* <emphasis>worker</emphasis> thread, and make a non thread safe code thre
	ad safe.
	*
	* The downside of this is that the actual execution of the code will be sl
	ower as it requires
	* threads to be synchronized.
	*
	* The #GdaThreadWrapper implements its own locking mechanism and can safel
	y be used from multiple
	* threads at once without needing further locking.
	*
	* Each thread using a #GdaThreadWrapper object can use it as if it was the
	only user: the #GdaThreadWrapper will
	* simply dispatch all the execution requests to its private <emphasis>work
	er</emphasis> thread and report the
	* execution's status only to the thread which made the request.
	*
	* The user can also specify a callback function to be called when an objec
	t exmits a signal while being
	* used by the worker thread, see the gda_thread_wrapper_connect_raw() meth
	od.
	*
	* The following diagram illustrates the conceptual working of the #GdaThre
	adWrapper object: here two user threads
	* are represented (assigned a red and green colors), both using a single #
	GdaThreadWrapper, so in this diagram, 3 threads
	* are present. The communication between the threads are handled by some #
	GAsyncQueue objects (in a transparent way for
	* the user, presented here only for illustration purposes). The queue repr
	esented in yellow is where jobs are
	* pushed by each user thread (step 1), and popped by the worker thread (st
	ep 2). Once the worker thread has finished
	* with a job, it stores the result along with the job and pushes it to the
	queue dedicated to the user thread
	* (step 3) in this example the red queue (because the job was issued from
	the thread represented in red). The last
	* step is when the user fetches the result (in its user thread), step 4.
	*
	* If, when the worker thread is busy with a job, a signal is emitted, and
	if the user has set up a signal handler
	* using gda_thread_wrapper_connect_raw(),
	* then a "job as signal" is created by the worker thread and pushed to the
	user thread as illustrated
	* at the bottom of the diagram.
	* <mediaobject>
	* <imageobject role="html">
	* <imagedata fileref="thread-wrapper.png" format="PNG" contentwidth="1
	70mm"/>
	* </imageobject>
	* <textobject>
	* <phrase>GdaThreadWrapper's conceptual working</phrase>
	* </textobject>
	* </mediaobject>
	*
	* It's the user's responsability to regularly check if a submitted job has
	completed
	* (using gda_thread_wrapper_fetch_result()) or if a signal
	* has been emitted by an object while in the worker thread and needs to be
	handled by the #GdaThreadWrapper
	* to call the associated callback (using gda_thread_wrapper_iterate() or a
	utomatically done when
	* calling gda_thread_wrapper_fetch_result()).
	*
	* However, when a main loop is available, the #GdaThreadWrapper can emit n
	otifications through a
	* #GIOChannel which can be intregated in the main loop. The #GIOChannel ca
	n be created
	* using gda_thread_wrapper_get_io_channel().
	*/
	GType gda_thread_wrapper_get_type (void) G_GNUC_C ONST;		GType gda_thread_wrapper_get_type (void) G_GNUC_C ONST;
	GdaThreadWrapper *gda_thread_wrapper_new (void);		GdaThreadWrapper *gda_thread_wrapper_new (void);
	GIOChannel *gda_thread_wrapper_get_io_channel (GdaThreadWrapp
	er *wrapper);
	void gda_thread_wrapper_unset_io_channel (GdaThreadWrapp
	er *wrapper);
	guint gda_thread_wrapper_execute (GdaThreadWrapp er *wrapper, GdaThreadWrapperFunc func,		guint gda_thread_wrapper_execute (GdaThreadWrapp er *wrapper, GdaThreadWrapperFunc func,
	gpointer arg, G DestroyNotify arg_destroy_func, GError **error);		gpointer arg, G DestroyNotify arg_destroy_func, GError **error);
	guint gda_thread_wrapper_execute_void (GdaThreadWrapp er *wrapper, GdaThreadWrapperVoidFunc func,		guint gda_thread_wrapper_execute_void (GdaThreadWrapp er *wrapper, GdaThreadWrapperVoidFunc func,
	gpointer arg, G DestroyNotify arg_destroy_func, GError **error);		gpointer arg, G DestroyNotify arg_destroy_func, GError **error);
	gboolean gda_thread_wrapper_cancel (GdaThreadWrapp er *wrapper, guint id);		gboolean gda_thread_wrapper_cancel (GdaThreadWrapp er *wrapper, guint id);
	void gda_thread_wrapper_iterate (GdaThreadWrapp er *wrapper, gboolean may_block);		void gda_thread_wrapper_iterate (GdaThreadWrapp er *wrapper, gboolean may_block);
	gpointer gda_thread_wrapper_fetch_result (GdaThreadWrapp er *wrapper, gboolean may_lock,		gpointer gda_thread_wrapper_fetch_result (GdaThreadWrapp er *wrapper, gboolean may_lock,
	guint exp_id, G Error **error);		guint exp_id, G Error **error);
End of changes. 8 change blocks.
	184 lines changed or deleted		16 lines changed or added

	gda-transaction-status-private.h		gda-transaction-status-private.h
	/*		/* GDA client library
	* Copyright (C) 2006 Vivien Malerba <vivien@src.gnome.org>		* Copyright (C) 1998 - 2006 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TRANSACTION_STATUS_PRIVATE_H__		#ifndef __GDA_TRANSACTION_STATUS_PRIVATE_H__
	#define __GDA_TRANSACTION_STATUS_PRIVATE_H__		#define __GDA_TRANSACTION_STATUS_PRIVATE_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	GdaTransactionStatusEvent *gda_transaction_status_add_event_svp (GdaTransac tionStatus *tstatus, const gchar *svp_name);		GdaTransactionStatusEvent *gda_transaction_status_add_event_svp (GdaTransac tionStatus *tstatus, const gchar *svp_name);
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-transaction-status.h		gda-transaction-status.h
	/*		/* GDA client library
	* Copyright (C) 2006 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 1998 - 2006 The GNOME Foundation.
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	* Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TRANSACTION_STATUS_H__		#ifndef __GDA_TRANSACTION_STATUS_H__
	#define __GDA_TRANSACTION_STATUS_H__		#define __GDA_TRANSACTION_STATUS_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-enums.h>		#include <libgda/gda-enums.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 66		skipping to change at line 69
	gchar *svp_name; /* save point name if this e vent corresponds to a new save point */		gchar *svp_name; /* save point name if this e vent corresponds to a new save point */
	gchar *sql; /* SQL to store SQL queries in transactions */		gchar *sql; /* SQL to store SQL queries in transactions */
	GdaTransactionStatus *sub_trans;/* sub transaction event */		GdaTransactionStatus *sub_trans;/* sub transaction event */
	} pl;		} pl;
	GdaConnectionEvent *conn_event;		GdaConnectionEvent *conn_event;
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
	};		};
	/**
	* GdaTransactionStatus:
	* @name:
	* @isolation_level:
	* @state:
	* @events: (element-type Gda.TransactionStatusEvent):
	*
	*/
	struct _GdaTransactionStatus {		struct _GdaTransactionStatus {
	GObject object;		GObject object;
	gchar *name;		gchar *name;
	GdaTransactionIsolation isolation_level;		GdaTransactionIsolation isolation_level;
	GdaTransactionStatusState state;		GdaTransactionStatusState state;
	GList *events;		GList *events;
	gpointer _gda_reserved1;		gpointer _gda_reserved1;
	gpointer _gda_reserved2;		gpointer _gda_reserved2;
End of changes. 6 change blocks.
	22 lines changed or deleted		18 lines changed or added

	gda-tree-manager.h		gda-tree-manager.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	* Copyright (C) 2010 Robert Ancell <robert.ancell@canonical.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_MANAGER_H__		#ifndef __GDA_TREE_MANAGER_H__
	#define __GDA_TREE_MANAGER_H__		#define __GDA_TREE_MANAGER_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include "gda-decl.h"		#include "gda-decl.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 64		skipping to change at line 66
	struct _GdaTreeManagerClass {		struct _GdaTreeManagerClass {
	GObjectClass object_class;		GObjectClass object_class;
	/* virtual methods */		/* virtual methods */
	/**		/**
	* update_children		* update_children
	*		*
	* Returns: NULL if an error occurred, and @out_error is set to TRUE		* Returns: NULL if an error occurred, and @out_error is set to TRUE
	*/		*/
	GSList *(*update_children) (GdaTreeManager *manager, GdaTreeNode *no de,		GSList *(*update_children) (GdaTreeManager *manager, GdaTreeNode *no de,
	const GSList *children_nodes,		const GSList *children_nodes,
	gboolean *out_error, GError **error);		gboolean *out_error, GError **error);
	/*< private >*/		/*< private >*/
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	void (*_gda_reserved3) (void);		void (*_gda_reserved3) (void);
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	GType gda_tree_manager_get_type (void) G_G NUC_CONST;		GType gda_tree_manager_get_type (void) G_G NUC_CONST;
End of changes. 6 change blocks.
	15 lines changed or deleted		18 lines changed or added

	gda-tree-mgr-columns.h		gda-tree-mgr-columns.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_MGR_COLUMNS_H__		#ifndef __GDA_TREE_MGR_COLUMNS_H__
	#define __GDA_TREE_MGR_COLUMNS_H__		#define __GDA_TREE_MGR_COLUMNS_H__
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include "gda-tree-manager.h"		#include "gda-tree-manager.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-tree-mgr-label.h		gda-tree-mgr-label.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_MGR_LABEL_H__		#ifndef __GDA_TREE_MGR_LABEL_H__
	#define __GDA_TREE_MGR_LABEL_H__		#define __GDA_TREE_MGR_LABEL_H__
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include "gda-tree-manager.h"		#include "gda-tree-manager.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-tree-mgr-schemas.h		gda-tree-mgr-schemas.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_MGR_SCHEMAS_H__		#ifndef __GDA_TREE_MGR_SCHEMAS_H__
	#define __GDA_TREE_MGR_SCHEMAS_H__		#define __GDA_TREE_MGR_SCHEMAS_H__
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include "gda-tree-manager.h"		#include "gda-tree-manager.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-tree-mgr-select.h		gda-tree-mgr-select.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_MGR_SELECT_H__		#ifndef __GDA_TREE_MGR_SELECT_H__
	#define __GDA_TREE_MGR_SELECT_H__		#define __GDA_TREE_MGR_SELECT_H__
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include "gda-tree-manager.h"		#include "gda-tree-manager.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-tree-mgr-tables.h		gda-tree-mgr-tables.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_MGR_TABLES_H__		#ifndef __GDA_TREE_MGR_TABLES_H__
	#define __GDA_TREE_MGR_TABLES_H__		#define __GDA_TREE_MGR_TABLES_H__
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include "gda-tree-manager.h"		#include "gda-tree-manager.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-tree-node.h		gda-tree-node.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_NODE_H__		#ifndef __GDA_TREE_NODE_H__
	#define __GDA_TREE_NODE_H__		#define __GDA_TREE_NODE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include "gda-decl.h"		#include "gda-decl.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-tree.h		gda-tree.h
	/*		/* GDA library
	* Copyright (C) 2009 - 2011 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_TREE_H__		#ifndef __GDA_TREE_H__
	#define __GDA_TREE_H__		#define __GDA_TREE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <stdio.h>		#include <stdio.h>
	#include "gda-decl.h"		#include "gda-decl.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 73		skipping to change at line 76
	void (*_gda_reserved4) (void);		void (*_gda_reserved4) (void);
	};		};
	GType gda_tree_get_type (void) G_GNUC_CONST;		GType gda_tree_get_type (void) G_GNUC_CONST;
	GdaTree* gda_tree_new (void);		GdaTree* gda_tree_new (void);
	void gda_tree_add_manager (GdaTree *tree, GdaTreeManager *m anager);		void gda_tree_add_manager (GdaTree *tree, GdaTreeManager *m anager);
	void gda_tree_clean (GdaTree *tree);		void gda_tree_clean (GdaTree *tree);
	gboolean gda_tree_update_all (GdaTree *tree, GError **error);		gboolean gda_tree_update_all (GdaTree *tree, GError **error);
	gboolean gda_tree_update_part (GdaTree *tree, GdaTreeNode *node , GError **error);		gboolean gda_tree_update_part (GdaTree *tree, GdaTreeNode *node , GError **error);
	gboolean gda_tree_update_children (GdaTree *tree, GdaTreeNode *no de, GError **error);
	GSList *gda_tree_get_nodes_in_path (GdaTree *tree, const gchar * tree_path, gboolean use_names);		GSList *gda_tree_get_nodes_in_path (GdaTree *tree, const gchar * tree_path, gboolean use_names);
	GdaTreeNode *gda_tree_get_node (GdaTree *tree, const gchar *tree _path, gboolean use_names);		GdaTreeNode *gda_tree_get_node (GdaTree *tree, const gchar *tree _path, gboolean use_names);
	gchar *gda_tree_get_node_path (GdaTree *tree, GdaTreeNode *node );		gchar *gda_tree_get_node_path (GdaTree *tree, GdaTreeNode *node );
	GdaTreeManager *gda_tree_get_node_manager (GdaTree *tree, GdaTreeNode *n ode);		GdaTreeManager *gda_tree_get_node_manager (GdaTree *tree, GdaTreeNode *n ode);
	void gda_tree_set_attribute (GdaTree *tree, const gchar *attr ibute, const GValue *value,		void gda_tree_set_attribute (GdaTree *tree, const gchar *attr ibute, const GValue *value,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	void gda_tree_dump (GdaTree *tree, GdaTreeNode *node , FILE *stream);		void gda_tree_dump (GdaTree *tree, GdaTreeNode *node , FILE *stream);
End of changes. 6 change blocks.
	13 lines changed or deleted		16 lines changed or added

	gda-util.h		gda-util.h
	/*		/* GDA common library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 1998 - 2010 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	* Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
	* Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Rodrigo Moya <rodrigo@gnome-db.org>
	* License as published by the Free Software Foundation; either		* Vivien Malerba <malerba@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_UTIL_H__		#ifndef __GDA_UTIL_H__
	#define __GDA_UTIL_H__		#define __GDA_UTIL_H__
	#include <glib.h>		#include <glib.h>
	#include "gda-holder.h"		#include "gda-holder.h"
	#include "gda-row.h"		#include "gda-row.h"
	#include "gda-connection.h"		#include "gda-connection.h"
	#include <sql-parser/gda-sql-statement.h>		#include <sql-parser/gda-sql-statement.h>
	skipping to change at line 61		skipping to change at line 58
	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,		gchar *gda_sql_identifier_quote (const gchar *id, GdaConnection *cnc, GdaServerProvider *prov,
	gboolean meta_store_convention, gbool ean force_quotes);		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_check_data_model_v (GdaDataModel *model, gint nbco ls, GType* types);
	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);
	GdaSqlStatement *gda_statement_rewrite_for_default_values (GdaStatement *st mt, GdaSet *params,		GdaSqlStatement *gda_statement_rewrite_for_default_values (GdaStatement *st mt, GdaSet *params,
	gboolean remove, GError **error);		gboolean remove, GError **error);
	/*		/*
	* translate any text to an alphanumerical text		* translate any text to an alphanumerical text
	*/		*/
	gchar *gda_text_to_alphanum (const gchar *text);		gchar *gda_text_to_alphanum (const gchar *text);
	gchar *gda_alphanum_to_text (gchar *text);		gchar *gda_alphanum_to_text (gchar *text);
	/*		/*
	* Statement computation (using data from meta store)		* Statement computation from meta store
	*/		*/
	GdaSqlExpr *gda_compute_unique_table_row_condition (GdaSqlStatementSel ect *stsel, GdaMetaTable *mtable,		GdaSqlExpr *gda_compute_unique_table_row_condition (GdaSqlStatementSel ect *stsel, GdaMetaTable *mtable,
	gboolean require_pk , GError **error);		gboolean require_pk , GError **error);
	GdaSqlExpr *gda_compute_unique_table_row_condition_with_cnc (GdaConnec tion *cnc,		GdaSqlExpr *gda_compute_unique_table_row_condition_with_cnc (GdaConne ction *cnc,
	GdaSqlSta tementSelect *stsel,		GdaSqlSta tementSelect *stsel,
	GdaMetaTa ble *mtable, gboolean require_pk,		GdaMetaTa ble *mtable, gboolean require_pk,
	GError ** error);		GError ** error);
	gboolean gda_compute_dml_statements (GdaConnection *cnc, GdaStateme nt *select_stmt, gboolean require_pk,		gboolean gda_compute_dml_statements (GdaConnection *cnc, GdaStateme nt *select_stmt, gboolean require_pk,
	GdaStatement **insert_stmt, Gda Statement **update_stmt, GdaStatement **delete_stmt,		GdaStatement **insert_stmt, Gda Statement **update_stmt, GdaStatement **delete_stmt,
	GError **error);		GError **error);
	GdaSqlStatement *gda_compute_select_statement_from_update (GdaStatement *up date_stmt, GError **error);		GdaSqlStatement *gda_compute_select_statement_from_update (GdaStatement *up date_stmt, GError **error);
	GdaSqlStatement *gda_rewrite_sql_statement_for_null_parameters (GdaSqlState
	ment *sqlst, GdaSet *params,
	gboolean *ou
	t_modified, GError **error);
	gboolean gda_rewrite_statement_for_null_parameters (GdaStatement *s
	tmt, GdaSet *params,
	GdaStatement **o
	ut_stmt, GError **error);
	/*		/*
	* DSN and connection string manipulations		* DSN and connection string manipulations
	*/		*/
	gchar *gda_rfc1738_encode (const gchar *string);		gchar *gda_rfc1738_encode (const gchar *string);
	gboolean gda_rfc1738_decode (gchar *string);		gboolean gda_rfc1738_decode (gchar *string);
	void gda_dsn_split (const gchar *string, gchar **out_ dsn,		void gda_dsn_split (const gchar *string, gchar **out_ dsn,
	gchar **out_username, gchar **out_ password);		gchar **out_username, gchar **out_ password);
	void gda_connection_string_split (const gchar *string, gchar **out_ cnc_params, gchar **out_provider,		void gda_connection_string_split (const gchar *string, gchar **out_ cnc_params, gchar **out_provider,
	gchar **out_username, gchar **out_ password);		gchar **out_username, gchar **out_ password);
End of changes. 9 change blocks.
	30 lines changed or deleted		19 lines changed or added

	gda-value.h		gda-value.h
	/*		/* GDA library
	* Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>		* Copyright (C) 1998 - 2009 The GNOME Foundation.
	* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
	* Copyright (C) 2002 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2003 Akira TAGOH <tagoh@gnome-db.org>
	* Copyright (C) 2003 Danilo Schoeneberg <dschoene@src.gnome.org>
	* Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
	* Copyright (C) 2004 - 2007 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2004 Paisa Seeluangsawat <paisa@users.sf.net>
	* Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
	* Copyright (C) 2009 Bas Driessen <bas.driessen@xobas.com>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		* Juan-Mariano de Goyeneche <jmseyas@dit.upm.es> (BLOB issues)
			* Daniel Espinosa Ortiz <esodan@gmail.com> (Port to GValue)
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VALUE_H__		#ifndef __GDA_VALUE_H__
	#define __GDA_VALUE_H__		#define __GDA_VALUE_H__
	#include <time.h>		#include <time.h>
	#include <glib.h>		#include <glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <libxml/tree.h>		#include <libxml/tree.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define GDA_TIMEZONE_INVALID (2*12*60*60)		#define GDA_TIMEZONE_INVALID (2*12*60*60)
	/* Definition of the GType's values used in GValue*/		/* Definition of the GType's values used in GValue*/
	#define GDA_TYPE_NULL 0		#define GDA_TYPE_NULL 0
	#define GDA_TYPE_DEFAULT (gda_default_get_type())
	#define GDA_TYPE_BINARY (gda_binary_get_type())		#define GDA_TYPE_BINARY (gda_binary_get_type())
	#define GDA_TYPE_BLOB (gda_blob_get_type())		#define GDA_TYPE_BLOB (gda_blob_get_type())
	#define GDA_TYPE_GEOMETRIC_POINT (gda_geometricpoint_get_type())		#define GDA_TYPE_GEOMETRIC_POINT (gda_geometricpoint_get_type())
	#define GDA_TYPE_LIST (gda_value_list_get_type())
	#define GDA_TYPE_NUMERIC (gda_numeric_get_type())		#define GDA_TYPE_NUMERIC (gda_numeric_get_type())
	#define GDA_TYPE_SHORT (gda_short_get_type())		#define GDA_TYPE_SHORT (gda_short_get_type())
	#define GDA_TYPE_USHORT (gda_ushort_get_type())		#define GDA_TYPE_USHORT (gda_ushort_get_type())
	#define GDA_TYPE_TIME (gda_time_get_type())		#define GDA_TYPE_TIME (gda_time_get_type())
	#define GDA_TYPE_TIMESTAMP (gda_timestamp_get_type())		#define GDA_TYPE_TIMESTAMP (gda_timestamp_get_type())
	/* Definition of the GDA_VALUE_HOLDS macros */		/* Definition of the GDA_VALUE_HOLDS macros */
	#define GDA_VALUE_HOLDS_DEFAULT(value) G_VALUE_HOLDS(value, GDA_TYP E_DEFAULT)
	#define GDA_VALUE_HOLDS_BINARY(value) G_VALUE_HOLDS(value, GDA_TYP E_BINARY)		#define GDA_VALUE_HOLDS_BINARY(value) G_VALUE_HOLDS(value, GDA_TYP E_BINARY)
	#define GDA_VALUE_HOLDS_BLOB(value) G_VALUE_HOLDS(value, GDA_TYP E_BLOB)		#define GDA_VALUE_HOLDS_BLOB(value) G_VALUE_HOLDS(value, GDA_TYP E_BLOB)
	#define GDA_VALUE_HOLDS_GEOMETRIC_POINT(value) G_VALUE_HOLDS(value, GDA_TYP E_GEOMETRIC_POINT)		#define GDA_VALUE_HOLDS_GEOMETRIC_POINT(value) G_VALUE_HOLDS(value, GDA_TYP E_GEOMETRIC_POINT)
	#define GDA_VALUE_HOLDS_LIST(value) G_VALUE_HOLDS(value, GDA_TYP E_LIST)
	#define GDA_VALUE_HOLDS_NUMERIC(value) G_VALUE_HOLDS(value, GDA_TYP E_NUMERIC)		#define GDA_VALUE_HOLDS_NUMERIC(value) G_VALUE_HOLDS(value, GDA_TYP E_NUMERIC)
	#define GDA_VALUE_HOLDS_SHORT(value) G_VALUE_HOLDS(value, GDA_TYP E_SHORT)		#define GDA_VALUE_HOLDS_SHORT(value) G_VALUE_HOLDS(value, GDA_TYP E_SHORT)
	#define GDA_VALUE_HOLDS_USHORT(value) G_VALUE_HOLDS(value, GDA_TYP E_USHORT)		#define GDA_VALUE_HOLDS_USHORT(value) G_VALUE_HOLDS(value, GDA_TYP E_USHORT)
	#define GDA_VALUE_HOLDS_TIME(value) G_VALUE_HOLDS(value, GDA_TYP E_TIME)		#define GDA_VALUE_HOLDS_TIME(value) G_VALUE_HOLDS(value, GDA_TYP E_TIME)
	#define GDA_VALUE_HOLDS_TIMESTAMP(value) G_VALUE_HOLDS(value, GDA_TYP E_TIMESTAMP)		#define GDA_VALUE_HOLDS_TIMESTAMP(value) G_VALUE_HOLDS(value, GDA_TYP E_TIMESTAMP)
	typedef struct {		typedef struct {
	gdouble x;		gdouble x;
	gdouble y;		gdouble y;
	} GdaGeometricPoint;		} GdaGeometricPoint;
	skipping to change at line 106		skipping to change at line 99
	} GdaTimestamp;		} GdaTimestamp;
	typedef struct {		typedef struct {
	guchar *data;		guchar *data;
	glong binary_length;		glong binary_length;
	} GdaBinary;		} GdaBinary;
	/**		/**
	* GdaBlob		* GdaBlob
	* @data: data buffer, as a #GdaBinary		* @data: data buffer, as a #GdaBinary
	* @op: (allow-none): a pointer to a #GdaBlopOp, or %NULL		* @op: a pointer to a #GdaBlopOp, or %NULL
	*		*
	* Represents some binary data, accessed through a #GdaBlobOp object.		* 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		* @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().		* a database, but can be modified if needed using gda_blob_set_op().
	*/		*/
	typedef struct {		typedef struct {
	GdaBinary data;		GdaBinary data;
	GdaBlobOp *op;		GdaBlobOp *op;
	} GdaBlob;		} GdaBlob;
	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_default (const gchar *defau lt_val);
	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);
	GValue *gda_value_new_blob_from_file (const gchar *filename);		GValue *gda_value_new_blob_from_file (const gchar *filename);
	GValue *gda_value_new_timestamp_from_timet (time_ t val);		GValue *gda_value_new_timestamp_from_timet (time_ t val);
	GValue *gda_value_new_from_string (const gchar *a s_string, GType type);		GValue *gda_value_new_from_string (const gchar *a s_string, GType type);
	GValue *gda_value_new_from_xml (const xmlNodePtr node);		GValue *gda_value_new_from_xml (const xmlNodePtr node);
	void gda_value_free (GValue *value);		void gda_value_free (GValue *value);
	void gda_value_reset_with_type (GValue *value, GType type);		void gda_value_reset_with_type (GValue *value, GType type);
	gboolean gda_value_is_null (const GValue *value);		gboolean gda_value_is_null (const GValue *value);
	gboolean gda_value_is_number (const GValue *value) ;		gboolean gda_value_is_number (const GValue *value) ;
	GValue *gda_value_copy (const GValue *value);		GValue *gda_value_copy (const GValue *value);
	const GdaBinary *gda_value_get_binary (const GValue *value);		G_CONST_RETURN GdaBinary *gda_value_get_binary (const GValue *value );
	void gda_value_set_binary (GValue *value, cons t GdaBinary *binary);		void gda_value_set_binary (GValue *value, cons t GdaBinary *binary);
	void gda_value_take_binary (GValue *value, Gda Binary *binary);		void gda_value_take_binary (GValue *value, Gda Binary *binary);
	const GdaBlob *gda_value_get_blob (const GValue *value);		G_CONST_RETURN GdaBlob *gda_value_get_blob (const GValue *value);
	void gda_value_set_blob (GValue *value, const GdaBlob *blob);		void gda_value_set_blob (GValue *value, const GdaBlob *blob);
	void gda_value_take_blob (GValue *value, GdaBl ob *blob);		void gda_value_take_blob (GValue *value, GdaBl ob *blob);
	const GdaGeometricPoint *gda_value_get_geometric_point (const GValue *value );		G_CONST_RETURN GdaGeometricPoint *gda_value_get_geometric_point (const GVal ue *value);
	void gda_value_set_geometric_point (GValue *va lue, const GdaGeometricPoint *val);		void gda_value_set_geometric_point (GValue *va lue, const GdaGeometricPoint *val);
	const GdaValueList *gda_value_get_list (const GValue *value);
	void gda_value_set_list (GValue *value, const
	GdaValueList *val);
	void gda_value_set_null (GValue *value);		void gda_value_set_null (GValue *value);
	const GdaNumeric *gda_value_get_numeric (const GValue *value);		G_CONST_RETURN GdaNumeric *gda_value_get_numeric (const GValue *valu e);
	void gda_value_set_numeric (GValue *value, con st GdaNumeric *val);		void gda_value_set_numeric (GValue *value, con st GdaNumeric *val);
	gshort gda_value_get_short (const GValue *value) ;		gshort gda_value_get_short (const GValue *value) ;
	void gda_value_set_short (GValue *value, const gshort val);		void gda_value_set_short (GValue *value, const gshort val);
	gushort gda_value_get_ushort (const GValue *value );		gushort gda_value_get_ushort (const GValue *value );
	void gda_value_set_ushort (GValue *value, cons t gushort val);		void gda_value_set_ushort (GValue *value, cons t gushort val);
	const GdaTime *gda_value_get_time (const GValue *value);		G_CONST_RETURN GdaTime *gda_value_get_time (const GValue *value);
	void gda_value_set_time (GValue *value, const GdaTime *val);		void gda_value_set_time (GValue *value, const GdaTime *val);
	const GdaTimestamp *gda_value_get_timestamp (const GValue *value);		G_CONST_RETURN GdaTimestamp *gda_value_get_timestamp (const GValue *va lue);
	void gda_value_set_timestamp (GValue *value, c onst GdaTimestamp *val);		void gda_value_set_timestamp (GValue *value, c onst GdaTimestamp *val);
	gboolean gda_value_set_from_string (GValue *value,		gboolean gda_value_set_from_string (GValue *value,
	const gchar *as _string,		const gchar *as _string,
	GType type);		GType type);
	gboolean gda_value_set_from_value (GValue *value, const GValue *from);		gboolean gda_value_set_from_value (GValue *value, const GValue *from);
	gint gda_value_differ (const GValue *value1, c onst GValue *value2);		gint gda_value_differ (const GValue *value1, c onst GValue *value2);
	gint gda_value_compare (const GValue *value1, const GValue *value2);		gint gda_value_compare (const GValue *value1, const GValue *value2);
	gchar *gda_value_stringify (const GValue *value) ;		gchar *gda_value_stringify (const GValue *value) ;
	xmlNodePtr gda_value_to_xml (const GValue *value);		xmlNodePtr gda_value_to_xml (const GValue *value);
	gchar *gda_binary_to_string (const GdaBinary *bi n, guint maxlen);		gchar *gda_binary_to_string (const GdaBinary *bi n, guint maxlen);
	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_default_get_type (void) G_GNUC_CONST;
	GType gda_numeric_get_type (void) G_GNUC_CONST;		GType gda_numeric_get_type (void) G_GNUC_CONST;
	gpointer gda_numeric_copy (gpointer boxed);		gpointer gda_numeric_copy (gpointer boxed);
	void gda_numeric_free (gpointer boxed);		void gda_numeric_free (gpointer boxed);
	GType gda_time_get_type (void) G_GNUC_CONST;		GType gda_time_get_type (void) G_GNUC_CONST;
	gpointer gda_time_copy (gpointer boxed);		gpointer gda_time_copy (gpointer boxed);
	void gda_time_free (gpointer boxed);		void gda_time_free (gpointer boxed);
	gboolean gda_time_valid (const GdaTime *time);		gboolean gda_time_valid (const GdaTime *time);
	GType gda_timestamp_get_type (void) G_GNUC_CONS T;		GType gda_timestamp_get_type (void) G_GNUC_CONS T;
	skipping to change at line 208		skipping to change at line 196
	GType gda_binary_get_type (void) G_GNUC_CONST;		GType gda_binary_get_type (void) G_GNUC_CONST;
	gpointer gda_binary_copy (gpointer boxed);		gpointer gda_binary_copy (gpointer boxed);
	void gda_binary_free (gpointer boxed);		void gda_binary_free (gpointer boxed);
	GType gda_blob_get_type (void) G_GNUC_CONST;		GType gda_blob_get_type (void) G_GNUC_CONST;
	gpointer gda_blob_copy (gpointer boxed);		gpointer gda_blob_copy (gpointer boxed);
	void gda_blob_free (gpointer boxed);		void gda_blob_free (gpointer boxed);
	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_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
	#endif		#endif
End of changes. 21 change blocks.
	40 lines changed or deleted		27 lines changed or added

	gda-vconnection-data-model.h		gda-vconnection-data-model.h
	/*		/*
	* Copyright (C) 2007 - 2011 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2010 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VCONNECTION_DATA_MODEL_H__		#ifndef __GDA_VCONNECTION_DATA_MODEL_H__
	#define __GDA_VCONNECTION_DATA_MODEL_H__		#define __GDA_VCONNECTION_DATA_MODEL_H__
	#include <virtual/gda-virtual-connection.h>		#include <virtual/gda-virtual-connection.h>
	#include <sql-parser/gda-statement-struct-parts.h>		#include <sql-parser/gda-statement-struct-parts.h>
	#define GDA_TYPE_VCONNECTION_DATA_MODEL (gda_vconnection_data_mo del_get_type())		#define GDA_TYPE_VCONNECTION_DATA_MODEL (gda_vconnection_data_mo del_get_type())
	#define GDA_VCONNECTION_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_C AST (obj, GDA_TYPE_VCONNECTION_DATA_MODEL, GdaVconnectionDataModel))		#define GDA_VCONNECTION_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_C AST (obj, GDA_TYPE_VCONNECTION_DATA_MODEL, GdaVconnectionDataModel))
	skipping to change at line 40		skipping to change at line 43
	#define GDA_IS_VCONNECTION_DATA_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE_VCONNECTION_DATA_MODEL))		#define GDA_IS_VCONNECTION_DATA_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE_VCONNECTION_DATA_MODEL))
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _GdaVconnectionDataModel GdaVconnectionDataModel;		typedef struct _GdaVconnectionDataModel GdaVconnectionDataModel;
	typedef struct _GdaVconnectionDataModelClass GdaVconnectionDataModelClass;		typedef struct _GdaVconnectionDataModelClass GdaVconnectionDataModelClass;
	typedef struct _GdaVconnectionDataModelPrivate GdaVconnectionDataModelPriva te;		typedef struct _GdaVconnectionDataModelPrivate GdaVconnectionDataModelPriva te;
	typedef struct _GdaVconnectionDataModelSpec GdaVconnectionDataModelSpec;		typedef struct _GdaVconnectionDataModelSpec GdaVconnectionDataModelSpec;
	typedef struct _GdaVconnectionDataModelFilter GdaVconnectionDataModelFilter ;		typedef struct _GdaVconnectionDataModelFilter GdaVconnectionDataModelFilter ;
	/**		typedef GList *(*GdaVconnectionDataModelCreateColumnsFunc) (GdaVconn
	* GdaVconnectionDataModelCreateColumnsFunc:		ectionDataModelSpec *, GError **);
	* @Param1: a pointer to a #GdaVconnectionDataModelSpec structure		typedef GdaDataModel *(*GdaVconnectionDataModelCreateModelFunc) (GdaVconn
	* @Param2: a place to store errors, or %NULL		ectionDataModelSpec *);
	* @Returns: (element-type GdaColumn) (transfer full): a new list of #GdaCo
	lumn objects
	*
	* Function called to create the virtual table's columns, as #GdaColumn obj
	ects.
	*/
	typedef GList *(*GdaVconnectionDataModelCreateColumnsFunc) (GdaVconnectionD
	ataModelSpec *, GError **);
	/**
	* GdaVconnectionDataModelCreateModelFunc:
	* @Param1: a pointer to a #GdaVconnectionDataModelSpec structure
	* @Returns: (transfer full): a new #GdaDataModel
	*
	* Function called to create a #GdaDataModel object, called when a virtual
	table's data need to
	* be accessed, and when optimization is not handled.
	*/
	typedef GdaDataModel *(*GdaVconnectionDataModelCreateModelFunc) (GdaVconnec
	tionDataModelSpec *);
	/**
	* GdaVconnectionDataModelFunc:
	* @Param1: (allow-none): a pointer to a #GdaDataModel
	* @Param2: the name of the table represented by @Param1
	* @Param3: a data pointer, passed as last ergument to gda_vconnection_data
	_model_foreach()
	*
	* This function is called for every #GdaDataModel representing a table in
	a #GdaVconnectionDataModel
	* connection, when using the gda_vconnection_data_model_foreach() method.
	*/
	typedef void (*GdaVconnectionDataModelFunc) (GdaDataModel *, const gchar *, gpointer );		typedef void (*GdaVconnectionDataModelFunc) (GdaDataModel *, const gchar *, gpointer );
	/**		/*
	* GdaVconnectionDataModelFilter:		* Enabling pre-filtering when creating a data model to be used as a table,
	*		* (structure closely mapped with SQLite's sqlite3_index_info type), to ena
	* This structure contains data which should be analysed to produce a data		ble
	model (used as data		* the data model to perform some filter tasks itself.
	* for a virtual table) when a #GdaVconnectionDataModelCreateFModelFunc is
	called. The structure
	* contains an input part (which should not be modified) and and output par
	t (it is
	* closely mapped with SQLite's sqlite3_index_info type).
	*		*
	* A pointer to this structure is passed to the #GdaVconnectionDataModelPar		* A pointer to this structure is passed to the GdaVconnectionDataModelPars
	seFilterFunc function		eFilterFunc function
	* and the function has to modify the variables in the output part (marked		* and the function has to modify the variables in the *Outputs* section (a
	as *Outputs*).		nd nowhere else)
	*		*
	* The @idxNum and @idxPointer are passed to the #GdaVconnectionDataModelCr eateFModelFunc function call		* The @idxNum and @idxPointer are passed to the GdaVconnectionDataModelCre ateFModelFunc function call
	* and they represent nothing specific except that the GdaVconnectionDataMo delParseFilterFunc and		* and they represent nothing specific except that the GdaVconnectionDataMo delParseFilterFunc and
	* GdaVconnectionDataModelCreateFModelFunc functions need to agree on their meaning.		* GdaVconnectionDataModelCreateFModelFunc functions need to agree on their meaning.
	*		*
	* See the gda-vconnection-hub.c file for an usage example.		* See the gda-vconnection-hub.c file for an usage example.
	*/		*/
	struct _GdaVconnectionDataModelFilter {		struct _GdaVconnectionDataModelFilter {
	/* Inputs */		/* Inputs */
	int nConstraint; /* Number of entries in aConstraint */		int nConstraint; /* Number of entries in aConstraint */
	struct GdaVirtualConstraint {		struct GdaVirtualConstraint {
	int iColumn; /* Column on left-hand side of constraint */		int iColumn; /* Column on left-hand side of constraint */
	skipping to change at line 112		skipping to change at line 85
	struct GdaVirtualConstraintUsage {		struct GdaVirtualConstraintUsage {
	int argvIndex; /* if >0, constraint is part of argv to x Filter */		int argvIndex; /* if >0, constraint is part of argv to x Filter */
	gboolean omit; /* Do not code a test for this constraint if TRUE */		gboolean omit; /* Do not code a test for this constraint if TRUE */
	} *aConstraintUsage;		} *aConstraintUsage;
	int idxNum; /* Number used to identify the index */		int idxNum; /* Number used to identify the index */
	gpointer idxPointer; /* Pointer used to identify the index */		gpointer idxPointer; /* Pointer used to identify the index */
	gboolean orderByConsumed; /* TRUE if output is already ordered */		gboolean orderByConsumed; /* TRUE if output is already ordered */
	double estimatedCost; /* Estimated cost of using this index */		double estimatedCost; /* Estimated cost of using this index */
	};		};
	/**		typedef void (*GdaVconnectionDataModelParseFilterFunc) (GdaVconn
	* GdaVconnectionDataModelParseFilterFunc:		ectionDataModelSpec *, GdaVconnectionDataModelFilter *);
	* @Param1: a pointer to a #GdaVconnectionDataModelSpec structure		typedef GdaDataModel *(*GdaVconnectionDataModelCreateFModelFunc) (GdaVconn
	* @Param2: a pointer to a #GdaVconnectionDataModelFilter structure		ectionDataModelSpec *,
	*		int, cons
	* This function actually analyses the proposed optimization and modified @		t char *, int, GValue **);
	Param2 to tell the database
	* engine how (if applicable) it implements the optimization.
	*/
	typedef void (*GdaVconnectionDataModelParseFilterFunc) (GdaVconnectionDataM
	odelSpec *, GdaVconnectionDataModelFilter *);
	/**
	* GdaVconnectionDataModelCreateFModelFunc:
	* @Param1: a pointer to a #GdaVconnectionDataModelSpec structure
	* @Param2: the index number chosen to actually execute the optimization (f
	rom #GdaVconnectionDataModelFilter's #idxNum attribute)
	* @Param3: corresponds to the #GdaVconnectionDataModelFilter's #idxPointer
	attribute
	* @Param4: size of @Param5
	* @Param5: an array of #GValue, as specified by the #GdaVconnectionDataMod
	elFilter's #aConstraintUsage's #argvIndex value
	* @Returns: (transfer full): a new #GdaDataModel
	*
	* Function called to create a #GdaDataModel object, called when a virtual
	table's data need to
	* be accessed, and when optimization is handled.
	*/
	typedef GdaDataModel *(*GdaVconnectionDataModelCreateFModelFunc) (GdaVconne
	ctionDataModelSpec *, int, const char *, int, GValue **);
	/**
	* GdaVconnectionDataModelSpec:
	* @data_model: (allow-none): a #GdaDataModel, or %NULL
	* @create_columns_func: (allow-none): a pointer to a #GdaVconnectionDataMo
	delCreateColumnsFunc function, or %NULL
	* @create_model_func: (allow-none): a pointer to a #GdaVconnectionDataMode
	lCreateModelFunc function, or %NULL
	* @create_filter_func: (allow-none): a pointer to a #GdaVconnectionDataMod
	elParseFilterFunc function, or %NULL
	* @create_filtered_model_func: (allow-none): a pointer to a #GdaVconnectio
	nDataModelCreateFModelFunc function, or %NULL
	*
	* This structure holds all the information supplied to declare a virtual t
	able using
	* gda_vconnection_data_model_add(). You don't need to provider pointers fo
	r all the functions and
	* for @data_model, but the following rules have to be respected:
	* <itemizedlist>
	* <listitem><para>@data_model is not %NULL and all the function pointers
	are %NULL: this is the situation
	* when the virtual table's contents is defined once by @data_model</para
	></listitem>
	* <listitem><para>@data_model is %NULL and @create_columns_func is not %N
	ULL:
	* <itemizedlist>
	* <listitem><para>@create_filtered_model_func is not %NULL: this is
	the situation where the
	* virtual table's associated data model handles fil
	ter optimizations.
	* @create_model_func is ignored in this case.
	* </para></listitem>
	* <listitem><para>@create_model_func is not %NULL: this is the situ
	ation where the
	* virtual table's associated data model does not ha
	ndle filter optimizations
	* </para></listitem>
	* </itemizedlist>
	* </para></listitem>
	* </itemizedlist>
	*
	* Note that if specifying a @create_filtered_model_func, you should also s
	pecifiy a @create_filter_func
	* function which is actually responsible for analysing the optimization.
	*/
	struct _GdaVconnectionDataModelSpec {		struct _GdaVconnectionDataModelSpec {
	GdaDataModel *data_model;		GdaDataModel *data_model;
	GdaVconnectionDataModelCreateColumnsFunc create_columns_func;		GdaVconnectionDataModelCreateColumnsFunc create_columns_func;
	GdaVconnectionDataModelCreateModelFunc create_model_func;		GdaVconnectionDataModelCreateModelFunc create_model_func;
	GdaVconnectionDataModelParseFilterFunc create_filter_func;		GdaVconnectionDataModelParseFilterFunc create_filter_func;
	GdaVconnectionDataModelCreateFModelFunc create_filtered_model_func ;		GdaVconnectionDataModelCreateFModelFunc create_filtered_model_func ;
	};		};
	#define GDA_VCONNECTION_DATA_MODEL_SPEC(x) ((GdaVconnectionDataModelSpec*)( x))		#define GDA_VCONNECTION_DATA_MODEL_SPEC(x) ((GdaVconnectionDataModelSpec*)( x))
	struct _GdaVconnectionDataModel {		struct _GdaVconnectionDataModel {
	GdaVirtualConnection connection;		GdaVirtualConnection connection;
	GdaVconnectionDataModelPrivate *priv;		GdaVconnectionDataModelPrivate *priv;
	};		};
	struct _GdaVconnectionDataModelClass {		struct _GdaVconnectionDataModelClass {
	GdaVirtualConnectionClass parent_class;		GdaVirtualConnectionClass parent_class;
	void (*vtable_created) (GdaVconnectionDataM		/* Padding for future expansion */
	odel *cnc,		void (*_gda_reserved1) (void);
	const gchar *table		void (*_gda_reserved2) (void);
	_name);
	void (*vtable_dropped) (GdaVconnectionDataM
	odel *cnc,
	const gchar *tab
	le_name);
	};		};
	GType gda_vconnection_data_model_get_type (void) G_GNUC_CONS T;		GType gda_vconnection_data_model_get_type (void) G_GNUC_CONS T;
	gboolean gda_vconnection_data_model_add (GdaVconnectionDat aModel *cnc, GdaVconnectionDataModelSpec *spec,		gboolean gda_vconnection_data_model_add (GdaVconnectionDat aModel *cnc, GdaVconnectionDataModelSpec *spec,
	GDestroyNotify spe c_free_func,		GDestroyNotify spe c_free_func,
	const gchar *table _name, GError **error);		const gchar *table _name, GError **error);
	gboolean gda_vconnection_data_model_add_model (GdaVconnectionDat aModel *cnc,		gboolean gda_vconnection_data_model_add_model (GdaVconnectionDat aModel *cnc,
	GdaDataModel *mode l, const gchar *table_name, GError **error);		GdaDataModel *mode l, const gchar *table_name, GError **error);
	gboolean gda_vconnection_data_model_remove (GdaVconnectionDat aModel *cnc, const gchar *table_name, GError **error);		gboolean gda_vconnection_data_model_remove (GdaVconnectionDat aModel *cnc, const gchar *table_name, GError **error);
	GdaVconnectionDataModelSpec *gda_vconnection_data_model_get (GdaVconnection DataModel *cnc, const gchar *table_name);
	const gchar *gda_vconnection_data_model_get_table_name (GdaVconnecti onDataModel *cnc, GdaDataModel *model);		const gchar *gda_vconnection_data_model_get_table_name (GdaVconnecti onDataModel *cnc, GdaDataModel *model);
	GdaDataModel *gda_vconnection_data_model_get_model (GdaVconnectionDat aModel *cnc, const gchar *table_name);		GdaDataModel *gda_vconnection_data_model_get_model (GdaVconnectionDat aModel *cnc, const gchar *table_name);
	void gda_vconnection_data_model_foreach (GdaVconnectionDat aModel *cnc,		void gda_vconnection_data_model_foreach (GdaVconnectionDat aModel *cnc,
	GdaVconnectionData ModelFunc func, gpointer data);		GdaVconnectionData ModelFunc func, gpointer data);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 12 change blocks.
	146 lines changed or deleted		38 lines changed or added

	gda-vconnection-hub.h		gda-vconnection-hub.h
	/*		/* GDA
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VCONNECTION_HUB_H__		#ifndef __GDA_VCONNECTION_HUB_H__
	#define __GDA_VCONNECTION_HUB_H__		#define __GDA_VCONNECTION_HUB_H__
	#include <virtual/gda-vconnection-data-model.h>		#include <virtual/gda-vconnection-data-model.h>
	#define GDA_TYPE_VCONNECTION_HUB (gda_vconnection_hub_get_type() )		#define GDA_TYPE_VCONNECTION_HUB (gda_vconnection_hub_get_type() )
	#define GDA_VCONNECTION_HUB(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_VCONNECTION_HUB, GdaVconnectionHub))		#define GDA_VCONNECTION_HUB(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_VCONNECTION_HUB, GdaVconnectionHub))
	#define GDA_VCONNECTION_HUB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass , GDA_TYPE_VCONNECTION_HUB, GdaVconnectionHubClass))		#define GDA_VCONNECTION_HUB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass , GDA_TYPE_VCONNECTION_HUB, GdaVconnectionHubClass))
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-virtual-connection.h		gda-virtual-connection.h
	/*		/* GDA virtual connection
	* Copyright (C) 2007 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2010 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VIRTUAL_CONNECTION_H__		#ifndef __GDA_VIRTUAL_CONNECTION_H__
	#define __GDA_VIRTUAL_CONNECTION_H__		#define __GDA_VIRTUAL_CONNECTION_H__
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include <virtual/gda-virtual-provider.h>		#include <virtual/gda-virtual-provider.h>
	#define GDA_TYPE_VIRTUAL_CONNECTION (gda_virtual_connection_get_ type())		#define GDA_TYPE_VIRTUAL_CONNECTION (gda_virtual_connection_get_ type())
	#define GDA_VIRTUAL_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnection))		#define GDA_VIRTUAL_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnection))
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-virtual-provider.h		gda-virtual-provider.h
	/*		/* GDA virtual provider (based on SQLite)
	* Copyright (C) 2007 - 2011 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VIRTUAL_PROVIDER_H__		#ifndef __GDA_VIRTUAL_PROVIDER_H__
	#define __GDA_VIRTUAL_PROVIDER_H__		#define __GDA_VIRTUAL_PROVIDER_H__
	/* NOTICE: SQLite must be compiled without the SQLITE_OMIT_VIRTUALTABLE fla g */		/* NOTICE: SQLite must be compiled without the SQLITE_OMIT_VIRTUALTABLE fla g */
	#include <libgda/sqlite/gda-sqlite-provider.h>		#include <libgda/sqlite/gda-sqlite-provider.h>
	#define GDA_TYPE_VIRTUAL_PROVIDER (gda_virtual_provider_get_type ())		#define GDA_TYPE_VIRTUAL_PROVIDER (gda_virtual_provider_get_type ())
	#define GDA_VIRTUAL_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_VIRTUAL_PROVIDER, GdaVirtualProvider))		#define GDA_VIRTUAL_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_VIRTUAL_PROVIDER, GdaVirtualProvider))
	#define GDA_VIRTUAL_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_VIRTUAL_PROVIDER, GdaVirtualProviderClass))		#define GDA_VIRTUAL_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_VIRTUAL_PROVIDER, GdaVirtualProviderClass))
	#define GDA_IS_VIRTUAL_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_VIRTUAL_PROVIDER))		#define GDA_IS_VIRTUAL_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_VIRTUAL_PROVIDER))
	#define GDA_IS_VIRTUAL_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_VIRTUAL_PROVIDER))		#define GDA_IS_VIRTUAL_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_VIRTUAL_PROVIDER))
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _GdaVirtualProvider GdaVirtualProvider;		typedef struct _GdaVirtualProvider GdaVirtualProvider;
	typedef struct _GdaVirtualProviderClass GdaVirtualProviderClass;		typedef struct _GdaVirtualProviderClass GdaVirtualProviderClass;
			typedef struct _GdaVirtualProviderPrivate GdaVirtualProviderPrivate;
	struct _GdaVirtualProvider {		struct _GdaVirtualProvider {
	GdaSqliteProvider provider;		GdaSqliteProvider provider;
	/*< private >*/		GdaVirtualProviderPrivate *priv;
	void (*_gda_reserved1) (void);
	};		};
	struct _GdaVirtualProviderClass {		struct _GdaVirtualProviderClass {
	GdaSqliteProviderClass parent_class;		GdaSqliteProviderClass parent_class;
	/* Padding for future expansion */		/* Padding for future expansion */
	void (*_gda_reserved1) (void);		void (*_gda_reserved1) (void);
	void (*_gda_reserved2) (void);		void (*_gda_reserved2) (void);
	};		};
End of changes. 7 change blocks.
	15 lines changed or deleted		19 lines changed or added

	gda-vprovider-data-model.h		gda-vprovider-data-model.h
	/*		/* GDA SQLite vprovider for GdaDataModel
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VPROVIDER_DATA_MODEL_H__		#ifndef __GDA_VPROVIDER_DATA_MODEL_H__
	#define __GDA_VPROVIDER_DATA_MODEL_H__		#define __GDA_VPROVIDER_DATA_MODEL_H__
	#include <virtual/gda-virtual-provider.h>		#include <virtual/gda-virtual-provider.h>
	#define GDA_TYPE_VPROVIDER_DATA_MODEL (gda_vprovider_data_model_ get_type())		#define GDA_TYPE_VPROVIDER_DATA_MODEL (gda_vprovider_data_model_ get_type())
	#define GDA_VPROVIDER_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAS T (obj, GDA_TYPE_VPROVIDER_DATA_MODEL, GdaVproviderDataModel))		#define GDA_VPROVIDER_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAS T (obj, GDA_TYPE_VPROVIDER_DATA_MODEL, GdaVproviderDataModel))
	#define GDA_VPROVIDER_DATA_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ( klass, GDA_TYPE_VPROVIDER_DATA_MODEL, GdaVproviderDataModelClass))		#define GDA_VPROVIDER_DATA_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ( klass, GDA_TYPE_VPROVIDER_DATA_MODEL, GdaVproviderDataModelClass))
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-vprovider-hub.h		gda-vprovider-hub.h
	/*		/* GDA SQLite vprovider for Hub of connections
	* Copyright (C) 2007 - 2009 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2007 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_VPROVIDER_HUB_H__		#ifndef __GDA_VPROVIDER_HUB_H__
	#define __GDA_VPROVIDER_HUB_H__		#define __GDA_VPROVIDER_HUB_H__
	#include <virtual/gda-vprovider-data-model.h>		#include <virtual/gda-vprovider-data-model.h>
	#define GDA_TYPE_VPROVIDER_HUB (gda_vprovider_hub_get_type())		#define GDA_TYPE_VPROVIDER_HUB (gda_vprovider_hub_get_type())
	#define GDA_VPROVIDER_HUB(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VPROVIDER_HUB, GdaVproviderHub))		#define GDA_VPROVIDER_HUB(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VPROVIDER_HUB, GdaVproviderHub))
	#define GDA_VPROVIDER_HUB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_VPROVIDER_HUB, GdaVproviderHubClass))		#define GDA_VPROVIDER_HUB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_VPROVIDER_HUB, GdaVproviderHubClass))
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	gda-xa-transaction.h		gda-xa-transaction.h
	/*		/* GDA library
	* Copyright (C) 2008 - 2010 Vivien Malerba <malerba@gnome-db.org>		* Copyright (C) 2008 - 2009 The GNOME Foundation.
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __GDA_XA_TRANSACTION_H__		#ifndef __GDA_XA_TRANSACTION_H__
	#define __GDA_XA_TRANSACTION_H__		#define __GDA_XA_TRANSACTION_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <libgda/gda-enums.h>		#include <libgda/gda-enums.h>
	#include <libgda/gda-decl.h>		#include <libgda/gda-decl.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	12 lines changed or deleted		16 lines changed or added

	libgda-global-variables.h		libgda-global-variables.h
	/*		/*
	* Copyright (C) 2001 Carlos Perell		* Copyright (C) 2010 The GNOME Foundation.
	* Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 - 2010 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
	* Copyright (C) 2005 Cygwin Ports Maintainer <yselkowitz@users.sourceforge
	.net>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __LIBGDA_GLOBAL_VARIABLES_H__		#ifndef __LIBGDA_GLOBAL_VARIABLES_H__
	#define __LIBGDA_GLOBAL_VARIABLES_H__		#define __LIBGDA_GLOBAL_VARIABLES_H__
	#include <libgda/gda-attributes-manager.h>		#include <libgda/gda-attributes-manager.h>
	#ifdef G_OS_WIN32		#ifdef G_OS_WIN32
	#define IMPORT __declspec(dllimport)		#define IMPORT __declspec(dllimport)
	#else		#else
End of changes. 5 change blocks.
	16 lines changed or deleted		15 lines changed or added

	libgda-report.h		libgda-report.h
	/*		/* GDA library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2007 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2007 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __LIBGDA_REPORT_H__		#ifndef __LIBGDA_REPORT_H__
	#define __LIBGDA_REPORT_H__		#define __LIBGDA_REPORT_H__
	#include <libgda-report/gda-report-engine.h>		#include <libgda-report/gda-report-engine.h>
	#include <libgda-report/gda-report-document.h>		#include <libgda-report/gda-report-document.h>
	#include <libgda-report/gda-report-docbook-document.h>		#include <libgda-report/gda-report-docbook-document.h>
	#include <libgda-report/gda-report-rml-document.h>		#include <libgda-report/gda-report-rml-document.h>
End of changes. 5 change blocks.
	16 lines changed or deleted		16 lines changed or added

	libgda-virtual.h		libgda-virtual.h
	/*		/* GDA library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2007 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Vivien Malerba <malerba@gnome-db.org>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __LIBGDA_VIRTUAL_H__		#ifndef __LIBGDA_VIRTUAL_H__
	#define __LIBGDA_VIRTUAL_H__		#define __LIBGDA_VIRTUAL_H__
	#include <virtual/gda-virtual-provider.h>		#include <virtual/gda-virtual-provider.h>
	#include <virtual/gda-vprovider-data-model.h>		#include <virtual/gda-vprovider-data-model.h>
	#include <virtual/gda-vprovider-hub.h>		#include <virtual/gda-vprovider-hub.h>
	#include <virtual/gda-virtual-connection.h>		#include <virtual/gda-virtual-connection.h>
	#include <virtual/gda-vconnection-data-model.h>		#include <virtual/gda-vconnection-data-model.h>
	#include <virtual/gda-vconnection-hub.h>		#include <virtual/gda-vconnection-hub.h>
	#include <virtual/gda-ldap-connection.h>
	#endif		#endif
End of changes. 6 change blocks.
	18 lines changed or deleted		16 lines changed or added

	libgda-xslt.h		libgda-xslt.h
	/*		/* GDA common library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 2007 - 2008 The GNOME Foundation.
	* Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2009 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Paweł Cesar Sanjuan Szklarz <paweld2@gmail.com>
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef _LIBGDA_XSLT_H		#ifndef _LIBGDA_XSLT_H
	#define _LIBGDA_XSLT_H		#define _LIBGDA_XSLT_H
	#include <glib.h>		#include <glib.h>
	#include <libgda/libgda.h>		#include <libgda/libgda.h>
	#include <libxslt/transform.h>		#include <libxslt/transform.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 5 change blocks.
	16 lines changed or deleted		16 lines changed or added

	libgda.h		libgda.h
	/*		/* GDA library
	* Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>		* Copyright (C) 1998 - 2008 The GNOME Foundation.
	* Copyright (C) 2000 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
	* Copyright (C) 2001 Carlos Perell
	* Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
	* Copyright (C) 2002 Andrew Hill <andru@src.gnome.org>
	* Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
	* Copyright (C) 2003 - 2006 Murray Cumming <murrayc@murrayc.com>
	* Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
	* Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
	* Copyright (C) 2005
	*		*
	* This library is free software; you can redistribute it and/or		* AUTHORS:
	* modify it under the terms of the GNU Lesser General Public		* Michael Lausch <michael@lausch.at>
	* License as published by the Free Software Foundation; either		* Rodrigo Moya <rodrigo@gnome-db.org>
	* version 2 of the License, or (at your option) any later version.		* Bas Driessen <bas.driessen@xobas.com>
			* Vivien Malerba <malerba@gnome-db.org>
	*		*
	* This library is distributed in the hope that it will be useful,		* This Library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Library General Public License as
			* published by the Free Software Foundation; either version 2 of the
			* License, or (at your option) any later version.
			*
			* 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
	* Lesser General Public License for more details.		* Library General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Library General Public
	* License along with this library; if not, write to the		* License along with this Library; see the file COPYING.LIB. If not,
	* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,		* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330
	* Boston, MA 02110-1301, USA.		,
			* Boston, MA 02111-1307, USA.
	*/		*/
	#ifndef __LIBGDA_H__		#ifndef __LIBGDA_H__
	#define __LIBGDA_H__		#define __LIBGDA_H__
	#include <libgda/gda-attributes-manager.h>		#include <libgda/gda-attributes-manager.h>
	#include <libgda/gda-easy.h>
	#include <libgda/gda-column.h>		#include <libgda/gda-column.h>
	#include <libgda/gda-config.h>		#include <libgda/gda-config.h>
	#include <libgda/gda-connection-event.h>		#include <libgda/gda-connection-event.h>
	#include <libgda/gda-connection.h>		#include <libgda/gda-connection.h>
	#include <libgda/gda-connection-private.h>		#include <libgda/gda-connection-private.h>
	#include <libgda/gda-data-comparator.h>		#include <libgda/gda-data-comparator.h>
	#include <libgda/gda-data-model-array.h>		#include <libgda/gda-data-model-array.h>
	#include <libgda/gda-data-model-bdb.h>		#include <libgda/gda-data-model-bdb.h>
	#include <libgda/gda-data-model-ldap.h>
	#include <libgda/gda-tree-mgr-ldap.h>
	#include <libgda/gda-data-model.h>		#include <libgda/gda-data-model.h>
	#include <libgda/gda-data-model-iter.h>		#include <libgda/gda-data-model-iter.h>
	#include <libgda/gda-data-model-import.h>		#include <libgda/gda-data-model-import.h>
	#include <libgda/gda-data-model-dir.h>		#include <libgda/gda-data-model-dir.h>
	#include <libgda/gda-data-access-wrapper.h>		#include <libgda/gda-data-access-wrapper.h>
	#include <libgda/gda-data-proxy.h>		#include <libgda/gda-data-proxy.h>
	#include <libgda/gda-data-select.h>		#include <libgda/gda-data-select.h>
	#include <libgda/gda-lockable.h>		#include <libgda/gda-lockable.h>
	#include <libgda/gda-log.h>		#include <libgda/gda-log.h>
	#include <libgda/gda-quark-list.h>		#include <libgda/gda-quark-list.h>
End of changes. 7 change blocks.
	24 lines changed or deleted		19 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/