[libgda/LIBGDA_4.0] Added support for blobs in the MySQL provider

[Vivien Malerba <vivien src gnome org>]

commit 7a8f75b81cff73d046d5ffff3d8f7c1504d32963
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Jan 27 16:11:08 2010 +0100

    Added support for blobs in the MySQL provider

 providers/mysql/gda-mysql-provider.c  |   75 +++++++++++++++++++++++++++++---
 providers/mysql/gda-mysql-recordset.c |   15 ++++---
 2 files changed, 76 insertions(+), 14 deletions(-)
---
diff --git a/providers/mysql/gda-mysql-provider.c b/providers/mysql/gda-mysql-provider.c
index 854d281..7308019 100644
--- a/providers/mysql/gda-mysql-provider.c
+++ b/providers/mysql/gda-mysql-provider.c
@@ -34,6 +34,7 @@
 #include <libgda/binreloc/gda-binreloc.h>
 #include <libgda/gda-statement-extra.h>
 #include <sql-parser/gda-sql-parser.h>
+#include <libgda/gda-blob-op.h>
 #include "gda-mysql.h"
 #include "gda-mysql-provider.h"
 #include "gda-mysql-recordset.h"
@@ -1795,7 +1796,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 			mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
 			mysql_bind_param[i].is_null = (my_bool*)1;
 		}
-		else if (G_VALUE_TYPE(value) == GDA_TYPE_TIMESTAMP) {
+		else if (G_VALUE_TYPE (value) == GDA_TYPE_TIMESTAMP) {
 			const GdaTimestamp *ts;
 
 			ts = gda_value_get_timestamp (value);
@@ -1820,7 +1821,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 				mysql_bind_param[i].buffer_length = sizeof (MYSQL_TIME);
 			}
 		}
-		else if (G_VALUE_TYPE(value) == GDA_TYPE_TIME) {
+		else if (G_VALUE_TYPE (value) == GDA_TYPE_TIME) {
 			const GdaTime *ts;
 
 			ts = gda_value_get_time (value);
@@ -1842,7 +1843,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 				mysql_bind_param[i].buffer_length = sizeof (MYSQL_TIME);
 			}
 		}
-		else if (G_VALUE_TYPE(value) == G_TYPE_DATE) {
+		else if (G_VALUE_TYPE (value) == G_TYPE_DATE) {
 			const GDate *ts;
 
 			ts = (GDate*) g_value_get_boxed (value);
@@ -1863,7 +1864,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 				mysql_bind_param[i].buffer_length = sizeof (MYSQL_TIME);
 			}
 		}
-		else if (G_VALUE_TYPE(value) == G_TYPE_STRING) {
+		else if (G_VALUE_TYPE (value) == G_TYPE_STRING) {
 			const gchar *str;
 			str = g_value_get_string (value);
 			if (!str) {
@@ -1877,15 +1878,75 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 				mysql_bind_param[i].length = NULL; /* str is 0 terminated */
 			}
 		}
+		else if (G_VALUE_TYPE (value) == GDA_TYPE_BLOB) {
+			const GdaBinary *bin = NULL;
+			GdaBlob *blob = (GdaBlob*) gda_value_get_blob (value);
+
+			bin = ((GdaBinary*) blob);
+			if (!bin) {
+				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+				mysql_bind_param[i].is_null = (my_bool*)1;
+			}
+			else {
+				gchar *str = NULL;
+				gulong blob_len;
+				if (blob->op) {
+					blob_len = gda_blob_op_get_length (blob->op);
+					if ((blob_len != bin->binary_length) &&
+					    ! gda_blob_op_read_all (blob->op, blob)) {
+						/* force reading the complete BLOB into memory */
+						str = _("Can't read whole BLOB into memory");
+					}
+				}
+				else
+					blob_len = bin->binary_length;
+				if (blob_len < 0)
+					str = _("Can't get BLOB's length");
+				else if (blob_len >= G_MAXINT)
+					str = _("BLOB is too big");
+				
+				if (str) {
+					event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
+					gda_connection_event_set_description (event, str);
+					g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
+						     GDA_SERVER_PROVIDER_DATA_ERROR, "%s", str);
+					break;
+				}
+				
+				else {
+					mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB;
+					mysql_bind_param[i].buffer= (char *) bin->data;
+					mysql_bind_param[i].buffer_length = bin->binary_length;
+					mysql_bind_param[i].length = NULL;
+				}
+			}
+		}
+		else if (G_VALUE_TYPE (value) == GDA_TYPE_BINARY) {
+			const GdaBinary *bin;
+			bin = gda_value_get_binary (value);
+			if (!bin) {
+				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+				mysql_bind_param[i].is_null = (my_bool*)1;
+			}
+			else {
+				mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB;
+				mysql_bind_param[i].buffer= (char *) bin->data;
+				mysql_bind_param[i].buffer_length = bin->binary_length;
+				mysql_bind_param[i].length = NULL;
+			}
+		}
 		else {
 			gchar *str;
 			GdaDataHandler *data_handler =
 				gda_server_provider_get_data_handler_g_type (provider, cnc, 
 									     G_VALUE_TYPE (value));
 			if (data_handler == NULL) {
-				TO_IMPLEMENT;
 				/* there is an error here */
-				str = NULL;
+				event = gda_connection_event_new (GDA_CONNECTION_EVENT_ERROR);
+				gda_connection_event_set_description (event, str);
+				g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
+					     GDA_SERVER_PROVIDER_DATA_ERROR, "%s", str);
+				break;
 			}
 			else {
 				str = gda_data_handler_get_str_from_value (data_handler, value);
@@ -1898,7 +1959,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
 		}
 	}
 		
-	if (mysql_bind_param && mysql_stmt_bind_param (ps->mysql_stmt, mysql_bind_param)) {
+	if (!event && mysql_bind_param && mysql_stmt_bind_param (ps->mysql_stmt, mysql_bind_param)) {
 		//g_warning ("mysql_stmt_bind_param failed: %s\n", mysql_stmt_error (ps->mysql_stmt));
 		event = _gda_mysql_make_error (cnc, cdata->mysql, ps->mysql_stmt, error);
 	}
diff --git a/providers/mysql/gda-mysql-recordset.c b/providers/mysql/gda-mysql-recordset.c
index 78ca58b..8eeab53 100644
--- a/providers/mysql/gda-mysql-recordset.c
+++ b/providers/mysql/gda-mysql-recordset.c
@@ -564,9 +564,6 @@ gda_mysql_recordset_fetch_nb_rows (GdaDataSelect *model)
 	if (model->advertized_nrows >= 0)
 		return model->advertized_nrows;
 
-	/* use C API to determine number of rows,if possible */
-	// TO_IMPLEMENT;
-	
 	model->advertized_nrows = mysql_stmt_affected_rows (imodel->priv->mysql_stmt);
 	
 	return model->advertized_nrows;
@@ -780,11 +777,15 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, gint rownum, GError **error)
 				gda_value_set_binary (value, &binary);
 			}
 			else if (type == GDA_TYPE_BLOB) {
-				GdaBinary binary = {
-					.data = (guchar*) strvalue,
-					.binary_length = length
+				/* web don't use GdaMysqlBlobOp because it looks like the MySQL
+				 * API does not support BLOBs accessed in a random way,
+				 * so we return the whole BLOB at once */
+				GdaBlob blob = {
+					.data.data = (guchar*) strvalue,
+					.data.binary_length = length,
+					.op = NULL
 				};
-				gda_value_set_binary (value, &binary);
+				gda_value_set_blob (value, &blob);
 			}
 			else if (type == G_TYPE_DOUBLE) {
 				if (length > 0) {