Bug fixes and support for blob data

Added a fix where MySQL 5.7 wouldn't parse SQL error packets successfully.

Added support for getBlobs (was added to the master but this branch)

Author: Chris Board

.idea/caches/build_file_checksums.ser

@@ -20,7 +20,7 @@ else
 }
 
 archivesBaseName="AndroidMySQLConnector"
-version '0.37'
+version '0.39'
 group 'com.BoardiesITSolutions'
 
 

.idea/gradle.xml

@@ -134,12 +134,12 @@ private void getSocketData() throws IOException
                             }
                             packetType = tempFullData[tempFullData.length-1 - 8];
                             Log.d("MySQIO", "Less than 1024 bytes returned. Packet type -8 from the end of the array would need to be an EOF packet");
-                            if (packetType == 0xfe)
+                            if (packetType == 0xfe || packetType == 0xff)
                             {
                                 break;
                             }
                             //The 4th byte can also contain the OK or EOF so check this as well
-                            if (tempFullData[4] == 0x00 || tempFullData[4] == 0xfe)
+                            if (tempFullData[4] == 0x00 || tempFullData[4] == 0xfe || tempFullData[4] == 0xff)
                             {
                                 break;
                             }
@@ -149,6 +149,10 @@ private void getSocketData() throws IOException
                                     Log.d("ByteData", "Index: " + i + " Value: " + tempFullData[i]);
                                 }*/
 
+                                if (expectedPayloadLength == (tempFullData.length - 4))
+                                {
+                                    break;
+                                }
                             }
                         //If we get here continue fetching data
 

AndroidMySQLConnector/build.gradle

@@ -36,6 +36,22 @@ public String getString(String column) throws SQLColumnNotFoundException
         throw new SQLColumnNotFoundException("'"+column+"' was not found in result set");
     }
 
+    public byte[] getBlob(String column) throws SQLColumnNotFoundException
+    {
+        Set set = this.columnAndRowValue.entrySet();
+        Iterator iterator = set.iterator();
+        while (iterator.hasNext())
+        {
+            Map.Entry entry = (Map.Entry)iterator.next();
+            ColumnDefinition col = (ColumnDefinition)entry.getKey();
+            if (col.getColumnName().equals(column))
+            {
+                return (byte[])entry.getValue();
+            }
+        }
+        throw new SQLColumnNotFoundException("'"+column+"' was not found in result set");
+    }
+
     public int getInt(String column) throws SQLColumnNotFoundException
     {
         String value = this.getString(column);

AndroidMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/MySQLIO.java

@@ -30,6 +30,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.github.BoardiesITSolutions:Android-MySQL-Connector:0.37_MySQL8'
+    implementation 'com.github.BoardiesITSolutions:Android-MySQL-Connector:0.39_MySQL8'
 
 }