added escapeBlobArgument, just checking a work around for byte[] selection arg in testEqByteArray

Author: greenrobot

DaoCore/src/main/java/de/greenrobot/dao/internal/SqlUtils.java

@@ -20,6 +20,7 @@
 
 /** Helper class to create SQL statements as used by greenDAO internally. */
 public class SqlUtils {
+    private final static char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
 
     public static StringBuilder appendProperty(StringBuilder builder, String tablePrefix, Property property) {
         if (tablePrefix != null) {
@@ -146,4 +147,13 @@ public static String createSqlUpdate(String tablename, String[] updateColumns, S
         return builder.toString();
     }
 
+    public static String escapeBlobArgument(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for (int i = 0; i < bytes.length; i++) {
+            int byteValue = bytes[i] & 0xFF;
+            hexChars[i * 2] = HEX_ARRAY[byteValue >>> 4];
+            hexChars[i * 2 + 1] = HEX_ARRAY[byteValue & 0x0F];
+        }
+        return "X'" + new String(hexChars) + '\'';
+    }
 }

DaoTest/src/de/greenrobot/daotest/query/QueryBuilderSimpleTest.java

@@ -21,10 +21,11 @@
 import java.util.Date;
 import java.util.List;
 
+import de.greenrobot.dao.internal.SqlUtils;
 import de.greenrobot.dao.query.Query;
 import de.greenrobot.dao.query.QueryBuilder;
+import de.greenrobot.dao.query.WhereCondition;
 import de.greenrobot.daotest.TestEntity;
-import de.greenrobot.daotest.TestEntityDao;
 import de.greenrobot.daotest.TestEntityDao.Properties;
 import de.greenrobot.daotest.entity.TestEntityTestBase;
 
@@ -172,20 +173,23 @@ public void testEqBoolean() {
     }
 
     // TODO fix byte arrays? Android is doing String args everywhere
-    public void _testEqByteArray() {
+    public void testEqByteArray() {
         ArrayList<TestEntity> inserted = insert(3);
         TestEntity testEntity = inserted.get(1);
 
         byte[] byteArray = {96, 77, 37, -21};
         testEntity.setSimpleByteArray(byteArray);
         dao.update(testEntity);
 
-        Query<TestEntity> queryBoolean = dao.queryBuilder().where(Properties.SimpleByteArray.eq(byteArray)).build();
-        TestEntity testEntity2 = queryBoolean.uniqueOrThrow();
+        // Unsupported: Query<TestEntity> query = dao.queryBuilder().where(Properties.SimpleByteArray.eq(byteArray)).build();
+        String conditionString = Properties.SimpleByteArray.columnName + '=' + SqlUtils.escapeBlobArgument(byteArray);
+        WhereCondition condition = new WhereCondition.StringCondition(conditionString);
+        Query<TestEntity> query = dao.queryBuilder().where(condition).build();
+        TestEntity testEntity2 = query.uniqueOrThrow();
         assertEquals(testEntity.getId(), testEntity2.getId());
 
-        queryBoolean.setParameter(0, new byte[]{96, 77, 37, -21, 99});
-        assertNull(queryBoolean.unique());
+        // Unsupported: query.setParameter(0, new byte[]{96, 77, 37, -21, 99});
+        // Unsupported: assertNull(query.unique());
     }
 
     public void testIsNullIsNotNull() {