Changeset 11523

Timestamp:

05/15/07 10:38:49 (2 years ago)

Author:

mloskot

Message:

Backported Kosta's patch fixing BLOB support in OGR MySQL driver to stable branch 1.4 (Ticket #1622).

Files:

• branches/1.4/gdal/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp (modified) (1 diff)
• branches/1.4/gdal/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp (modified) (6 diffs)

branches/1.4/gdal/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp

@@ -159 +159 @@
-            poDefn->AddFieldDefn( &oField );
-            break;
-
+
+
+
+
-          case FIELD_TYPE_BLOB:
-String
+Binary
-            oField.SetWidth((int)psMSField->max_length);
-            poDefn->AddFieldDefn( &oField );

branches/1.4/gdal/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp

@@ -632 +632 @@
-/*      Execute the delete.                                             */
-/* -------------------------------------------------------------------- */
+    poDS->InterruptLongResult();
-    if( mysql_query(poDS->GetConn(), osCommand.c_str() ) ){   
-        poDS->ReportError(  osCommand.c_str() );
@@ -733 +734 @@
-    for( i = 0; i < poFeatureDefn->GetFieldCount(); i++ )
-    {
-        const char *pszStrValue = poFeature->GetFieldAsString(i);
-        char *pszNeedToFree = NULL;
-
-        if( !poFeature->IsFieldSet( i ) )
-            continue;
@@ -744 +742 @@
-            bNeedComma = TRUE;
-
+        const char *pszStrValue = poFeature->GetFieldAsString(i);
+
-        if( poFeatureDefn->GetFieldDefn(i)->GetType() != OFTInteger
-
+
+
-        {
-            int         iChar;
@@ -777 +778 @@
-            osCommand += "'";
-        }
+        else if( poFeatureDefn->GetFieldDefn(i)->GetType() == OFTBinary )
+        {
+            int binaryCount = 0;
+            GByte* binaryData = poFeature->GetFieldAsBinary(i, &binaryCount);
+            char* pszHexValue = CPLBinaryToHex( binaryCount, binaryData );
+
+            osCommand += "x'";
+            osCommand += pszHexValue;
+            osCommand += "'";
+
+            CPLFree( pszHexValue );
+        }
-        else
-        {
@@ -782 +795 @@
-        }
-
-        if( pszNeedToFree )
-            CPLFree( pszNeedToFree );
-    }
-
@@ -885 +896 @@
-    }
-
+    else if( oField.GetType() == OFTBinary )
+    {
+        sprintf( szFieldType, "LONGBLOB" );
+    }
+
-    else if( oField.GetType() == OFTString )
-    {