hcq/openGauss-connector-jdbc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge pull request !228 from zhangxubo/5.0.0
This commit is contained in:
opengauss_bot
2024-05-13 03:07:35 +00:00
committed by Gitee
parent 814e2067d7 558399c514
commit 1c82cd33d3
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java
View File

@ -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);
}

11
pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
View File

@ -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(