!228 【5.0.2补丁版本】回合PR-181

Merge pull request !228 from zhangxubo/5.0.0

pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java

@@ -458,6 +458,9 @@ public class PgConnection implements BaseConnection {
         batchInsert = false;
     }
 
+    /* set dolphin.b_compatibility_mode to the value of PGProperty.B_CMPT_MODE */
+    this.setDolphinCmpt(PGProperty.B_CMPT_MODE.getBoolean(info));
+    
     initClientLogic(info);
   }
 

pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java

@@ -2098,7 +2098,16 @@ public class PgResultSet implements ResultSet, org.postgresql.PGRefCursorResultS
 
     Encoding encoding = connection.getEncoding();
     try {
-        return trimString(columnIndex, encoding.decode(this_row[columnIndex - 1]));
+            String typeName = getPGType(columnIndex);
+            String result = trimString(columnIndex, encoding.decode(this_row[columnIndex - 1]));
+            if (("blob".equals(typeName))) {
+                if (connection.unwrap(PgConnection.class).isDolphinCmpt()) {
+                    return new String(toBytes(result));
+                }
+            } else if (blobSet.contains(typeName)) {
+        return new String(toBytes(result));
+      }
+      return result;
     } catch (IOException ioe) {
       throw new PSQLException(
           GT.tr(