[libgda] Misc. providers' corrections
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Misc. providers' corrections
- Date: Sun, 23 Aug 2015 12:43:33 +0000 (UTC)
commit 0b76139be3029a45143a2c55d8a04dd050da47d8
Author: Vivien Malerba <malerba gnome-db org>
Date: Sun Aug 23 14:31:14 2015 +0200
Misc. providers' corrections
providers/firebird/gda-firebird-provider.c | 28 ++++++----------------------
providers/jdbc/gda-jdbc-provider.c | 1 -
providers/oracle/gda-oracle-provider.c | 4 ++--
3 files changed, 8 insertions(+), 25 deletions(-)
---
diff --git a/providers/firebird/gda-firebird-provider.c b/providers/firebird/gda-firebird-provider.c
index ff9a2a2..7ed8436 100644
--- a/providers/firebird/gda-firebird-provider.c
+++ b/providers/firebird/gda-firebird-provider.c
@@ -160,15 +160,6 @@ static void gda_firebird_free_cnc_data (FirebirdConnectionData *cdata);
static gchar *fb_server_get_version (FirebirdConnectionData *fcnc);
-static gchar * firebird_render_operation (GdaSqlOperation *op, GdaSqlRenderingContext *context, GError
**error);
-
-static gchar * firebird_render_compound (GdaSqlStatementCompound *stmt, GdaSqlRenderingContext *context,
GError **error);
-
-static gchar * firebird_render_expr (GdaSqlExpr *expr, GdaSqlRenderingContext *context, gboolean
*is_default, gboolean *is_null, GError **error);
-
-
-
-
/*
* Prepared internal statements
* TO_ADD: any prepared statement to be used internally by the provider should be
@@ -1083,13 +1074,6 @@ gda_firebird_provider_statement_to_sql (GdaServerProvider *provider, GdaConnecti
return gda_statement_to_sql_extended (stmt, NULL, params, flags, params_used, error);
}
-
-/*
- * Statement prepare request
- */
-static GdaFirebirdPStmt *real_prepare (GdaServerProvider *provider, GdaConnection *cnc, GdaStatement *stmt,
GError **error);
-
-
/*
* Statement prepare request
*
@@ -1544,7 +1528,7 @@ gda_firebird_provider_statement_execute (GdaServerProvider *provider,
pv = g_new (gdouble, 1);
mem_to_free = g_slist_prepend (mem_to_free, pv);
*pv = g_value_get_double (value);
- fbvar->sqldata = pv;
+ fbvar->sqldata = (char*) pv;
fbvar->sqllen = sizeof (gdouble);
fbvar->sqlind = flag0;
*flag0 = 0;
@@ -1557,7 +1541,7 @@ gda_firebird_provider_statement_execute (GdaServerProvider *provider,
pv = g_new (gfloat, 1);
mem_to_free = g_slist_prepend (mem_to_free, pv);
*pv = g_value_get_float (value);
- fbvar->sqldata = pv;
+ fbvar->sqldata = (char*) pv;
fbvar->sqllen = sizeof (gfloat);
fbvar->sqlind = flag0;
*flag0 = 0;
@@ -1570,7 +1554,7 @@ gda_firebird_provider_statement_execute (GdaServerProvider *provider,
pv = g_new (gchar, 1);
mem_to_free = g_slist_prepend (mem_to_free, pv);
*pv = g_value_get_schar (value);
- fbvar->sqldata = pv;
+ fbvar->sqldata = (char*) pv;
fbvar->sqllen = sizeof (gchar);
fbvar->sqlind = flag0;
*flag0 = 0;
@@ -1583,7 +1567,7 @@ gda_firebird_provider_statement_execute (GdaServerProvider *provider,
pv = g_new (gshort, 1);
mem_to_free = g_slist_prepend (mem_to_free, pv);
*pv = gda_value_get_short (value);
- fbvar->sqldata = pv;
+ fbvar->sqldata = (char*) pv;
fbvar->sqllen = sizeof (gshort);
fbvar->sqlind = flag0;
*flag0 = 0;
@@ -1596,7 +1580,7 @@ gda_firebird_provider_statement_execute (GdaServerProvider *provider,
pv = g_new (glong, 1);
mem_to_free = g_slist_prepend (mem_to_free, pv);
*pv = g_value_get_long (value);
- fbvar->sqldata = pv;
+ fbvar->sqldata = (char*) pv;
fbvar->sqllen = sizeof (glong);
fbvar->sqlind = flag0;
*flag0 = 0;
@@ -1609,7 +1593,7 @@ gda_firebird_provider_statement_execute (GdaServerProvider *provider,
pv = g_new (gint64, 1);
mem_to_free = g_slist_prepend (mem_to_free, pv);
*pv = g_value_get_long (value);
- fbvar->sqldata = pv;
+ fbvar->sqldata = (char*) pv;
fbvar->sqllen = sizeof (gint64);
fbvar->sqlind = flag0;
*flag0 = 0;
diff --git a/providers/jdbc/gda-jdbc-provider.c b/providers/jdbc/gda-jdbc-provider.c
index ce6f4bb..5a27acd 100644
--- a/providers/jdbc/gda-jdbc-provider.c
+++ b/providers/jdbc/gda-jdbc-provider.c
@@ -179,7 +179,6 @@ GdaServerProviderBase jdbc_base_functions = {
gda_jdbc_provider_close_connection,
NULL,
NULL,
- NULL,
gda_jdbc_provider_perform_operation,
gda_jdbc_provider_begin_transaction,
gda_jdbc_provider_commit_transaction,
diff --git a/providers/oracle/gda-oracle-provider.c b/providers/oracle/gda-oracle-provider.c
index b3cc2ef..ef74e90 100644
--- a/providers/oracle/gda-oracle-provider.c
+++ b/providers/oracle/gda-oracle-provider.c
@@ -100,7 +100,7 @@ static const gchar *gda_oracle_provider_get_version (GdaServerProvider *p
static gboolean gda_oracle_provider_supports_feature (GdaServerProvider *provider, GdaConnection
*cnc,
GdaConnectionFeature feature);
-static GdaWorker *gda_oracle_provider_create_worker (GdaServerProvider *provider);
+static GdaWorker *gda_oracle_provider_create_worker (GdaServerProvider *provider, gboolean for_cnc);
static const gchar *gda_oracle_provider_get_name (GdaServerProvider *provider);
static GdaDataHandler *gda_oracle_provider_get_data_handler (GdaServerProvider *provider, GdaConnection
*cnc,
@@ -361,7 +361,7 @@ gda_oracle_provider_get_type (void)
}
static GdaWorker *
-gda_oracle_provider_create_worker (GdaServerProvider *provider)
+gda_oracle_provider_create_worker (GdaServerProvider *provider, gboolean for_cnc)
{
/* See http://docs.oracle.com/cd/B10501_01/appdev.920/a96584/oci09adv.htm */
static GdaWorker *unique_worker = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]