From: Evan Nemerson <evan@coeus-group.com>
Date: Tue, 23 Mar 2010 08:21:43 +0000 (-0700)
Subject: libgda-4.0: update to 4.0.8, regenerate
X-Git-Tag: 0.8.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2605dd2df038a6fbe297201dd21e0ec38f90d362;p=thirdparty%2Fvala.git

libgda-4.0: update to 4.0.8, regenerate
---

diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi
index 501e3c175..036391885 100644
--- a/vapi/libgda-4.0.vapi
+++ b/vapi/libgda-4.0.vapi
@@ -108,19 +108,14 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class Connection : GLib.Object, Gda.Lockable {
-		public void add_event (Gda.ConnectionEvent event);
-		public unowned Gda.ConnectionEvent add_event_string (string str);
-		public void add_prepared_statement (Gda.Statement gda_stmt, Gda.PStmt prepared_stmt);
 		public bool add_savepoint (string name) throws GLib.Error;
 		public unowned GLib.SList batch_execute (Gda.Batch batch, Gda.Set @params, Gda.StatementModelUsage model_usage) throws GLib.Error;
 		public bool begin_transaction (string name, Gda.TransactionIsolation level) throws GLib.Error;
-		public void clear_events_list ();
 		public void close ();
 		public void close_no_warning ();
 		public bool commit_transaction (string name) throws GLib.Error;
 		public unowned Gda.ServerOperation create_operation (Gda.ServerOperationType type, Gda.Set options) throws GLib.Error;
 		public unowned Gda.SqlParser create_parser ();
-		public void del_prepared_statement (Gda.Statement gda_stmt);
 		public bool delete_savepoint (string name) throws GLib.Error;
 		public static GLib.Quark error_quark ();
 		public unowned string get_authentication ();
@@ -131,20 +126,9 @@ namespace Gda {
 		public unowned Gda.DataModel get_meta_store_data (Gda.ConnectionMetaType meta_type, int nb_filters) throws GLib.Error;
 		public unowned Gda.DataModel get_meta_store_data_v (Gda.ConnectionMetaType meta_type, GLib.List filters) throws GLib.Error;
 		public Gda.ConnectionOptions get_options ();
-		public unowned Gda.PStmt get_prepared_statement (Gda.Statement gda_stmt);
 		public unowned Gda.ServerProvider get_provider ();
 		public unowned string get_provider_name ();
 		public unowned Gda.TransactionStatus get_transaction_status ();
-		public void internal_change_transaction_state (Gda.TransactionStatusState newstate);
-		public void* internal_get_provider_data ();
-		public void internal_savepoint_added (string parent_trans, string svp_name);
-		public void internal_savepoint_removed (string svp_name);
-		public void internal_savepoint_rolledback (string svp_name);
-		public void internal_set_provider_data (void* data, GLib.DestroyNotify destroy_func);
-		public void internal_statement_executed (Gda.Statement stmt, Gda.Set @params, Gda.ConnectionEvent error);
-		public void internal_transaction_committed (string trans_name);
-		public void internal_transaction_rolledback (string trans_name);
-		public void internal_transaction_started (string parent_trans, string trans_name, Gda.TransactionIsolation isol_level);
 		public bool is_opened ();
 		public bool open () throws GLib.Error;
 		public static unowned Gda.Connection open_from_dsn (string dsn, string auth_string, Gda.ConnectionOptions options) throws GLib.Error;
@@ -882,6 +866,8 @@ namespace Gda {
 		public weak GLib.Callback domains;
 		public weak GLib.Callback el_types;
 		public weak GLib.Callback enums;
+		public weak GLib.Callback index_cols;
+		public weak GLib.Callback indexes_tab;
 		public weak GLib.Callback key_columns;
 		public weak GLib.Callback routine_col;
 		public weak GLib.Callback routine_par;
@@ -1392,12 +1378,6 @@ namespace Gda {
 		public Gda.TransactionStatusState state;
 		[CCode (has_construct_function = false)]
 		public TransactionStatus (string name);
-		public unowned Gda.TransactionStatusEvent add_event_sql (string sql, Gda.ConnectionEvent conn_event);
-		public unowned Gda.TransactionStatusEvent add_event_sub (Gda.TransactionStatus sub_trans);
-		public unowned Gda.TransactionStatusEvent add_event_svp (string svp_name);
-		public unowned Gda.TransactionStatus find (string str, out unowned Gda.TransactionStatusEvent destev);
-		public unowned Gda.TransactionStatus find_current (out unowned Gda.TransactionStatusEvent destev, bool unnamed_only);
-		public void free_events (Gda.TransactionStatusEvent event, bool free_after);
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
@@ -1492,7 +1472,6 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public interface DataModel : GLib.Object {
-		public bool add_data_from_xml_node (Xml.Node node) throws GLib.Error;
 		public int append_row () throws GLib.Error;
 		public int append_values (GLib.List values) throws GLib.Error;
 		public unowned Gda.DataModelIter create_iter ();
@@ -1655,7 +1634,8 @@ namespace Gda {
 		TYPES,
 		TABLES,
 		VIEWS,
-		FIELDS
+		FIELDS,
+		INDEXES
 	}
 	[CCode (cprefix = "GDA_CONNECTION_OPTIONS_", cheader_filename = "libgda/libgda.h")]
 	[Flags]
diff --git a/vapi/packages/libgda-4.0/libgda-4.0.excludes b/vapi/packages/libgda-4.0/libgda-4.0.excludes
index fe701ed9f..ffb9e9276 100644
--- a/vapi/packages/libgda-4.0/libgda-4.0.excludes
+++ b/vapi/packages/libgda-4.0/libgda-4.0.excludes
@@ -1,3 +1,5 @@
-include/libgda-4.0/libgda-report/
-include/libgda-4.0/providers-support/gda-data-select-priv.h
 include/libgda-4.0/libgda/gda-data-model-extra.h
+include/libgda-4.0/libgda/gda-connection-private.h
+include/libgda-4.0/libgda/gda-server-provider-private.h
+include/libgda-4.0/libgda/gda-data-model-private.h
+include/libgda-4.0/libgda/gda-transaction-status-private.h
diff --git a/vapi/packages/libgda-4.0/libgda-4.0.gi b/vapi/packages/libgda-4.0/libgda-4.0.gi
index 389f2e384..3fba44e79 100644
--- a/vapi/packages/libgda-4.0/libgda-4.0.gi
+++ b/vapi/packages/libgda-4.0/libgda-4.0.gi
@@ -1074,10 +1074,10 @@
 			<field name="routine_col" type="GCallback"/>
 			<field name="_routine_par" type="GCallback"/>
 			<field name="routine_par" type="GCallback"/>
-			<field name="_gda_reserved1" type="GCallback"/>
-			<field name="_gda_reserved2" type="GCallback"/>
-			<field name="_gda_reserved3" type="GCallback"/>
-			<field name="_gda_reserved4" type="GCallback"/>
+			<field name="_indexes_tab" type="GCallback"/>
+			<field name="indexes_tab" type="GCallback"/>
+			<field name="_index_cols" type="GCallback"/>
+			<field name="index_cols" type="GCallback"/>
 			<field name="_gda_reserved5" type="GCallback"/>
 			<field name="_gda_reserved6" type="GCallback"/>
 			<field name="_gda_reserved7" type="GCallback"/>
@@ -2349,6 +2349,7 @@
 			<member name="GDA_CONNECTION_META_TABLES" value="2"/>
 			<member name="GDA_CONNECTION_META_VIEWS" value="3"/>
 			<member name="GDA_CONNECTION_META_FIELDS" value="4"/>
+			<member name="GDA_CONNECTION_META_INDEXES" value="5"/>
 		</enum>
 		<enum name="GdaConnectionSchema" type-name="GdaConnectionSchema" get-type="gda_connection_schema_get_type">
 			<member name="GDA_CONNECTION_SCHEMA_AGGREGATES" value="0"/>
@@ -3091,28 +3092,6 @@
 			<implements>
 				<interface name="GdaLockable"/>
 			</implements>
-			<method name="add_event" symbol="gda_connection_add_event">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="event" type="GdaConnectionEvent*"/>
-				</parameters>
-			</method>
-			<method name="add_event_string" symbol="gda_connection_add_event_string">
-				<return-type type="GdaConnectionEvent*"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="str" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_prepared_statement" symbol="gda_connection_add_prepared_statement">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="gda_stmt" type="GdaStatement*"/>
-					<parameter name="prepared_stmt" type="GdaPStmt*"/>
-				</parameters>
-			</method>
 			<method name="add_savepoint" symbol="gda_connection_add_savepoint">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -3140,12 +3119,6 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<method name="clear_events_list" symbol="gda_connection_clear_events_list">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-				</parameters>
-			</method>
 			<method name="close" symbol="gda_connection_close">
 				<return-type type="void"/>
 				<parameters>
@@ -3181,13 +3154,6 @@
 					<parameter name="cnc" type="GdaConnection*"/>
 				</parameters>
 			</method>
-			<method name="del_prepared_statement" symbol="gda_connection_del_prepared_statement">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="gda_stmt" type="GdaStatement*"/>
-				</parameters>
-			</method>
 			<method name="delete_savepoint" symbol="gda_connection_delete_savepoint">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -3253,13 +3219,6 @@
 					<parameter name="cnc" type="GdaConnection*"/>
 				</parameters>
 			</method>
-			<method name="get_prepared_statement" symbol="gda_connection_get_prepared_statement">
-				<return-type type="GdaPStmt*"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="gda_stmt" type="GdaStatement*"/>
-				</parameters>
-			</method>
 			<method name="get_provider" symbol="gda_connection_get_provider">
 				<return-type type="GdaServerProvider*"/>
 				<parameters>
@@ -3278,81 +3237,6 @@
 					<parameter name="cnc" type="GdaConnection*"/>
 				</parameters>
 			</method>
-			<method name="internal_change_transaction_state" symbol="gda_connection_internal_change_transaction_state">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="newstate" type="GdaTransactionStatusState"/>
-				</parameters>
-			</method>
-			<method name="internal_get_provider_data" symbol="gda_connection_internal_get_provider_data">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-				</parameters>
-			</method>
-			<method name="internal_savepoint_added" symbol="gda_connection_internal_savepoint_added">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="parent_trans" type="gchar*"/>
-					<parameter name="svp_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="internal_savepoint_removed" symbol="gda_connection_internal_savepoint_removed">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="svp_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="internal_savepoint_rolledback" symbol="gda_connection_internal_savepoint_rolledback">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="svp_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="internal_set_provider_data" symbol="gda_connection_internal_set_provider_data">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy_func" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="internal_statement_executed" symbol="gda_connection_internal_statement_executed">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="stmt" type="GdaStatement*"/>
-					<parameter name="params" type="GdaSet*"/>
-					<parameter name="error" type="GdaConnectionEvent*"/>
-				</parameters>
-			</method>
-			<method name="internal_transaction_committed" symbol="gda_connection_internal_transaction_committed">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="trans_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="internal_transaction_rolledback" symbol="gda_connection_internal_transaction_rolledback">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="trans_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="internal_transaction_started" symbol="gda_connection_internal_transaction_started">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cnc" type="GdaConnection*"/>
-					<parameter name="parent_trans" type="gchar*"/>
-					<parameter name="trans_name" type="gchar*"/>
-					<parameter name="isol_level" type="GdaTransactionIsolation"/>
-				</parameters>
-			</method>
 			<method name="is_opened" symbol="gda_connection_is_opened">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -6101,52 +5985,6 @@
 			</signal>
 		</object>
 		<object name="GdaTransactionStatus" parent="GObject" type-name="GdaTransactionStatus" get-type="gda_transaction_status_get_type">
-			<method name="add_event_sql" symbol="gda_transaction_status_add_event_sql">
-				<return-type type="GdaTransactionStatusEvent*"/>
-				<parameters>
-					<parameter name="tstatus" type="GdaTransactionStatus*"/>
-					<parameter name="sql" type="gchar*"/>
-					<parameter name="conn_event" type="GdaConnectionEvent*"/>
-				</parameters>
-			</method>
-			<method name="add_event_sub" symbol="gda_transaction_status_add_event_sub">
-				<return-type type="GdaTransactionStatusEvent*"/>
-				<parameters>
-					<parameter name="tstatus" type="GdaTransactionStatus*"/>
-					<parameter name="sub_trans" type="GdaTransactionStatus*"/>
-				</parameters>
-			</method>
-			<method name="add_event_svp" symbol="gda_transaction_status_add_event_svp">
-				<return-type type="GdaTransactionStatusEvent*"/>
-				<parameters>
-					<parameter name="tstatus" type="GdaTransactionStatus*"/>
-					<parameter name="svp_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="find" symbol="gda_transaction_status_find">
-				<return-type type="GdaTransactionStatus*"/>
-				<parameters>
-					<parameter name="tstatus" type="GdaTransactionStatus*"/>
-					<parameter name="str" type="gchar*"/>
-					<parameter name="destev" type="GdaTransactionStatusEvent**"/>
-				</parameters>
-			</method>
-			<method name="find_current" symbol="gda_transaction_status_find_current">
-				<return-type type="GdaTransactionStatus*"/>
-				<parameters>
-					<parameter name="tstatus" type="GdaTransactionStatus*"/>
-					<parameter name="destev" type="GdaTransactionStatusEvent**"/>
-					<parameter name="unnamed_only" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="free_events" symbol="gda_transaction_status_free_events">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="tstatus" type="GdaTransactionStatus*"/>
-					<parameter name="event" type="GdaTransactionStatusEvent*"/>
-					<parameter name="free_after" type="gboolean"/>
-				</parameters>
-			</method>
 			<constructor name="new" symbol="gda_transaction_status_new">
 				<return-type type="GdaTransactionStatus*"/>
 				<parameters>
@@ -6462,14 +6300,6 @@
 			<requires>
 				<interface name="GObject"/>
 			</requires>
-			<method name="add_data_from_xml_node" symbol="gda_data_model_add_data_from_xml_node">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="model" type="GdaDataModel*"/>
-					<parameter name="node" type="xmlNodePtr"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
 			<method name="append_row" symbol="gda_data_model_append_row">
 				<return-type type="gint"/>
 				<parameters>