libgda r3206 - in trunk: . doc/C doc/C/tmpl libgda libgda/sqlite libgda/sqlite/virtual po providers/bdb providers/firebird providers/mdb providers/mysql providers/postgres providers/skel-implementation/capi providers/skel-implementation/models samples/DDL samples/SqlParserConsole testing tests tests/data-models tests/multi-threading tests/parser tests/providers tests/value-holders tools
- From: vivien svn gnome org
- To: svn-commits-list gnome org
- Subject: libgda r3206 - in trunk: . doc/C doc/C/tmpl libgda libgda/sqlite libgda/sqlite/virtual po providers/bdb providers/firebird providers/mdb providers/mysql providers/postgres providers/skel-implementation/capi providers/skel-implementation/models samples/DDL samples/SqlParserConsole testing tests tests/data-models tests/multi-threading tests/parser tests/providers tests/value-holders tools
- Date: Tue, 16 Sep 2008 18:45:28 +0000 (UTC)
Author: vivien
Date: Tue Sep 16 18:45:28 2008
New Revision: 3206
URL: http://svn.gnome.org/viewvc/libgda?rev=3206&view=rev
Log:
2008-09-16 Vivien Malerba <malerba gnome-db org>
* NEWS: news for version 3.99.4
* libgda/libgda.h.in:
* libgda/gda-init.c: added gda_get_application_exec_path()
* libgda/gda-connection.[ch]: removed gda_connection_set_dsn()
* libgda/gda-data-model.[ch]:
- removed gda_data_model_get_value_at_column()
- removed gda_data_model_is_updatable()
* libgda/gda-data-model-iter.[ch]: added gda_data_model_iter_set_value_at()
* libgda/gda-data-proxy.[ch]: removed gda_data_proxy_find_row_from_values() as there
is already gda_data_model_get_row_from_values() for the same feature
* API changes (more consistant naming):
- GdaDataSourceInfo => GdaDsnInfo
- gda_connection_get_provider_obj() => gda_connection_get_provider()
- gda_config_get_dsn() => gda_config_get_dsn_info()
- gda_config_get_provider_object() => gda_config_get_provider()
- gda_connection_get_provider_obj() => gda_connection_get_provider()
* po/: ran "make update-po"
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.in
trunk/doc/C/gettingstarted.xml
trunk/doc/C/howto.xml
trunk/doc/C/libgda-4.0-sections.txt
trunk/doc/C/tmpl/gda-config.sgml
trunk/doc/C/tmpl/gda-connection-event.sgml
trunk/doc/C/tmpl/gda-connection.sgml
trunk/doc/C/tmpl/gda-data-model-iter.sgml
trunk/doc/C/tmpl/gda-data-model.sgml
trunk/doc/C/tmpl/gda-data-proxy.sgml
trunk/doc/C/tmpl/libgda.sgml
trunk/doc/C/tmpl/provider-support.sgml
trunk/libgda/Makefile.am
trunk/libgda/gda-config.c
trunk/libgda/gda-config.h
trunk/libgda/gda-connection.c
trunk/libgda/gda-connection.h
trunk/libgda/gda-data-model-dsn-list.c
trunk/libgda/gda-data-model-iter.c
trunk/libgda/gda-data-model-iter.h
trunk/libgda/gda-data-model.c
trunk/libgda/gda-data-model.h
trunk/libgda/gda-data-proxy.c
trunk/libgda/gda-data-proxy.h
trunk/libgda/gda-easy.c
trunk/libgda/gda-init.c
trunk/libgda/gda-meta-store.c
trunk/libgda/gda-server-operation.c
trunk/libgda/gda-statement.c
trunk/libgda/gda-xa-transaction.c
trunk/libgda/libgda.h.in
trunk/libgda/sqlite/gda-sqlite-provider.c
trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c
trunk/po/ar.po
trunk/po/az.po
trunk/po/ca.po
trunk/po/cs.po
trunk/po/da.po
trunk/po/de.po
trunk/po/dz.po
trunk/po/el.po
trunk/po/en_CA.po
trunk/po/en_GB.po
trunk/po/es.po
trunk/po/eu.po
trunk/po/fa.po
trunk/po/fi.po
trunk/po/fr.po
trunk/po/ga.po
trunk/po/gl.po
trunk/po/hr.po
trunk/po/hu.po
trunk/po/it.po
trunk/po/ja.po
trunk/po/ko.po
trunk/po/lt.po
trunk/po/mk.po
trunk/po/ml.po
trunk/po/ms.po
trunk/po/nb.po
trunk/po/ne.po
trunk/po/nl.po
trunk/po/oc.po
trunk/po/pa.po
trunk/po/pl.po
trunk/po/pt.po
trunk/po/pt_BR.po
trunk/po/ru.po
trunk/po/rw.po
trunk/po/sk.po
trunk/po/sl.po
trunk/po/sq.po
trunk/po/sr.po
trunk/po/sr Latn po
trunk/po/sv.po
trunk/po/tr.po
trunk/po/uk.po
trunk/po/vi.po
trunk/po/zh_CN.po
trunk/po/zh_HK.po
trunk/po/zh_TW.po
trunk/providers/bdb/gda-bdb-provider.c
trunk/providers/firebird/gda-firebird-provider.c
trunk/providers/mdb/gda-mdb-provider.c
trunk/providers/mysql/gda-mysql-provider.c
trunk/providers/postgres/gda-postgres-provider.c
trunk/providers/skel-implementation/capi/gda-capi-provider.c
trunk/providers/skel-implementation/models/gda-models-provider.c
trunk/samples/DDL/ddl.c
trunk/samples/SqlParserConsole/console.c
trunk/testing/gda-provider-status.c
trunk/testing/gda-test-blob.c
trunk/testing/gda-test-connection.c
trunk/tests/data-models/Makefile.am
trunk/tests/data-models/check_data_proxy.c
trunk/tests/gda-ddl-creator.c
trunk/tests/multi-threading/check_parser.c
trunk/tests/multi-threading/common.c
trunk/tests/parser/check_parser.c
trunk/tests/providers/prov-test-util.c
trunk/tests/value-holders/check_statement.c
trunk/tools/gda-list-server-op.c
trunk/tools/gda-sql.c
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Tue Sep 16 18:45:28 2008
@@ -1,5 +1,25 @@
+libgda 3.99.4, 2008-09-16
+
+ This version includes:
+
+ - Lots of code cleanups and API review
+ - now internally use SQLite 3.6.2
+ - Resultsets returned after the execution of a SELECT can now be writable
+ - more NR tests
+ - Basic multi threading support (for some objects like connections)
+ - MySQL support improved (Carlos Savoretti)
+ - SQL console tool improvements
+ - MS-Windows support improvements
+ - Lots of small bug fixes (Bas Driessen, Vivien Malerba)
+ - Lots of documentation improvements
+ - bug fixes: #549953, #535633, #551058, #541991, #545977, #549498, #546230, #545979 (Carl-Anton Ingmarsson)
+ - Translations:
+ - nb (Kjartan Maraas)
+ - es (Jorge Gonzalez)
+ - it (Marco Ciampa)
+ - ar (Djihed Afifi)
+ - eu (Inaki Larranaga Murgoitio)
- - bug fixes: #549953, #535633, #551058
libgda 3.99.3, 2008-07-06
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Sep 16 18:45:28 2008
@@ -24,7 +24,7 @@
m4_undefine([micro])
dnl required versions of other tools.
-m4_define([req_ver_glib], [2.8.0])
+m4_define([req_ver_glib], [2.12.0])
#
# Making releases:
Modified: trunk/doc/C/gettingstarted.xml
==============================================================================
--- trunk/doc/C/gettingstarted.xml (original)
+++ trunk/doc/C/gettingstarted.xml Tue Sep 16 18:45:28 2008
@@ -363,7 +363,7 @@
gint i;
/* create a new GdaServerOperation object */
- provider = gda_connection_get_provider_obj (cnc);
+ provider = gda_connection_get_provider (cnc);
op = gda_server_provider_create_operation (provider, cnc, GDA_SERVER_OPERATION_CREATE_TABLE, NULL, &error);
if (!op) {
g_print ("CREATE TABLE operation is not supported by the provider: %s\n",
Modified: trunk/doc/C/howto.xml
==============================================================================
--- trunk/doc/C/howto.xml (original)
+++ trunk/doc/C/howto.xml Tue Sep 16 18:45:28 2008
@@ -38,14 +38,14 @@
<para>
The <link linkend="libgda-40-Configuration">Configuration section</link> details how to manage data sources
definitions. To define a data source, one needs to create and fill a
- <link linkend="GdaDataSourceInfo">GdaDataSourceInfo</link> structure, and use the
+ <link linkend="GdaDsnInfo">GdaDsnInfo</link> structure, and use the
<link linkend="gda-config-define-dsn">gda_config_define_dsn()</link> function.
</para>
<para>
For example the following code defines a data source:
<programlisting>
GError *error = NULL;
-GdaDataSourceInfo dsn_info = {
+GdaDsnInfo dsn_info = {
"My DSN",
"MySQL",
"Sample MySQL data source",
Modified: trunk/doc/C/libgda-4.0-sections.txt
==============================================================================
--- trunk/doc/C/libgda-4.0-sections.txt (original)
+++ trunk/doc/C/libgda-4.0-sections.txt Tue Sep 16 18:45:28 2008
@@ -33,23 +33,24 @@
<FILE>gda-config</FILE>
<TITLE>Configuration</TITLE>
GdaConfig
-gda_config_get
<SUBSECTION>
-GdaDataSourceInfo
-gda_config_get_dsn
+GdaDsnInfo
+gda_config_get_dsn_info
gda_config_define_dsn
gda_config_remove_dsn
gda_config_dsn_needs_authentication
gda_config_list_dsn
gda_config_get_nb_dsn
-gda_config_get_dsn_index
-gda_config_get_dsn_at_index
+gda_config_get_dsn_info_index
+gda_config_get_dsn_info_at_index
gda_config_can_modify_system_config
<SUBSECTION>
GdaProviderInfo
gda_config_get_provider_info
-gda_config_get_provider_object
+gda_config_get_provider
gda_config_list_providers
+<SUBSECTION>
+gda_config_get
<SUBSECTION Standard>
GDA_CONFIG
GDA_CONFIG_CLASS
@@ -63,25 +64,14 @@
<FILE>gda-connection-event</FILE>
<TITLE>GdaConnectionEvent</TITLE>
GdaConnectionEvent
-GdaConnectionEventPrivate
GdaConnectionEventType
GdaConnectionEventCode
-gda_connection_event_new
-gda_connection_event_free
-gda_connection_event_list_copy
-gda_connection_event_list_free
-gda_connection_event_set_event_type
gda_connection_event_get_event_type
gda_connection_event_get_description
-gda_connection_event_set_description
gda_connection_event_get_code
-gda_connection_event_set_code
gda_connection_event_get_gda_code
-gda_connection_event_set_gda_code
gda_connection_event_get_source
-gda_connection_event_set_source
gda_connection_event_get_sqlstate
-gda_connection_event_set_sqlstate
<SUBSECTION Standard>
GDA_CONNECTION_EVENT
GDA_CONNECTION_EVENT_CLASS
@@ -104,6 +94,7 @@
gda_connection_is_opened
<SUBSECTION>
gda_connection_create_parser
+gda_connection_value_to_sql_string
gda_connection_statement_to_sql
gda_connection_statement_prepare
gda_connection_statement_execute
@@ -121,9 +112,8 @@
<SUBSECTION>
gda_connection_get_transaction_status
gda_connection_get_options
-gda_connection_get_provider_obj
+gda_connection_get_provider
gda_connection_get_provider_name
-gda_connection_set_dsn
gda_connection_get_dsn
gda_connection_get_cnc_string
gda_connection_get_authentification
@@ -139,7 +129,6 @@
gda_connection_update_meta_store
GdaConnectionMetaType
gda_connection_get_meta_store_data
-gda_connection_value_to_sql_string
<SUBSECTION>
gda_connection_lock
gda_connection_trylock
@@ -287,7 +276,6 @@
gda_data_model_create_iter
gda_data_model_get_value_at
gda_data_model_get_typed_value_at
-gda_data_model_get_value_at_column
gda_data_model_set_value_at
gda_data_model_set_values
gda_data_model_get_attributes_at
@@ -343,7 +331,6 @@
gda_data_proxy_undelete
gda_data_proxy_row_is_deleted
gda_data_proxy_row_is_inserted
-gda_data_proxy_find_row_from_values
gda_data_proxy_get_model
gda_data_proxy_append
gda_data_proxy_cancel_row_changes
@@ -376,6 +363,7 @@
GdaDataModelIter
gda_data_model_iter_get_value_at
gda_data_model_iter_get_value_for_field
+gda_data_model_iter_set_value_at
gda_data_model_iter_is_valid
gda_data_model_iter_move_at_row
gda_data_model_iter_move_next
@@ -396,6 +384,7 @@
<FILE>libgda</FILE>
<TITLE>Libgda Initialization</TITLE>
gda_init
+gda_get_application_exec_path
<SUBSECTION Standard>
</SECTION>
@@ -1439,6 +1428,16 @@
gda_connection_add_event
gda_connection_add_event_string
gda_connection_clear_events_list
+gda_connection_event_new
+gda_connection_event_free
+gda_connection_event_list_copy
+gda_connection_event_list_free
+gda_connection_event_set_event_type
+gda_connection_event_set_description
+gda_connection_event_set_code
+gda_connection_event_set_gda_code
+gda_connection_event_set_source
+gda_connection_event_set_sqlstate
<SUBSECTION>
gda_connection_add_prepared_statement
gda_connection_del_prepared_statement
Modified: trunk/doc/C/tmpl/gda-config.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-config.sgml (original)
+++ trunk/doc/C/tmpl/gda-config.sgml Tue Sep 16 18:45:28 2008
@@ -90,15 +90,7 @@
</para>
-<!-- ##### FUNCTION gda_config_get ##### -->
-<para>
-
-</para>
-
- Returns:
-
-
-<!-- ##### STRUCT GdaDataSourceInfo ##### -->
+<!-- ##### STRUCT GdaDsnInfo ##### -->
<para>
</para>
@@ -110,7 +102,7 @@
@auth_string:
@is_system:
-<!-- ##### FUNCTION gda_config_get_dsn ##### -->
+<!-- ##### FUNCTION gda_config_get_dsn_info ##### -->
<para>
</para>
@@ -164,7 +156,7 @@
@Returns:
-<!-- ##### FUNCTION gda_config_get_dsn_index ##### -->
+<!-- ##### FUNCTION gda_config_get_dsn_info_index ##### -->
<para>
</para>
@@ -173,7 +165,7 @@
@Returns:
-<!-- ##### FUNCTION gda_config_get_dsn_at_index ##### -->
+<!-- ##### FUNCTION gda_config_get_dsn_info_at_index ##### -->
<para>
</para>
@@ -210,7 +202,7 @@
@Returns:
-<!-- ##### FUNCTION gda_config_get_provider_object ##### -->
+<!-- ##### FUNCTION gda_config_get_provider ##### -->
<para>
</para>
@@ -228,3 +220,11 @@
@Returns:
+<!-- ##### FUNCTION gda_config_get ##### -->
+<para>
+
+</para>
+
+ Returns:
+
+
Modified: trunk/doc/C/tmpl/gda-connection-event.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-connection-event.sgml (original)
+++ trunk/doc/C/tmpl/gda-connection-event.sgml Tue Sep 16 18:45:28 2008
@@ -34,12 +34,6 @@
</para>
-<!-- ##### STRUCT GdaConnectionEventPrivate ##### -->
-<para>
-
-</para>
-
-
<!-- ##### ENUM GdaConnectionEventType ##### -->
<para>
@@ -75,24 +69,6 @@
@GDA_CONNECTION_EVENT_CODE_SYNTAX_ERROR:
@GDA_CONNECTION_EVENT_CODE_UNKNOWN:
-<!-- ##### FUNCTION gda_connection_event_new ##### -->
-<para>
-
-</para>
-
- type:
- Returns:
-
-
-<!-- ##### FUNCTION gda_connection_event_set_event_type ##### -->
-<para>
-
-</para>
-
- event:
- type:
-
-
<!-- ##### FUNCTION gda_connection_event_get_event_type ##### -->
<para>
@@ -111,15 +87,6 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_event_set_description ##### -->
-<para>
-
-</para>
-
- event:
- description:
-
-
<!-- ##### FUNCTION gda_connection_event_get_code ##### -->
<para>
@@ -129,15 +96,6 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_event_set_code ##### -->
-<para>
-
-</para>
-
- event:
- code:
-
-
<!-- ##### FUNCTION gda_connection_event_get_gda_code ##### -->
<para>
@@ -147,15 +105,6 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_event_set_gda_code ##### -->
-<para>
-
-</para>
-
- event:
- code:
-
-
<!-- ##### FUNCTION gda_connection_event_get_source ##### -->
<para>
@@ -165,15 +114,6 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_event_set_source ##### -->
-<para>
-
-</para>
-
- event:
- source:
-
-
<!-- ##### FUNCTION gda_connection_event_get_sqlstate ##### -->
<para>
@@ -183,12 +123,3 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_event_set_sqlstate ##### -->
-<para>
-
-</para>
-
- event:
- sqlstate:
-
-
Modified: trunk/doc/C/tmpl/gda-connection.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-connection.sgml (original)
+++ trunk/doc/C/tmpl/gda-connection.sgml Tue Sep 16 18:45:28 2008
@@ -184,6 +184,16 @@
@Returns:
+<!-- ##### FUNCTION gda_connection_value_to_sql_string ##### -->
+<para>
+
+</para>
+
+ cnc:
+ from:
+ Returns:
+
+
<!-- ##### FUNCTION gda_connection_statement_to_sql ##### -->
<para>
@@ -374,7 +384,7 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_get_provider_obj ##### -->
+<!-- ##### FUNCTION gda_connection_get_provider ##### -->
<para>
</para>
@@ -392,16 +402,6 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_set_dsn ##### -->
-<para>
-
-</para>
-
- cnc:
- datasource:
- Returns:
-
-
<!-- ##### FUNCTION gda_connection_get_dsn ##### -->
<para>
@@ -529,13 +529,3 @@
@Returns:
-<!-- ##### FUNCTION gda_connection_value_to_sql_string ##### -->
-<para>
-
-</para>
-
- cnc:
- from:
- Returns:
-
-
Modified: trunk/doc/C/tmpl/gda-data-model-iter.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-data-model-iter.sgml (original)
+++ trunk/doc/C/tmpl/gda-data-model-iter.sgml Tue Sep 16 18:45:28 2008
@@ -117,6 +117,18 @@
@Returns:
+<!-- ##### FUNCTION gda_data_model_iter_set_value_at ##### -->
+<para>
+
+</para>
+
+ iter:
+ col:
+ value:
+ error:
+ Returns:
+
+
<!-- ##### FUNCTION gda_data_model_iter_is_valid ##### -->
<para>
Modified: trunk/doc/C/tmpl/gda-data-model.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-data-model.sgml (original)
+++ trunk/doc/C/tmpl/gda-data-model.sgml Tue Sep 16 18:45:28 2008
@@ -217,18 +217,6 @@
@Returns:
-<!-- ##### FUNCTION gda_data_model_get_value_at_column ##### -->
-<para>
-
-</para>
-
- model:
- column_name:
- row:
- error:
- Returns:
-
-
<!-- ##### FUNCTION gda_data_model_set_value_at ##### -->
<para>
Modified: trunk/doc/C/tmpl/gda-data-proxy.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-data-proxy.sgml (original)
+++ trunk/doc/C/tmpl/gda-data-proxy.sgml Tue Sep 16 18:45:28 2008
@@ -267,17 +267,6 @@
@Returns:
-<!-- ##### FUNCTION gda_data_proxy_find_row_from_values ##### -->
-<para>
-
-</para>
-
- proxy:
- values:
- cols_index:
- Returns:
-
-
<!-- ##### FUNCTION gda_data_proxy_cancel_row_changes ##### -->
<para>
Modified: trunk/doc/C/tmpl/libgda.sgml
==============================================================================
--- trunk/doc/C/tmpl/libgda.sgml (original)
+++ trunk/doc/C/tmpl/libgda.sgml Tue Sep 16 18:45:28 2008
@@ -24,3 +24,12 @@
+<!-- ##### FUNCTION gda_get_application_exec_path ##### -->
+<para>
+
+</para>
+
+ app_name:
+ Returns:
+
+
Modified: trunk/doc/C/tmpl/provider-support.sgml
==============================================================================
--- trunk/doc/C/tmpl/provider-support.sgml (original)
+++ trunk/doc/C/tmpl/provider-support.sgml Tue Sep 16 18:45:28 2008
@@ -163,6 +163,69 @@
@cnc:
+<!-- ##### FUNCTION gda_connection_event_new ##### -->
+<para>
+
+</para>
+
+ type:
+ Returns:
+
+
+<!-- ##### FUNCTION gda_connection_event_set_event_type ##### -->
+<para>
+
+</para>
+
+ event:
+ type:
+
+
+<!-- ##### FUNCTION gda_connection_event_set_description ##### -->
+<para>
+
+</para>
+
+ event:
+ description:
+
+
+<!-- ##### FUNCTION gda_connection_event_set_code ##### -->
+<para>
+
+</para>
+
+ event:
+ code:
+
+
+<!-- ##### FUNCTION gda_connection_event_set_gda_code ##### -->
+<para>
+
+</para>
+
+ event:
+ code:
+
+
+<!-- ##### FUNCTION gda_connection_event_set_source ##### -->
+<para>
+
+</para>
+
+ event:
+ source:
+
+
+<!-- ##### FUNCTION gda_connection_event_set_sqlstate ##### -->
+<para>
+
+</para>
+
+ event:
+ sqlstate:
+
+
<!-- ##### FUNCTION gda_connection_add_prepared_statement ##### -->
<para>
Modified: trunk/libgda/Makefile.am
==============================================================================
--- trunk/libgda/Makefile.am (original)
+++ trunk/libgda/Makefile.am Tue Sep 16 18:45:28 2008
@@ -12,6 +12,7 @@
-I$(top_builddir) \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
+ -DABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
$(LIBGDA_CFLAGS) \
$(FAM_CFLAGS) \
$(BDB_CFLAGS) \
Modified: trunk/libgda/gda-config.c
==============================================================================
--- trunk/libgda/gda-config.c (original)
+++ trunk/libgda/gda-config.c Tue Sep 16 18:45:28 2008
@@ -55,7 +55,7 @@
gchar *user_file;
gchar *system_file;
gboolean system_config_allowed;
- GSList *dsn_list; /* list of GdaDataSourceInfo structures */
+ GSList *dsn_list; /* list of GdaDsnInfo structures */
GSList *prov_list; /* list of InternalProvider structures */
};
@@ -75,8 +75,8 @@
GParamSpec *pspec);
static GdaConfig *unique_instance = NULL;
-static gint data_source_info_compare (GdaDataSourceInfo *infoa, GdaDataSourceInfo *infob);
-static void data_source_info_free (GdaDataSourceInfo *info);
+static gint data_source_info_compare (GdaDsnInfo *infoa, GdaDsnInfo *infob);
+static void data_source_info_free (GdaDsnInfo *info);
static void internal_provider_free (InternalProvider *ip);
static void load_config_file (const gchar *file, gboolean is_system);
static void save_config_file (gboolean is_system);
@@ -218,7 +218,7 @@
xmlChar *prop;
gchar *ptr;
- GdaDataSourceInfo *info;
+ GdaDsnInfo *info;
gboolean is_new = FALSE;
xmlNodePtr entry;
@@ -231,9 +231,9 @@
break;
}
}
- info = gda_config_get_dsn (ptr);
+ info = gda_config_get_dsn_info (ptr);
if (!info) {
- info = g_new0 (GdaDataSourceInfo, 1);
+ info = g_new0 (GdaDsnInfo, 1);
info->name = g_strdup (ptr);
is_new = TRUE;
}
@@ -333,7 +333,7 @@
root = xmlNewDocNode (doc, NULL, BAD_CAST "libgda-config", NULL);
xmlDocSetRootElement (doc, root);
for (list = unique_instance->priv->dsn_list; list; list = list->next) {
- GdaDataSourceInfo *info = (GdaDataSourceInfo*) list->data;
+ GdaDsnInfo *info = (GdaDsnInfo*) list->data;
if (info->is_system != is_system)
continue;
@@ -698,7 +698,7 @@
}
/**
- * gda_config_get_dsn
+ * gda_config_get_dsn_info
* @dsn_name: the name of the DSN to look for
*
* Get information about the DSN named @dsn_name.
@@ -707,10 +707,10 @@
* and optionaly <password> are provided, they are ignored). Also see the gda_dsn_split() utility
* function.
*
- * Returns: a a pointer to read-only #GdaDataSourceInfo structure, or %NULL if not found
+ * Returns: a a pointer to read-only #GdaDsnInfo structure, or %NULL if not found
*/
-GdaDataSourceInfo *
-gda_config_get_dsn (const gchar *dsn_name)
+GdaDsnInfo *
+gda_config_get_dsn_info (const gchar *dsn_name)
{
GSList *list;
@@ -730,10 +730,10 @@
gda_config_get ();
for (list = unique_instance->priv->dsn_list; list; list = list->next)
- if (!strcmp (((GdaDataSourceInfo*) list->data)->name, real_dsn)) {
+ if (!strcmp (((GdaDsnInfo*) list->data)->name, real_dsn)) {
GDA_CONFIG_UNLOCK ();
g_free (real_dsn);
- return (GdaDataSourceInfo*) list->data;
+ return (GdaDsnInfo*) list->data;
}
GDA_CONFIG_UNLOCK ();
g_free (real_dsn);
@@ -742,7 +742,7 @@
/**
* gda_config_define_dsn
- * @info: a pointer to a filled GdaDataSourceInfo structure
+ * @info: a pointer to a filled GdaDsnInfo structure
* @error: a place to store errors, or %NULL
*
* Add or update a DSN from the definition in @info
@@ -750,9 +750,9 @@
* Returns: TRUE if no error occurred
*/
gboolean
-gda_config_define_dsn (const GdaDataSourceInfo *info, GError **error)
+gda_config_define_dsn (const GdaDsnInfo *info, GError **error)
{
- GdaDataSourceInfo *einfo;
+ GdaDsnInfo *einfo;
gboolean save_user = FALSE;
gboolean save_system = FALSE;
@@ -774,7 +774,7 @@
save_system = TRUE;
else
save_user = TRUE;
- einfo = gda_config_get_dsn (info->name);
+ einfo = gda_config_get_dsn_info (info->name);
if (einfo) {
g_free (einfo->provider); einfo->provider = NULL;
g_free (einfo->cnc_string); einfo->cnc_string = NULL;
@@ -797,7 +797,7 @@
g_signal_emit (unique_instance, gda_config_signals[DSN_CHANGED], 0, einfo);
}
else {
- einfo = g_new0 (GdaDataSourceInfo, 1);
+ einfo = g_new0 (GdaDsnInfo, 1);
einfo->name = g_strdup (info->name);
if (info->provider)
einfo->provider = g_strdup (info->provider);
@@ -835,7 +835,7 @@
gboolean
gda_config_remove_dsn (const gchar *dsn_name, GError **error)
{
- GdaDataSourceInfo *info;
+ GdaDsnInfo *info;
gboolean save_user = FALSE;
gboolean save_system = FALSE;
@@ -845,7 +845,7 @@
if (!unique_instance)
gda_config_get ();
- info = gda_config_get_dsn (dsn_name);
+ info = gda_config_get_dsn_info (dsn_name);
if (!info) {
g_set_error (error, GDA_CONFIG_ERROR, GDA_CONFIG_DSN_NOT_FOUND_ERROR,
_("Unknown DSN '%s'"), dsn_name);
@@ -890,10 +890,10 @@
gboolean
gda_config_dsn_needs_authentication (const gchar *dsn_name)
{
- GdaDataSourceInfo *info;
+ GdaDsnInfo *info;
GdaProviderInfo *pinfo;
- info = gda_config_get_dsn (dsn_name);
+ info = gda_config_get_dsn_info (dsn_name);
if (!info)
return FALSE;
pinfo = gda_config_get_provider_info (info->provider);
@@ -958,7 +958,7 @@
}
/**
- * gda_config_get_dsn_index
+ * gda_config_get_dsn_info_index
* @dsn_name:
*
* Get the index (starting at 0) of the DSN named @dsn_name
@@ -966,9 +966,9 @@
* Returns: the index or -1 if not found
*/
gint
-gda_config_get_dsn_index (const gchar *dsn_name)
+gda_config_get_dsn_info_index (const gchar *dsn_name)
{
- GdaDataSourceInfo *info;
+ GdaDsnInfo *info;
gint ret = -1;
g_return_val_if_fail (dsn_name, -1);
@@ -976,7 +976,7 @@
if (!unique_instance)
gda_config_get ();
- info = gda_config_get_dsn (dsn_name);
+ info = gda_config_get_dsn_info (dsn_name);
if (info)
ret = g_slist_index (unique_instance->priv->dsn_list, info);
@@ -985,17 +985,17 @@
}
/**
- * gda_config_get_dsn_at_index
+ * gda_config_get_dsn_info_at_index
* @index:
*
- * Get a pointer to a read-only #GdaDataSourceInfo at the @index position
+ * Get a pointer to a read-only #GdaDsnInfo at the @index position
*
* Returns: the pointer or %NULL if no DSN exists at position @index
*/
-GdaDataSourceInfo *
-gda_config_get_dsn_at_index (gint index)
+GdaDsnInfo *
+gda_config_get_dsn_info_at_index (gint index)
{
- GdaDataSourceInfo *ret;
+ GdaDsnInfo *ret;
GDA_CONFIG_LOCK ();
if (!unique_instance)
gda_config_get ();
@@ -1060,7 +1060,7 @@
}
/**
- * gda_config_get_provider_object
+ * gda_config_get_provider
* @provider_name:
* @error: a place to store errors, or %NULL
*
@@ -1071,7 +1071,7 @@
* Returns: a pointer to the #GdaServerProvider, or %NULL if an error occurred
*/
GdaServerProvider *
-gda_config_get_provider_object (const gchar *provider_name, GError **error)
+gda_config_get_provider (const gchar *provider_name, GError **error)
{
InternalProvider *ip;
GdaServerProvider *(*plugin_create_provider) (void);
@@ -1122,7 +1122,7 @@
* <listitem><para>Description</para></listitem>
* <listitem><para>DSN parameters</para></listitem>
* <listitem><para>Authentication parameters</para></listitem>
- * <listitem><para>File</para></listitem>
+ * <listitem><para>File name of the plugin</para></listitem>
* </itemizedlist>
*
* Returns: a new #GdaDataModel
@@ -1392,7 +1392,7 @@
/* sorting function */
static gint
-data_source_info_compare (GdaDataSourceInfo *infoa, GdaDataSourceInfo *infob)
+data_source_info_compare (GdaDsnInfo *infoa, GdaDsnInfo *infob)
{
if (!infoa && !infob)
return 0;
@@ -1415,7 +1415,7 @@
}
static void
-data_source_info_free (GdaDataSourceInfo *info)
+data_source_info_free (GdaDsnInfo *info)
{
g_free (info->provider);
g_free (info->cnc_string);
@@ -1493,12 +1493,12 @@
g_print ("Reloading config files (%s config has changed)\n", is_system ? "global" : "user");
GSList *list;
for (list = unique_instance->priv->dsn_list; list; list = list->next) {
- GdaDataSourceInfo *info = (GdaDataSourceInfo *) list->data;
+ GdaDsnInfo *info = (GdaDsnInfo *) list->data;
g_print ("[info %p]: %s/%s\n", info, info->provider, info->name);
}
#endif
while (unique_instance->priv->dsn_list) {
- GdaDataSourceInfo *info = (GdaDataSourceInfo *) unique_instance->priv->dsn_list->data;
+ GdaDsnInfo *info = (GdaDsnInfo *) unique_instance->priv->dsn_list->data;
g_signal_emit (unique_instance, gda_config_signals[DSN_TO_BE_REMOVED], 0, info);
unique_instance->priv->dsn_list = g_slist_remove (unique_instance->priv->dsn_list, info);
g_signal_emit (unique_instance, gda_config_signals[DSN_REMOVED], 0, info);
Modified: trunk/libgda/gda-config.h
==============================================================================
--- trunk/libgda/gda-config.h (original)
+++ trunk/libgda/gda-config.h Tue Sep 16 18:45:28 2008
@@ -35,7 +35,7 @@
#define GDA_IS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_CONFIG))
typedef struct _GdaConfigPrivate GdaConfigPrivate;
-typedef struct _GdaDataSourceInfo GdaDataSourceInfo;
+typedef struct _GdaDsnInfo GdaDsnInfo;
typedef struct _GdaProviderInfo GdaProviderInfo;
/* error reporting */
@@ -49,7 +49,7 @@
GDA_CONFIG_PROVIDER_CREATION_ERROR
} GdaConfigError;
-struct _GdaDataSourceInfo {
+struct _GdaDsnInfo {
gchar *name; /* plain text, not RFC 1738 encoded */
gchar *provider; /* plain text, not RFC 1738 encoded */
gchar *description; /* plain text, not RFC 1738 encoded */
@@ -75,29 +75,29 @@
GObjectClass object_class;
/* signals */
- void (*dsn_added) (GdaConfig *conf, GdaDataSourceInfo *new_dsn);
- void (*dsn_to_be_removed) (GdaConfig *conf, GdaDataSourceInfo *old_dsn);
- void (*dsn_removed) (GdaConfig *conf, GdaDataSourceInfo *old_dsn);
- void (*dsn_changed) (GdaConfig *conf, GdaDataSourceInfo *dsn);
+ void (*dsn_added) (GdaConfig *conf, GdaDsnInfo *new_dsn);
+ void (*dsn_to_be_removed) (GdaConfig *conf, GdaDsnInfo *old_dsn);
+ void (*dsn_removed) (GdaConfig *conf, GdaDsnInfo *old_dsn);
+ void (*dsn_changed) (GdaConfig *conf, GdaDsnInfo *dsn);
};
-GType gda_config_get_type (void) G_GNUC_CONST;
-GdaConfig* gda_config_get (void);
+GType gda_config_get_type (void) G_GNUC_CONST;
+GdaConfig* gda_config_get (void);
-GdaDataSourceInfo *gda_config_get_dsn (const gchar *dsn_name);
-gboolean gda_config_define_dsn (const GdaDataSourceInfo *info, GError **error);
-gboolean gda_config_remove_dsn (const gchar *dsn_name, GError **error);
+GdaDsnInfo *gda_config_get_dsn_info (const gchar *dsn_name);
+gboolean gda_config_define_dsn (const GdaDsnInfo *info, GError **error);
+gboolean gda_config_remove_dsn (const gchar *dsn_name, GError **error);
gboolean gda_config_dsn_needs_authentication (const gchar *dsn_name);
-GdaDataModel *gda_config_list_dsn (void);
+GdaDataModel *gda_config_list_dsn (void);
gboolean gda_config_can_modify_system_config (void);
-gint gda_config_get_nb_dsn (void);
-gint gda_config_get_dsn_index (const gchar *dsn_name);
-GdaDataSourceInfo *gda_config_get_dsn_at_index (gint index);
-
-GdaProviderInfo *gda_config_get_provider_info (const gchar *provider_name);
-GdaServerProvider *gda_config_get_provider_object (const gchar *provider_name, GError **error);
-GdaDataModel *gda_config_list_providers (void);
+gint gda_config_get_nb_dsn (void);
+gint gda_config_get_dsn_info_index (const gchar *dsn_name);
+GdaDsnInfo *gda_config_get_dsn_info_at_index (gint index);
+
+GdaProviderInfo *gda_config_get_provider_info (const gchar *provider_name);
+GdaServerProvider *gda_config_get_provider (const gchar *provider_name, GError **error);
+GdaDataModel *gda_config_list_providers (void);
G_END_DECLS
Modified: trunk/libgda/gda-connection.c
==============================================================================
--- trunk/libgda/gda-connection.c (original)
+++ trunk/libgda/gda-connection.c Tue Sep 16 18:45:28 2008
@@ -388,13 +388,45 @@
g_cond_signal (cnc->priv->unique_possible_cond);
gda_mutex_unlock (cnc->priv->mutex);
break;
- case PROP_DSN:
+ case PROP_DSN: {
+ const gchar *datasource = g_value_get_string (value);
+ GdaDsnInfo *dsn;
+
gda_connection_lock ((GdaLockable*) cnc);
- gda_connection_set_dsn (cnc, g_value_get_string (value));
+ if (cnc->priv->is_open) {
+ g_warning (_("Could not set the '%s' property when the connection is opened"),
+ pspec->name);
+ gda_connection_unlock ((GdaLockable*) cnc);
+ return;
+ }
+
+ dsn = gda_config_get_dsn_info (datasource);
+ if (!dsn) {
+ g_warning (_("No DSN named '%s' defined"), datasource);
+ gda_connection_unlock ((GdaLockable*) cnc);
+ return;
+ }
+
+ g_free (cnc->priv->dsn);
+ cnc->priv->dsn = g_strdup (datasource);
+#ifdef GDA_DEBUG_signal
+ g_print (">> 'DSN_CHANGED' from %s\n", __FUNCTION__);
+#endif
+ g_signal_emit (G_OBJECT (cnc), gda_connection_signals[DSN_CHANGED], 0);
+#ifdef GDA_DEBUG_signal
+ g_print ("<< 'DSN_CHANGED' from %s\n", __FUNCTION__);
+#endif
gda_connection_unlock ((GdaLockable*) cnc);
break;
+ }
case PROP_CNC_STRING:
gda_connection_lock ((GdaLockable*) cnc);
+ if (cnc->priv->is_open) {
+ g_warning (_("Could not set the '%s' property when the connection is opened"),
+ pspec->name);
+ gda_connection_unlock ((GdaLockable*) cnc);
+ return;
+ }
g_free (cnc->priv->cnc_string);
cnc->priv->cnc_string = NULL;
if (g_value_get_string (value))
@@ -403,8 +435,14 @@
break;
case PROP_PROVIDER_OBJ:
gda_connection_lock ((GdaLockable*) cnc);
+ if (cnc->priv->is_open) {
+ g_warning (_("Could not set the '%s' property when the connection is opened"),
+ pspec->name);
+ gda_connection_unlock ((GdaLockable*) cnc);
+ return;
+ }
if (cnc->priv->provider_obj)
- g_object_unref(cnc->priv->provider_obj);
+ g_object_unref (cnc->priv->provider_obj);
cnc->priv->provider_obj = g_value_get_object (value);
g_object_ref (G_OBJECT (cnc->priv->provider_obj));
@@ -412,7 +450,13 @@
break;
case PROP_AUTH_STRING:
gda_connection_lock ((GdaLockable*) cnc);
- if (! cnc->priv->is_open) {
+ if (cnc->priv->is_open) {
+ g_warning (_("Could not set the '%s' property when the connection is opened"),
+ pspec->name);
+ gda_connection_unlock ((GdaLockable*) cnc);
+ return;
+ }
+ else {
const gchar *str = g_value_get_string (value);
g_free (cnc->priv->auth_string);
cnc->priv->auth_string = NULL;
@@ -423,6 +467,12 @@
break;
case PROP_OPTIONS:
gda_mutex_lock (cnc->priv->mutex);
+ if (cnc->priv->is_open) {
+ g_warning (_("Could not set the '%s' property when the connection is opened"),
+ pspec->name);
+ gda_connection_unlock ((GdaLockable*) cnc);
+ return;
+ }
cnc->priv->options = g_value_get_flags (value);
gda_mutex_unlock (cnc->priv->mutex);
break;
@@ -509,7 +559,7 @@
GdaConnectionOptions options, GError **error)
{
GdaConnection *cnc = NULL;
- GdaDataSourceInfo *dsn_info;
+ GdaDsnInfo *dsn_info;
gchar *user, *pass, *real_dsn;
gchar *real_auth_string = NULL;
@@ -524,7 +574,7 @@
}
/* get the data source info */
- dsn_info = gda_config_get_dsn (real_dsn);
+ dsn_info = gda_config_get_dsn_info (real_dsn);
if (!dsn_info) {
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_DSN_NOT_FOUND_ERROR,
_("Data source %s not found in configuration"), real_dsn);
@@ -551,7 +601,7 @@
if (dsn_info->provider != NULL) {
GdaServerProvider *prov;
- prov = gda_config_get_provider_object (dsn_info->provider, error);
+ prov = gda_config_get_provider (dsn_info->provider, error);
if (prov) {
if (PROV_CLASS (prov)->create_connection) {
cnc = PROV_CLASS (prov)->create_connection (prov);
@@ -678,7 +728,7 @@
if (provider_name || real_provider) {
GdaServerProvider *prov;
- prov = gda_config_get_provider_object (provider_name ? provider_name : real_provider, error);
+ prov = gda_config_get_provider (provider_name ? provider_name : real_provider, error);
if (prov) {
if (PROV_CLASS (prov)->create_connection) {
cnc = PROV_CLASS (prov)->create_connection (prov);
@@ -725,7 +775,7 @@
gboolean
gda_connection_open (GdaConnection *cnc, GError **error)
{
- GdaDataSourceInfo *dsn_info = NULL;
+ GdaDsnInfo *dsn_info = NULL;
GdaQuarkList *params, *auth;
char *real_auth_string = NULL;
@@ -741,7 +791,7 @@
/* connection string */
if (cnc->priv->dsn) {
/* get the data source info */
- dsn_info = gda_config_get_dsn (cnc->priv->dsn);
+ dsn_info = gda_config_get_dsn_info (cnc->priv->dsn);
if (!dsn_info) {
gda_log_error (_("Data source %s not found in configuration"), cnc->priv->dsn);
g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_NONEXIST_DSN_ERROR,
@@ -970,7 +1020,7 @@
}
/**
- * gda_connection_get_provider_obj
+ * gda_connection_get_provider
* @cnc: a #GdaConnection object
*
* Get a pointer to the #GdaServerProvider object used to access the database
@@ -978,7 +1028,7 @@
* Returns: the #GdaServerProvider (NEVER NULL)
*/
GdaServerProvider *
-gda_connection_get_provider_obj (GdaConnection *cnc)
+gda_connection_get_provider (GdaConnection *cnc)
{
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
g_return_val_if_fail (cnc->priv, NULL);
@@ -1006,51 +1056,6 @@
}
/**
- * gda_connection_set_dsn
- * @cnc: a #GdaConnection object
- * @datasource: a gda datasource
- *
- * Sets the data source of the connection. If the connection is already opened,
- * then no action is performed at all and FALSE is returned.
- *
- * If the requested datasource does not exist, then nothing is done and FALSE
- * is returned.
- *
- * Returns: TRUE on success
- */
-gboolean
-gda_connection_set_dsn (GdaConnection *cnc, const gchar *datasource)
-{
- GdaDataSourceInfo *dsn;
-
- g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (cnc->priv, FALSE);
- g_return_val_if_fail (datasource && *datasource, FALSE);
-
- if (cnc->priv->is_open)
- return FALSE;
-
- dsn = gda_config_get_dsn (datasource);
- if (!dsn)
- return FALSE;
-
- gda_connection_lock ((GdaLockable*) cnc);
-
- g_free (cnc->priv->dsn);
- cnc->priv->dsn = g_strdup (datasource);
-#ifdef GDA_DEBUG_signal
- g_print (">> 'DSN_CHANGED' from %s\n", __FUNCTION__);
-#endif
- g_signal_emit (G_OBJECT (cnc), gda_connection_signals[DSN_CHANGED], 0);
-#ifdef GDA_DEBUG_signal
- g_print ("<< 'DSN_CHANGED' from %s\n", __FUNCTION__);
-#endif
-
- gda_connection_unlock ((GdaLockable*) cnc);
- return TRUE;
-}
-
-/**
* gda_connection_get_dsn
* @cnc: a #GdaConnection object
*
@@ -3035,7 +3040,7 @@
lcontext.table_name = rmeta [i].table_name;
if (!rmeta [i].func (provider, cnc, store, &lcontext, error)) {
g_print ("TH %p CNC %p ERROR, prov=%p (%s)\n", g_thread_self(), cnc,
- gda_connection_get_provider_obj (cnc),
+ gda_connection_get_provider (cnc),
gda_connection_get_provider_name (cnc));
g_warning ("//");
Modified: trunk/libgda/gda-connection.h
==============================================================================
--- trunk/libgda/gda-connection.h (original)
+++ trunk/libgda/gda-connection.h Tue Sep 16 18:45:28 2008
@@ -144,7 +144,7 @@
GdaConnectionOptions gda_connection_get_options (GdaConnection *cnc);
-GdaServerProvider *gda_connection_get_provider_obj (GdaConnection *cnc);
+GdaServerProvider *gda_connection_get_provider (GdaConnection *cnc);
const gchar *gda_connection_get_provider_name (GdaConnection *cnc);
GdaServerOperation *gda_connection_create_operation (GdaConnection *cnc, GdaServerOperationType type,
@@ -152,7 +152,6 @@
gboolean gda_connection_perform_operation (GdaConnection *cnc, GdaServerOperation *op, GError **error);
const gchar *gda_connection_get_dsn (GdaConnection *cnc);
-gboolean gda_connection_set_dsn (GdaConnection *cnc, const gchar *datasource);
const gchar *gda_connection_get_cnc_string (GdaConnection *cnc);
const gchar *gda_connection_get_authentication (GdaConnection *cnc);
Modified: trunk/libgda/gda-data-model-dsn-list.c
==============================================================================
--- trunk/libgda/gda-data-model-dsn-list.c (original)
+++ trunk/libgda/gda-data-model-dsn-list.c Tue Sep 16 18:45:28 2008
@@ -52,10 +52,10 @@
static GObjectClass *parent_class = NULL;
-static void dsn_added_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model);
-static void dsn_to_be_removed_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model);
-static void dsn_removed_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model);
-static void dsn_changed_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model);
+static void dsn_added_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model);
+static void dsn_to_be_removed_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model);
+static void dsn_removed_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model);
+static void dsn_changed_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model);
/*
* Object init and finalize
@@ -195,20 +195,20 @@
}
static void
-dsn_added_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model)
+dsn_added_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model)
{
model->priv->nb_dsn++;
- gda_data_model_row_inserted ((GdaDataModel *) model, gda_config_get_dsn_index (info->name));
+ gda_data_model_row_inserted ((GdaDataModel *) model, gda_config_get_dsn_info_index (info->name));
}
static void
-dsn_to_be_removed_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model)
+dsn_to_be_removed_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model)
{
- model->priv->row_to_remove = gda_config_get_dsn_index (info->name);
+ model->priv->row_to_remove = gda_config_get_dsn_info_index (info->name);
}
static void
-dsn_removed_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model)
+dsn_removed_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model)
{
model->priv->nb_dsn--;
gda_data_model_row_removed ((GdaDataModel *) model, model->priv->row_to_remove);
@@ -216,9 +216,9 @@
}
static void
-dsn_changed_cb (GdaConfig *conf, GdaDataSourceInfo *info, GdaDataModelDsnList *model)
+dsn_changed_cb (GdaConfig *conf, GdaDsnInfo *info, GdaDataModelDsnList *model)
{
- gda_data_model_row_updated ((GdaDataModel *) model, gda_config_get_dsn_index (info->name));
+ gda_data_model_row_updated ((GdaDataModel *) model, gda_config_get_dsn_info_index (info->name));
}
@@ -318,7 +318,7 @@
return NULL;
}
- GdaDataSourceInfo *info = gda_config_get_dsn_at_index (row);
+ GdaDsnInfo *info = gda_config_get_dsn_info_at_index (row);
g_assert (info);
if (col != 5)
dmodel->priv->tmp_value = gda_value_new (G_TYPE_STRING);
Modified: trunk/libgda/gda-data-model-iter.c
==============================================================================
--- trunk/libgda/gda-data-model-iter.c (original)
+++ trunk/libgda/gda-data-model-iter.c Tue Sep 16 18:45:28 2008
@@ -968,6 +968,36 @@
}
/**
+ * gda_data_model_iter_set_value_at
+ * @iter: a #GdaDataModelIter object
+ * @col: the column number
+ * @value: a #GValue (not %NULL)
+ * @error: a place to store errors, or %NULL
+ *
+ * Sets a value in @iter, at the column specified by @col
+ *
+ * Returns: TRUE if no error occurred
+ */
+gboolean
+gda_data_model_iter_set_value_at (GdaDataModelIter *iter, gint col, const GValue *value, GError **error)
+{
+ GdaHolder *holder;
+
+ g_return_val_if_fail (GDA_IS_DATA_MODEL_ITER (iter), FALSE);
+ g_return_val_if_fail (iter->priv, FALSE);
+ g_return_val_if_fail (value, FALSE);
+
+ holder = gda_data_model_iter_get_holder_for_field (iter, col);
+ if (!holder) {
+ g_set_error (error, GDA_DATA_MODEL_ITER_ERROR, GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR,
+ _("Column %d out of range (0-%d)"), col,
+ g_slist_length (((GdaSet *) iter)->holders) - 1);
+ return FALSE;
+ }
+ return gda_holder_set_value (holder, value, error);
+}
+
+/**
* gda_data_model_iter_get_value_for_field
* @iter: a #GdaDataModelIter object
* @field_name: the requested column name
Modified: trunk/libgda/gda-data-model-iter.h
==============================================================================
--- trunk/libgda/gda-data-model-iter.h (original)
+++ trunk/libgda/gda-data-model-iter.h Tue Sep 16 18:45:28 2008
@@ -39,7 +39,7 @@
typedef enum
{
- GDA_DATA_MODEL_ITER_WHAT_ERROR
+ GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_ERROR
} GdaDataModelIterError;
@@ -63,6 +63,8 @@
const GValue *gda_data_model_iter_get_value_at (GdaDataModelIter *iter, gint col);
const GValue *gda_data_model_iter_get_value_for_field (GdaDataModelIter *iter, const gchar *field_name);
+gboolean gda_data_model_iter_set_value_at (GdaDataModelIter *iter, gint col,
+ const GValue *value, GError **error);
gboolean gda_data_model_iter_move_at_row (GdaDataModelIter *iter, gint row);
gboolean gda_data_model_iter_move_next (GdaDataModelIter *iter);
Modified: trunk/libgda/gda-data-model.c
==============================================================================
--- trunk/libgda/gda-data-model.c (original)
+++ trunk/libgda/gda-data-model.c Tue Sep 16 18:45:28 2008
@@ -317,24 +317,6 @@
}
/**
- * gda_data_model_is_updatable
- * @model: a #GdaDataModel object.
- *
- * Tells if @model can be modified
- *
- * Returns: TRUE if @model can be modified
- */
-gboolean
-gda_data_model_is_updatable (GdaDataModel *model)
-{
- GdaDataModelAccessFlags flags;
-
- g_return_val_if_fail (GDA_IS_DATA_MODEL (model), FALSE);
- flags = gda_data_model_get_access_flags (model);
- return (flags & GDA_DATA_MODEL_ACCESS_WRITE);
-}
-
-/**
* gda_data_model_get_access_flags
* @model: a #GdaDataModel object.
*
@@ -636,35 +618,6 @@
}
/**
- * gda_data_model_get_value_at_column
- * @model: a #GdaDataModel object.
- * @column_name: a valid column name.
- * @row: a valid row number.
- * @error: a place to store errors, or %NULL
- *
- * Retrieves the data stored in the given position (identified by
- * the first column named @column_name and the @row row) in a data model.
- *
- * See also gda_data_model_get_value_at().
- *
- * Returns: a #GValue containing the value stored in the given
- * position, or %NULL on error (out-of-bound position, etc).
- */
-const GValue *
-gda_data_model_get_value_at_column (GdaDataModel *model, const gchar *column_name, gint row, GError **error)
-{
- gint ncol;
- g_return_val_if_fail (GDA_IS_DATA_MODEL (model), NULL);
- g_return_val_if_fail (column_name, NULL);
-
- ncol = gda_data_model_get_column_index (model, column_name);
- if (ncol == -1)
- return NULL;
- else
- return gda_data_model_get_value_at (model, ncol, row, error);
-}
-
-/**
* gda_data_model_get_attributes_at
* @model: a #GdaDataModel object
* @col: a valid column number
Modified: trunk/libgda/gda-data-model.h
==============================================================================
--- trunk/libgda/gda-data-model.h (original)
+++ trunk/libgda/gda-data-model.h Tue Sep 16 18:45:28 2008
@@ -119,8 +119,7 @@
GType gda_data_model_get_type (void) G_GNUC_CONST;
-gboolean gda_data_model_is_updatable (GdaDataModel *model);
-GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *model);
+GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *model);
gint gda_data_model_get_n_rows (GdaDataModel *model);
gint gda_data_model_get_n_columns (GdaDataModel *model);
@@ -135,8 +134,6 @@
const GValue *gda_data_model_get_value_at (GdaDataModel *model, gint col, gint row, GError **error);
const GValue *gda_data_model_get_typed_value_at (GdaDataModel *model, gint col, gint row,
GType expected_type, gboolean nullok, GError **error);
-const GValue *gda_data_model_get_value_at_column (GdaDataModel *model,
- const gchar *column_name, gint row, GError **error);
GdaValueAttribute gda_data_model_get_attributes_at (GdaDataModel *model, gint col, gint row);
GdaDataModelIter *gda_data_model_create_iter (GdaDataModel *model);
void gda_data_model_freeze (GdaDataModel *model);
Modified: trunk/libgda/gda-data-proxy.c
==============================================================================
--- trunk/libgda/gda-data-proxy.c (original)
+++ trunk/libgda/gda-data-proxy.c Tue Sep 16 18:45:28 2008
@@ -72,6 +72,9 @@
const GValue *value, GError **error);
static gboolean gda_data_proxy_set_values (GdaDataModel *model, gint row,
GList *values, GError **error);
+static gint gda_data_proxy_find_row_from_values (GdaDataModel *model, GSList *values,
+ gint *cols_index);
+
static gint gda_data_proxy_append_values (GdaDataModel *model, const GList *values, GError **error);
static gint gda_data_proxy_append_row (GdaDataModel *model, GError **error);
static gboolean gda_data_proxy_remove_row (GdaDataModel *model, gint row, GError **error);
@@ -637,7 +640,7 @@
iface->i_append_values = gda_data_proxy_append_values;
iface->i_append_row = gda_data_proxy_append_row;
iface->i_remove_row = gda_data_proxy_remove_row;
- iface->i_find_row = NULL;
+ iface->i_find_row = gda_data_proxy_find_row_from_values;
iface->i_set_notify = gda_data_proxy_set_notify;
iface->i_get_notify = gda_data_proxy_get_notify;
@@ -1124,10 +1127,13 @@
gboolean
gda_data_proxy_is_read_only (GdaDataProxy *proxy)
{
+ GdaDataModelAccessFlags flags;
+
g_return_val_if_fail (GDA_IS_DATA_PROXY (proxy), TRUE);
g_return_val_if_fail (proxy->priv, TRUE);
-
- return ! gda_data_model_is_updatable (proxy->priv->model);
+
+ flags = gda_data_model_get_access_flags (proxy->priv->model);
+ return ! (flags & GDA_DATA_MODEL_ACCESS_WRITE);
}
@@ -1543,80 +1549,6 @@
}
/**
- * gda_data_proxy_find_row_from_values
- * @proxy: a #GdaDataProxy object
- * @values: a list of #GValue values
- * @cols_index: an array of #gint containing the column number to match each value of @values
- *
- * Find the first row where all the values in @values at the columns identified at
- * @cols_index match.
- *
- * NOTE: the @cols_index array MUST contain a column index for each value in @values
- *
- * Returns: proxy row number if the row has been identified, or -1 otherwise
- */
-gint
-gda_data_proxy_find_row_from_values (GdaDataProxy *proxy, GSList *values, gint *cols_index)
-{
- gboolean found = FALSE;
- gint proxy_row;
- gint current_nb_rows;
-
- g_return_val_if_fail (GDA_IS_DATA_PROXY (proxy), FALSE);
- g_return_val_if_fail (proxy->priv, FALSE);
- g_return_val_if_fail (values, FALSE);
-
- /* ensure that there is no sync to be done */
- ensure_chunk_sync (proxy);
-
- /* FIXME: use a virtual connection here with some SQL, it'll be much easier and will avoid
- * much code
- */
- TO_IMPLEMENT;
-
- /* if there are still some rows waiting to be added in the idle loop, then force them to be added
- * first, otherwise we might not find what we are looking for!
- */
- if (proxy->priv->chunk_sync_idle_id) {
- g_idle_remove_by_data (proxy);
- proxy->priv->chunk_sync_idle_id = 0;
- while (chunk_sync_idle (proxy)) ;
- }
-
- current_nb_rows = gda_data_proxy_get_n_rows ((GdaDataModel*) proxy);
- for (proxy_row = 0; proxy_row < current_nb_rows; proxy_row++) {
- gboolean allequal = TRUE;
- GSList *list;
- gint index;
- const GValue *value;
-
- list = values;
- index = 0;
- while (list && allequal) {
- if (cols_index)
- g_return_val_if_fail (cols_index [index] < proxy->priv->model_nb_cols, FALSE);
- value = gda_data_proxy_get_value_at ((GdaDataModel *) proxy,
- cols_index ? cols_index [index] :
- index, proxy_row, NULL);
- if (!value)
- return -1;
- if (gda_value_compare ((GValue *) (list->data), (GValue *) value))
- allequal = FALSE;
-
- list = g_slist_next (list);
- index++;
- }
- if (allequal) {
- found = TRUE;
- break;
- }
- }
-
- return found ? proxy_row : -1;
-}
-
-
-/**
* gda_data_proxy_get_model
* @proxy: a #GdaDataProxy object
*
@@ -2827,8 +2759,12 @@
vcnc = proxy->priv->filter_vcnc;
if (!vcnc) {
- vcnc = gda_virtual_connection_open (virtual_provider, NULL);
+ GError *lerror = NULL;
+ vcnc = gda_virtual_connection_open (virtual_provider, &lerror);
if (! vcnc) {
+ g_print ("Virtual ERROR: %s\n", lerror && lerror->message ? lerror->message : "No detail");
+ if (lerror)
+ g_error_free (lerror);
g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_FILTER_ERROR,
_("Could not create virtual connection"));
proxy->priv->force_direct_mapping = FALSE;
@@ -3353,6 +3289,69 @@
return gda_data_proxy_get_value_attributes ((GdaDataProxy *) model, row, col);
}
+static gint
+gda_data_proxy_find_row_from_values (GdaDataModel *model, GSList *values, gint *cols_index)
+{
+ gboolean found = FALSE;
+ gint proxy_row;
+ gint current_nb_rows;
+ GdaDataProxy *proxy;
+
+ g_return_val_if_fail (GDA_IS_DATA_PROXY (proxy), FALSE);
+ proxy = (GdaDataProxy*) model;
+ g_return_val_if_fail (proxy->priv, FALSE);
+ g_return_val_if_fail (values, FALSE);
+
+ /* ensure that there is no sync to be done */
+ ensure_chunk_sync (proxy);
+
+ /* FIXME: use a virtual connection here with some SQL, it'll be much easier and will avoid
+ * much code
+ */
+ TO_IMPLEMENT;
+
+ /* if there are still some rows waiting to be added in the idle loop, then force them to be added
+ * first, otherwise we might not find what we are looking for!
+ */
+ if (proxy->priv->chunk_sync_idle_id) {
+ g_idle_remove_by_data (proxy);
+ proxy->priv->chunk_sync_idle_id = 0;
+ while (chunk_sync_idle (proxy)) ;
+ }
+
+ current_nb_rows = gda_data_proxy_get_n_rows ((GdaDataModel*) proxy);
+ for (proxy_row = 0; proxy_row < current_nb_rows; proxy_row++) {
+ gboolean allequal = TRUE;
+ GSList *list;
+ gint index;
+ const GValue *value;
+
+ list = values;
+ index = 0;
+ while (list && allequal) {
+ if (cols_index)
+ g_return_val_if_fail (cols_index [index] < proxy->priv->model_nb_cols, FALSE);
+ value = gda_data_proxy_get_value_at ((GdaDataModel *) proxy,
+ cols_index ? cols_index [index] :
+ index, proxy_row, NULL);
+ if (!value)
+ return -1;
+ if (gda_value_compare ((GValue *) (list->data), (GValue *) value))
+ allequal = FALSE;
+
+ list = g_slist_next (list);
+ index++;
+ }
+ if (allequal) {
+ found = TRUE;
+ break;
+ }
+ }
+
+ return found ? proxy_row : -1;
+}
+
+
static GdaDataModelIter *
gda_data_proxy_create_iter (GdaDataModel *model)
{
Modified: trunk/libgda/gda-data-proxy.h
==============================================================================
--- trunk/libgda/gda-data-proxy.h (original)
+++ trunk/libgda/gda-data-proxy.h Tue Sep 16 18:45:28 2008
@@ -87,8 +87,6 @@
gboolean gda_data_proxy_row_is_deleted (GdaDataProxy *proxy, gint proxy_row);
gboolean gda_data_proxy_row_is_inserted (GdaDataProxy *proxy, gint proxy_row);
-gint gda_data_proxy_find_row_from_values (GdaDataProxy *proxy, GSList *values,
- gint *cols_index);
gboolean gda_data_proxy_row_has_changed (GdaDataProxy *proxy, gint proxy_row);
gboolean gda_data_proxy_has_changed (GdaDataProxy *proxy);
gint gda_data_proxy_get_n_new_rows (GdaDataProxy *proxy);
Modified: trunk/libgda/gda-easy.c
==============================================================================
--- trunk/libgda/gda-easy.c (original)
+++ trunk/libgda/gda-easy.c Tue Sep 16 18:45:28 2008
@@ -58,7 +58,7 @@
g_return_val_if_fail (provider && *provider, NULL);
- prov = gda_config_get_provider_object (provider, error);
+ prov = gda_config_get_provider (provider, error);
if (prov) {
GdaServerOperation *op;
op = gda_server_provider_create_operation (prov, NULL, GDA_SERVER_OPERATION_CREATE_DB,
@@ -124,7 +124,7 @@
g_return_val_if_fail (provider && *provider, NULL);
- prov = gda_config_get_provider_object (provider, error);
+ prov = gda_config_get_provider (provider, error);
if (prov) {
GdaServerOperation *op;
op = gda_server_provider_create_operation (prov, NULL, GDA_SERVER_OPERATION_DROP_DB,
@@ -265,7 +265,7 @@
g_return_val_if_fail (gda_connection_is_opened (cnc), FALSE);
- server = gda_connection_get_provider_obj (cnc);
+ server = gda_connection_get_provider (cnc);
if (!table_name) {
g_set_error (error, GDA_EASY_ERROR, GDA_EASY_OBJECT_NAME_ERROR,
@@ -351,7 +351,7 @@
cnc = g_object_get_data (G_OBJECT (op), "_gda_connection");
if (cnc)
- return gda_server_provider_perform_operation (gda_connection_get_provider_obj (cnc), cnc, op, error);
+ return gda_server_provider_perform_operation (gda_connection_get_provider (cnc), cnc, op, error);
else {
g_warning ("Could not find operation's associated connection, "
"did you use gda_prepare_create_table() ?");
@@ -376,7 +376,7 @@
GdaServerOperation *op;
GdaServerProvider *server;
- server = gda_connection_get_provider_obj (cnc);
+ server = gda_connection_get_provider (cnc);
op = gda_server_provider_create_operation (server, cnc,
GDA_SERVER_OPERATION_DROP_TABLE, NULL, error);
@@ -417,7 +417,7 @@
cnc = g_object_get_data (G_OBJECT (op), "_gda_connection");
if (cnc)
- return gda_server_provider_perform_operation (gda_connection_get_provider_obj (cnc), cnc, op, error);
+ return gda_server_provider_perform_operation (gda_connection_get_provider (cnc), cnc, op, error);
else {
g_warning ("Could not find operation's associated connection, "
"did you use gda_prepare_drop_table() ?");
Modified: trunk/libgda/gda-init.c
==============================================================================
--- trunk/libgda/gda-init.c (original)
+++ trunk/libgda/gda-init.c Tue Sep 16 18:45:28 2008
@@ -189,3 +189,33 @@
initialized = TRUE;
g_static_mutex_unlock (&init_mutex);
}
+
+/**
+ * gda_get_application_exec_path
+ * @app_name: the name of the application to find
+ *
+ * Find the path to the application identified by @app_name. For example if the application
+ * is "gda-sql", then calling this function will return
+ * "/your/prefix/bin/gda-sql-4.0" if Libgda is installed in
+ * the "/your/prefix" prefix (which would usually be "/usr"), and for the ABI version 4.0.
+ *
+ * Returns: the path as a new string, or %NULL if the application cannot be found
+ */
+gchar *
+gda_get_application_exec_path (const gchar *app_name)
+{
+ gchar *str;
+ gchar *fname;
+ g_return_val_if_fail (app_name, NULL);
+
+ gda_gbr_init ();
+ fname = g_strdup_printf ("%s-%s", app_name, ABI_VERSION);
+ str = gda_gbr_get_file_path (GDA_BIN_DIR, fname, NULL);
+ g_free (fname);
+ if (!g_file_test (str, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE)) {
+ g_free (str);
+ str = NULL;
+ }
+
+ return str;
+}
Modified: trunk/libgda/gda-meta-store.c
==============================================================================
--- trunk/libgda/gda-meta-store.c (original)
+++ trunk/libgda/gda-meta-store.c Tue Sep 16 18:45:28 2008
@@ -765,7 +765,7 @@
if (!prepare_server_operations (store, error))
return FALSE;
- prov = gda_connection_get_provider_obj (store->priv->cnc);
+ prov = gda_connection_get_provider (store->priv->cnc);
for (list = klass->cpriv->db_objects; list; list = list->next) {
DbObject *dbo = DB_OBJECT (list->data);
/*g_print ("Creating object: %s\n", dbo->obj_name);*/
@@ -812,7 +812,7 @@
for (objects = klass->cpriv->db_objects; objects; objects = objects->next) {
DbObject *dbo = DB_OBJECT (objects->data);
- if (! prepare_dbo_server_operation (klass, store, gda_connection_get_provider_obj (store->priv->cnc),
+ if (! prepare_dbo_server_operation (klass, store, gda_connection_get_provider (store->priv->cnc),
dbo, error))
return FALSE;
}
@@ -3253,7 +3253,7 @@
if (needs_creation) {
/* prepare the create operation */
GdaServerProvider *prov;
- prov = gda_connection_get_provider_obj (store->priv->cnc);
+ prov = gda_connection_get_provider (store->priv->cnc);
if (! prepare_dbo_server_operation (klass, store, prov, dbo, error))
goto onerror;
Modified: trunk/libgda/gda-server-operation.c
==============================================================================
--- trunk/libgda/gda-server-operation.c (original)
+++ trunk/libgda/gda-server-operation.c Tue Sep 16 18:45:28 2008
@@ -530,10 +530,10 @@
if (op->priv->cnc) {
g_object_ref (op->priv->cnc);
- if (gda_connection_get_provider_obj (op->priv->cnc)) {
+ if (gda_connection_get_provider (op->priv->cnc)) {
if (op->priv->prov)
g_object_unref (op->priv->prov);
- op->priv->prov = gda_connection_get_provider_obj (op->priv->cnc);
+ op->priv->prov = gda_connection_get_provider (op->priv->cnc);
g_object_ref (op->priv->prov);
op->priv->prov_set = TRUE;
}
Modified: trunk/libgda/gda-statement.c
==============================================================================
--- trunk/libgda/gda-statement.c (original)
+++ trunk/libgda/gda-statement.c Tue Sep 16 18:45:28 2008
@@ -723,7 +723,7 @@
context.flags = flags;
if (cnc) {
context.cnc = cnc;
- context.provider = gda_connection_get_provider_obj (cnc);
+ context.provider = gda_connection_get_provider (cnc);
}
str = gda_statement_to_sql_real (stmt, &context, error);
Modified: trunk/libgda/gda-xa-transaction.c
==============================================================================
--- trunk/libgda/gda-xa-transaction.c (original)
+++ trunk/libgda/gda-xa-transaction.c Tue Sep 16 18:45:28 2008
@@ -299,7 +299,7 @@
/* check that connection supports distributed transaction, only ONE connection in @xa_trans is allowed
* to not support them */
GdaServerProvider *prov;
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
if (! PROV_CLASS (prov)->xa_funcs) {
/* if another connection does not support distributed transaction, then there is an error */
if (xa_trans->priv->non_xa_cnc) {
@@ -371,7 +371,7 @@
GdaServerProvider *prov;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
if (cnc != xa_trans->priv->non_xa_cnc) {
if (!PROV_CLASS (prov)->xa_funcs->xa_start) {
@@ -403,7 +403,7 @@
GdaServerProvider *prov;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
if (cnc != xa_trans->priv->non_xa_cnc) {
if (!PROV_CLASS (prov)->xa_funcs->xa_rollback)
g_warning (_("Provider error: %s method not implemented for provider %s"),
@@ -466,7 +466,7 @@
continue;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
branch = g_hash_table_lookup (xa_trans->priv->cnc_hash, cnc);
memcpy (xa_trans->priv->xid.data + xa_trans->priv->xid.gtrid_length,
@@ -501,7 +501,7 @@
else {
const GdaBinary *branch;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
branch = g_hash_table_lookup (xa_trans->priv->cnc_hash, cnc);
memcpy (xa_trans->priv->xid.data + xa_trans->priv->xid.gtrid_length,
branch->data, branch->binary_length);
@@ -531,7 +531,7 @@
else {
const GdaBinary *branch;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
branch = g_hash_table_lookup (xa_trans->priv->cnc_hash, cnc);
memcpy (xa_trans->priv->xid.data + xa_trans->priv->xid.gtrid_length,
branch->data, branch->binary_length);
@@ -555,7 +555,7 @@
continue;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
branch = g_hash_table_lookup (xa_trans->priv->cnc_hash, cnc);
memcpy (xa_trans->priv->xid.data + xa_trans->priv->xid.gtrid_length,
branch->data, branch->binary_length);
@@ -587,7 +587,7 @@
GdaServerProvider *prov;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
if (cnc == xa_trans->priv->non_xa_cnc)
gda_connection_rollback_transaction (cnc, NULL, NULL);
@@ -634,7 +634,7 @@
GdaServerProvider *prov;
cnc = GDA_CONNECTION (list->data);
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
if (cnc == xa_trans->priv->non_xa_cnc)
continue;
Modified: trunk/libgda/libgda.h.in
==============================================================================
--- trunk/libgda/libgda.h.in (original)
+++ trunk/libgda/libgda.h.in Tue Sep 16 18:45:28 2008
@@ -79,6 +79,7 @@
G_BEGIN_DECLS
void gda_init (void);
+gchar *gda_get_application_exec_path (const gchar *app_name);
G_END_DECLS
Modified: trunk/libgda/sqlite/gda-sqlite-provider.c
==============================================================================
--- trunk/libgda/sqlite/gda-sqlite-provider.c (original)
+++ trunk/libgda/sqlite/gda-sqlite-provider.c Tue Sep 16 18:45:28 2008
@@ -728,7 +728,7 @@
gda_sqlite_provider_close_connection (GdaServerProvider *provider, GdaConnection *cnc)
{
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
/* nothing specific to do: sqlite3_close() is called when SqliteConnectionData is destroyed */
return TRUE;
@@ -744,7 +744,7 @@
static gchar *version_string = NULL;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
g_static_mutex_lock (&mutex);
if (!version_string)
@@ -763,7 +763,7 @@
SqliteConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (SqliteConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1002,7 +1002,7 @@
gboolean status = TRUE;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
if (gda_connection_get_options (cnc) & GDA_CONNECTION_OPTIONS_READ_ONLY) {
gda_connection_add_event_string (cnc, _("Transactions are not supported in read-only mode"));
@@ -1041,7 +1041,7 @@
gboolean status = TRUE;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
if (name) {
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
@@ -1076,7 +1076,7 @@
gboolean status = TRUE;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
if (name) {
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
@@ -1110,7 +1110,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (feature) {
@@ -1138,7 +1138,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
if (type == G_TYPE_INVALID) {
@@ -1249,7 +1249,7 @@
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
}
memset (&context, 0, sizeof (context));
@@ -1572,7 +1572,7 @@
GdaSqlitePStmt *ps;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), FALSE);
/* fetch prepares stmt if already done */
@@ -1821,7 +1821,7 @@
gboolean new_ps = FALSE;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
if (async_cb) {
Modified: trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c
==============================================================================
--- trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c (original)
+++ trunk/libgda/sqlite/virtual/gda-vconnection-data-model.c Tue Sep 16 18:45:28 2008
@@ -248,7 +248,7 @@
cnc->priv->table_data_list = g_slist_append (cnc->priv->table_data_list, td);
/* actually create the virtual table in @cnc */
- prov = (GdaVirtualProvider *) gda_connection_get_provider_obj (GDA_CONNECTION (cnc));
+ prov = (GdaVirtualProvider *) gda_connection_get_provider (GDA_CONNECTION (cnc));
str = g_strdup_printf ("CREATE VIRTUAL TABLE %s USING %s ('%s')", table_name, G_OBJECT_TYPE_NAME (prov), td->unique_name);
rc = sqlite3_exec (scnc->connection, str, NULL, 0, &zErrMsg);
g_free (str);
@@ -306,7 +306,7 @@
return FALSE;
}
- prov = (GdaVirtualProvider *) gda_connection_get_provider_obj (GDA_CONNECTION (cnc));
+ prov = (GdaVirtualProvider *) gda_connection_get_provider (GDA_CONNECTION (cnc));
str = g_strdup_printf ("DROP TABLE %s", td->table_name);
rc = sqlite3_exec (scnc->connection, str, NULL, 0, &zErrMsg);
g_free (str);
Modified: trunk/providers/bdb/gda-bdb-provider.c
==============================================================================
--- trunk/providers/bdb/gda-bdb-provider.c (original)
+++ trunk/providers/bdb/gda-bdb-provider.c Tue Sep 16 18:45:28 2008
@@ -235,7 +235,7 @@
gda_bdb_provider_get_server_version (GdaServerProvider *provider, GdaConnection *cnc)
{
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
return DB_VERSION_STRING;
}
@@ -249,7 +249,7 @@
BdbConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = gda_virtual_connection_internal_get_provider_data (GDA_VIRTUAL_CONNECTION (cnc));
if (!cdata)
Modified: trunk/providers/firebird/gda-firebird-provider.c
==============================================================================
--- trunk/providers/firebird/gda-firebird-provider.c (original)
+++ trunk/providers/firebird/gda-firebird-provider.c Tue Sep 16 18:45:28 2008
@@ -418,7 +418,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
/* Close the connection using the C API */
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -446,7 +446,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -466,7 +466,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -491,7 +491,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
return FALSE;
@@ -535,7 +535,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
file = g_utf8_strdown (gda_server_operation_op_type_to_string (type), -1);
@@ -572,7 +572,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
/* test @op's validity */
@@ -638,7 +638,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
optype = gda_server_operation_get_op_type (op);
switch (optype) {
@@ -668,7 +668,7 @@
};
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
if (level != GDA_TRANSACTION_ISOLATION_UNKNOWN) {
gda_connection_add_event_string (cnc, "Provider does not handle that kind of transaction");
return FALSE;
@@ -710,7 +710,7 @@
gboolean result;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -746,7 +746,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -767,7 +767,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -788,7 +788,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -809,7 +809,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -828,7 +828,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (feature) {
@@ -861,7 +861,7 @@
GdaDataHandler *dh;
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
if (type == G_TYPE_INVALID) {
@@ -895,7 +895,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
TO_IMPLEMENT;
@@ -973,7 +973,7 @@
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
}
return gda_statement_to_sql_extended (stmt, cnc, params, flags, params_used, error);
@@ -993,7 +993,7 @@
GdaFirebirdPStmt *ps;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), FALSE);
/* fetch prepares stmt if already done */
@@ -1036,7 +1036,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
/* If asynchronous connection opening is not supported, then exit now */
@@ -1160,7 +1160,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1182,7 +1182,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1203,7 +1203,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1225,7 +1225,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1246,7 +1246,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1269,7 +1269,7 @@
FirebirdConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (FirebirdConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
Modified: trunk/providers/mdb/gda-mdb-provider.c
==============================================================================
--- trunk/providers/mdb/gda-mdb-provider.c (original)
+++ trunk/providers/mdb/gda-mdb-provider.c Tue Sep 16 18:45:28 2008
@@ -530,7 +530,7 @@
MdbConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = gda_virtual_connection_internal_get_provider_data (GDA_VIRTUAL_CONNECTION (cnc));
if (!cdata)
@@ -551,7 +551,7 @@
MdbConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = gda_virtual_connection_internal_get_provider_data (GDA_VIRTUAL_CONNECTION (cnc));
if (!cdata)
Modified: trunk/providers/mysql/gda-mysql-provider.c
==============================================================================
--- trunk/providers/mysql/gda-mysql-provider.c (original)
+++ trunk/providers/mysql/gda-mysql-provider.c Tue Sep 16 18:45:28 2008
@@ -593,7 +593,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
/* Close the connection using the C API */
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -620,7 +620,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -641,7 +641,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -669,7 +669,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (type) {
@@ -714,7 +714,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
file = g_utf8_strdown (gda_server_operation_op_type_to_string (type), -1);
@@ -753,7 +753,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
/* test @op's validity */
@@ -823,7 +823,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
optype = gda_server_operation_get_op_type (op);
switch (optype) {
@@ -848,7 +848,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -871,7 +871,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -894,7 +894,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -917,7 +917,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -940,7 +940,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -963,7 +963,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -984,7 +984,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (feature) {
@@ -1019,7 +1019,7 @@
GdaDataHandler *dh;
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
if (type == G_TYPE_INVALID) {
@@ -1055,7 +1055,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
TO_IMPLEMENT;
@@ -1140,7 +1140,7 @@
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
}
return gda_statement_to_sql_extended (stmt, cnc, params, flags, params_used, error);
@@ -1163,7 +1163,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), FALSE);
/* fetch prepares stmt if already done */
@@ -1297,7 +1297,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
/* If asynchronous connection opening is not supported, then exit now */
@@ -1543,7 +1543,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1567,7 +1567,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1590,7 +1590,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1614,7 +1614,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1637,7 +1637,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1661,7 +1661,7 @@
MysqlConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (MysqlConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
Modified: trunk/providers/postgres/gda-postgres-provider.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-provider.c (original)
+++ trunk/providers/postgres/gda-postgres-provider.c Tue Sep 16 18:45:28 2008
@@ -784,7 +784,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
/* Close the connection using the C API */
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -810,7 +810,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -830,7 +830,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -856,7 +856,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (type) {
@@ -898,7 +898,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
file = g_utf8_strdown (gda_server_operation_op_type_to_string (type), -1);
@@ -935,7 +935,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
/* test @op's validity */
@@ -1018,7 +1018,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
optype = gda_server_operation_get_op_type (op);
if (!cnc &&
@@ -1124,7 +1124,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1208,7 +1208,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1232,7 +1232,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1255,7 +1255,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1308,7 +1308,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1361,7 +1361,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (PostgresConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -1412,7 +1412,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (feature) {
@@ -1472,7 +1472,7 @@
GdaDataHandler *dh;
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
if (type == G_TYPE_INVALID) {
@@ -1521,7 +1521,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
if (type == G_TYPE_INT64)
@@ -1604,7 +1604,7 @@
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
}
return gda_statement_to_sql_extended (stmt, cnc, params, flags, params_used, error);
@@ -1625,7 +1625,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), FALSE);
/* fetch prepares stmt if already done */
@@ -1914,7 +1914,7 @@
PostgresConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
/* If asynchronous connection opening is not supported, then exit now */
@@ -2189,7 +2189,7 @@
const GdaXaTransactionId *xid, GError **error)
{
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
return gda_postgres_provider_begin_transaction (provider, cnc, NULL,
@@ -2205,7 +2205,7 @@
const GdaXaTransactionId *xid, GError **error)
{
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
/* nothing to do for PostgreSQL here */
@@ -2224,7 +2224,7 @@
gchar *str;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
if (!gda_statement_get_parameters (internal_stmt [I_STMT_XA_PREPARE], ¶ms, error))
@@ -2260,7 +2260,7 @@
gchar *str;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
if (!gda_statement_get_parameters (internal_stmt [I_STMT_XA_PREPARE], ¶ms, error))
@@ -2295,7 +2295,7 @@
gchar *str;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
if (!gda_statement_get_parameters (internal_stmt [I_STMT_XA_PREPARE], ¶ms, error))
@@ -2330,7 +2330,7 @@
GdaDataModel *model;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
model = gda_connection_statement_execute_select (cnc, internal_stmt [I_STMT_XA_RECOVER], NULL, error);
if (!model)
Modified: trunk/providers/skel-implementation/capi/gda-capi-provider.c
==============================================================================
--- trunk/providers/skel-implementation/capi/gda-capi-provider.c (original)
+++ trunk/providers/skel-implementation/capi/gda-capi-provider.c Tue Sep 16 18:45:28 2008
@@ -380,7 +380,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
/* Close the connection using the C API */
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -406,7 +406,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -426,7 +426,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -452,7 +452,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (type) {
@@ -494,7 +494,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
file = g_utf8_strdown (gda_server_operation_op_type_to_string (type), -1);
@@ -531,7 +531,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
/* test @op's validity */
@@ -597,7 +597,7 @@
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
optype = gda_server_operation_get_op_type (op);
switch (optype) {
@@ -620,7 +620,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -641,7 +641,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -662,7 +662,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -683,7 +683,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -704,7 +704,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -725,7 +725,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
@@ -744,7 +744,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
switch (feature) {
@@ -777,7 +777,7 @@
GdaDataHandler *dh;
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
if (type == G_TYPE_INVALID) {
@@ -811,7 +811,7 @@
{
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
}
TO_IMPLEMENT;
@@ -889,7 +889,7 @@
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
if (cnc) {
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
}
return gda_statement_to_sql_extended (stmt, cnc, params, flags, params_used, error);
@@ -909,7 +909,7 @@
GdaCapiPStmt *ps;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), FALSE);
/* fetch prepares stmt if already done */
@@ -952,7 +952,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
g_return_val_if_fail (GDA_IS_STATEMENT (stmt), NULL);
/* If asynchronous connection opening is not supported, then exit now */
@@ -1086,7 +1086,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1108,7 +1108,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1129,7 +1129,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1151,7 +1151,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1172,7 +1172,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), FALSE);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, FALSE);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, FALSE);
g_return_val_if_fail (xid, FALSE);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
@@ -1195,7 +1195,7 @@
CapiConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (CapiConnectionData*) gda_connection_internal_get_provider_data (cnc);
if (!cdata)
Modified: trunk/providers/skel-implementation/models/gda-models-provider.c
==============================================================================
--- trunk/providers/skel-implementation/models/gda-models-provider.c (original)
+++ trunk/providers/skel-implementation/models/gda-models-provider.c Tue Sep 16 18:45:28 2008
@@ -214,7 +214,7 @@
ModelsConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (ModelsConnectionData*) gda_virtual_connection_internal_get_provider_data (GDA_VIRTUAL_CONNECTION (cnc));
if (!cdata)
@@ -232,7 +232,7 @@
ModelsConnectionData *cdata;
g_return_val_if_fail (GDA_IS_CONNECTION (cnc), NULL);
- g_return_val_if_fail (gda_connection_get_provider_obj (cnc) == provider, NULL);
+ g_return_val_if_fail (gda_connection_get_provider (cnc) == provider, NULL);
cdata = (ModelsConnectionData*) gda_virtual_connection_internal_get_provider_data (GDA_VIRTUAL_CONNECTION (cnc));
if (!cdata)
Modified: trunk/samples/DDL/ddl.c
==============================================================================
--- trunk/samples/DDL/ddl.c (original)
+++ trunk/samples/DDL/ddl.c Tue Sep 16 18:45:28 2008
@@ -53,7 +53,7 @@
gint i;
/* create a new GdaServerOperation object */
- provider = gda_connection_get_provider_obj (cnc);
+ provider = gda_connection_get_provider (cnc);
op = gda_server_provider_create_operation (provider, cnc, GDA_SERVER_OPERATION_CREATE_TABLE, NULL, &error);
if (!op) {
g_print ("CREATE TABLE operation is not supported by the provider: %s\n",
Modified: trunk/samples/SqlParserConsole/console.c
==============================================================================
--- trunk/samples/SqlParserConsole/console.c (original)
+++ trunk/samples/SqlParserConsole/console.c Tue Sep 16 18:45:28 2008
@@ -196,13 +196,13 @@
GdaSqlParser *parser;
GError *error = NULL;
- prov = gda_config_get_provider_object (prov_name ? prov_name : "SQLite", &error);
+ prov = gda_config_get_provider (prov_name ? prov_name : "SQLite", &error);
if (!prov) {
g_print ("Could not instanciate provider for '%s': %s\n", prov_name,
error && error->message ? error->message : "No detail");
if (error)
g_error_free (error);
- prov = gda_config_get_provider_object ("SQLite", NULL);
+ prov = gda_config_get_provider ("SQLite", NULL);
g_assert (prov);
}
parser = gda_server_provider_create_parser (prov, NULL);
Modified: trunk/testing/gda-provider-status.c
==============================================================================
--- trunk/testing/gda-provider-status.c (original)
+++ trunk/testing/gda-provider-status.c Tue Sep 16 18:45:28 2008
@@ -111,7 +111,7 @@
g_error ("Can't load the '%s' provider: %s\n", pname,
error && error->message ? error->message : "No detail");
pname = g_value_get_string (cvalue);
- prov = gda_config_get_provider_object (pname, &error);
+ prov = gda_config_get_provider (pname, &error);
if (!prov)
g_error ("Can't load the '%s' provider: %s\n", pname,
error && error->message ? error->message : "No detail");
@@ -152,7 +152,7 @@
{
GdaConnection *cnc = NULL;
- GdaDataSourceInfo *info;
+ GdaDsnInfo *info;
gchar *user, *pass, *real_cnc, *real_provider, *real_auth_string = NULL;
gda_connection_string_split (cnc_string, &real_cnc, &real_provider, &user, &pass);
if (!real_cnc) {
@@ -210,7 +210,7 @@
}
}
- info = gda_config_get_dsn (real_cnc);
+ info = gda_config_get_dsn_info (real_cnc);
if (info && !real_provider)
cnc = gda_connection_open_from_dsn (cnc_string, real_auth_string, 0, error);
else
@@ -240,7 +240,7 @@
} ProvFunc;
GdaServerProviderClass *pclass;
- if (prov && cnc && (prov != gda_connection_get_provider_obj (cnc)))
+ if (prov && cnc && (prov != gda_connection_get_provider (cnc)))
/* ignoring connection as it has a different provider */
return TRUE;
g_assert (prov || cnc);
@@ -253,7 +253,7 @@
/* provider info */
if (!prov)
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
is_virt = GDA_IS_VIRTUAL_PROVIDER (prov);
pclass = (GdaServerProviderClass*) G_OBJECT_GET_CLASS (prov);
ProvFunc fa[] = {
Modified: trunk/testing/gda-test-blob.c
==============================================================================
--- trunk/testing/gda-test-blob.c (original)
+++ trunk/testing/gda-test-blob.c Tue Sep 16 18:45:28 2008
@@ -72,8 +72,8 @@
auth_string = g_strdup_printf ("USERNAME=%s", user);
}
if (dsn) {
- GdaDataSourceInfo *info = NULL;
- info = gda_config_get_dsn (dsn);
+ GdaDsnInfo *info = NULL;
+ info = gda_config_get_dsn_info (dsn);
if (!info)
g_error (_("DSN '%s' is not declared"), dsn);
else {
Modified: trunk/testing/gda-test-connection.c
==============================================================================
--- trunk/testing/gda-test-connection.c (original)
+++ trunk/testing/gda-test-connection.c Tue Sep 16 18:45:28 2008
@@ -61,8 +61,8 @@
auth_string = g_strdup_printf ("USERNAME=%s", user);
}
if (dsn) {
- GdaDataSourceInfo *info = NULL;
- info = gda_config_get_dsn (dsn);
+ GdaDsnInfo *info = NULL;
+ info = gda_config_get_dsn_info (dsn);
if (!info)
g_error (_("DSN '%s' is not declared"), dsn);
else {
Modified: trunk/tests/data-models/Makefile.am
==============================================================================
--- trunk/tests/data-models/Makefile.am (original)
+++ trunk/tests/data-models/Makefile.am Tue Sep 16 18:45:28 2008
@@ -61,4 +61,4 @@
pmodel_data_locations.xml
CLEANFILES = \
- pmodel.db modelquery.db
+ pmodel.db modelquery.db pmodel.db-journal modelquery.db-journal
Modified: trunk/tests/data-models/check_data_proxy.c
==============================================================================
--- trunk/tests/data-models/check_data_proxy.c (original)
+++ trunk/tests/data-models/check_data_proxy.c Tue Sep 16 18:45:28 2008
@@ -52,6 +52,9 @@
{
int number_failed = 0;
+ /* set up test environment */
+ g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
+ g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
gda_init ();
prepend_null_row = FALSE;
Modified: trunk/tests/gda-ddl-creator.c
==============================================================================
--- trunk/tests/gda-ddl-creator.c (original)
+++ trunk/tests/gda-ddl-creator.c Tue Sep 16 18:45:28 2008
@@ -677,7 +677,7 @@
}
/* render operations to SQL */
- GdaServerProvider *prov = gda_connection_get_provider_obj (ddlc->priv->cnc);
+ GdaServerProvider *prov = gda_connection_get_provider (ddlc->priv->cnc);
GSList *objlist, *list;
objlist = gda_meta_struct_get_all_db_objects (ddlc->priv->d_mstruct);
@@ -740,7 +740,7 @@
return FALSE;
/* execute operations */
- GdaServerProvider *prov = gda_connection_get_provider_obj (ddlc->priv->cnc);
+ GdaServerProvider *prov = gda_connection_get_provider (ddlc->priv->cnc);
GSList *objlist, *list;
objlist = gda_meta_struct_get_all_db_objects (ddlc->priv->d_mstruct);
for (list = objlist; list; list = list->next) {
Modified: trunk/tests/multi-threading/check_parser.c
==============================================================================
--- trunk/tests/multi-threading/check_parser.c (original)
+++ trunk/tests/multi-threading/check_parser.c Tue Sep 16 18:45:28 2008
@@ -338,7 +338,7 @@
GdaSqlParser *parser;
GError *error = NULL;
- prov = gda_config_get_provider_object (prov_name, &error);
+ prov = gda_config_get_provider (prov_name, &error);
if (!prov)
g_error ("Could not create provider for '%s': %s\n", prov_name,
error && error->message ? error->message : "No detail");
Modified: trunk/tests/multi-threading/common.c
==============================================================================
--- trunk/tests/multi-threading/common.c (original)
+++ trunk/tests/multi-threading/common.c Tue Sep 16 18:45:28 2008
@@ -15,7 +15,7 @@
GdaConnection *cnc;
/* create batch */
- prov = gda_config_get_provider_object ("SQLite", NULL);
+ prov = gda_config_get_provider ("SQLite", NULL);
if (!prov) {
g_set_error (error, 0, 0,
"Cannot find the SQLite provider");
Modified: trunk/tests/parser/check_parser.c
==============================================================================
--- trunk/tests/parser/check_parser.c (original)
+++ trunk/tests/parser/check_parser.c Tue Sep 16 18:45:28 2008
@@ -222,7 +222,7 @@
GdaSqlParser *parser;
GError *error = NULL;
- prov = gda_config_get_provider_object (prov_name, &error);
+ prov = gda_config_get_provider (prov_name, &error);
if (!prov)
g_error ("Could not create provider for '%s': %s\n", prov_name,
error && error->message ? error->message : "No detail");
Modified: trunk/tests/providers/prov-test-util.c
==============================================================================
--- trunk/tests/providers/prov-test-util.c (original)
+++ trunk/tests/providers/prov-test-util.c Tue Sep 16 18:45:28 2008
@@ -137,7 +137,7 @@
GError *error = NULL;
gchar *str;
- prov = gda_connection_get_provider_obj (cnc);
+ prov = gda_connection_get_provider (cnc);
schema_m = gda_connection_get_meta_store_data (cnc, GDA_CONNECTION_META_TYPES, &error, 0);
if (!schema_m) {
#ifdef CHECK_EXTRA_INFO
Modified: trunk/tests/value-holders/check_statement.c
==============================================================================
--- trunk/tests/value-holders/check_statement.c (original)
+++ trunk/tests/value-holders/check_statement.c Tue Sep 16 18:45:28 2008
@@ -257,7 +257,7 @@
GdaSqlParser *parser;
GError *error = NULL;
- prov = gda_config_get_provider_object (prov_name, &error);
+ prov = gda_config_get_provider (prov_name, &error);
if (!prov)
g_error ("Could not create provider for '%s': %s\n", prov_name,
error && error->message ? error->message : "No detail");
Modified: trunk/tools/gda-list-server-op.c
==============================================================================
--- trunk/tools/gda-list-server-op.c (original)
+++ trunk/tools/gda-list-server-op.c Tue Sep 16 18:45:28 2008
@@ -41,7 +41,7 @@
g_print ("For provider %s\n", prov);
if (prov) {
- prov_obj = gda_config_get_provider_object (prov, &error);
+ prov_obj = gda_config_get_provider (prov, &error);
if (!prov_obj) {
g_print (_("Could not create provider object: %s\n"),
error && error->message ? error->message : _("No detail"));
Modified: trunk/tools/gda-sql.c
==============================================================================
--- trunk/tools/gda-sql.c (original)
+++ trunk/tools/gda-sql.c Tue Sep 16 18:45:28 2008
@@ -226,10 +226,10 @@
for (i = 1; i < argc; i++) {
/* open connection */
ConnectionSetting *cs;
- GdaDataSourceInfo *info = NULL;
+ GdaDsnInfo *info = NULL;
gchar *str;
- info = gda_config_get_dsn (argv[i]);
+ info = gda_config_get_dsn_info (argv[i]);
if (info)
str = g_strdup (info->name);
else
@@ -673,7 +673,7 @@
GdaDataHandler *dh;
GdaServerProvider *prov;
- prov = gda_connection_get_provider_obj (data->current->cnc);
+ prov = gda_connection_get_provider (data->current->cnc);
cvalue = gda_holder_get_value (h_in_data);
dh = gda_server_provider_get_data_handler_gtype (prov, data->current->cnc,
gda_holder_get_g_type (h_in_data));
@@ -895,7 +895,7 @@
return NULL;
}
- GdaDataSourceInfo *info;
+ GdaDsnInfo *info;
gchar *user, *pass, *real_cnc, *real_provider, *real_auth_string = NULL;
gda_connection_string_split (cnc_string, &real_cnc, &real_provider, &user, &pass);
if (!real_cnc) {
@@ -953,7 +953,7 @@
}
}
- info = gda_config_get_dsn (real_cnc);
+ info = gda_config_get_dsn_info (real_cnc);
if (info && !real_provider)
newcnc = gda_connection_open_from_dsn (cnc_string, real_auth_string, 0, error);
else
@@ -1962,7 +1962,7 @@
gda_data_model_set_value_at (model, 0, row, value, NULL);
gda_value_free (value);
- prov = gda_connection_get_provider_obj (cs->cnc);
+ prov = gda_connection_get_provider (cs->cnc);
if (GDA_IS_VPROVIDER_HUB (prov))
value = gda_value_new_from_string ("", G_TYPE_STRING);
else
@@ -2542,7 +2542,7 @@
GdaDataHandler *dh;
GValue *gvalue;
- prov = gda_connection_get_provider_obj (data->current->cnc);
+ prov = gda_connection_get_provider (data->current->cnc);
dh = gda_server_provider_get_data_handler_gtype (prov, data->current->cnc,
gda_holder_get_g_type (param));
gvalue = gda_data_handler_get_value_from_str (dh, value, gda_holder_get_g_type (param));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
