mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for bug reported by Marcus Better (marcus@dactylis.com). When preforming

Browse Source 
a get on a bytea value the code was running the raw value from the server
through character set conversion, which if the character set was SQL_ASCII
would cause all 8bit characters to become ?'s.
This commit is contained in:
Barry Lind 2002-01-05 22:26:23 +00:00
parent f3efaf892e
commit 734e421278
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
View File

@ -404,7 +404,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
//Version 7.2 supports the bytea datatype for byte arrays
if (fields[columnIndex - 1].getPGType().equals("bytea"))
{
return PGbytea.toBytes(getString(columnIndex));
return PGbytea.toBytes(this_row[columnIndex - 1]);
}
else
{

2
src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
View File

@ -331,7 +331,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
//Version 7.2 supports the bytea datatype for byte arrays
if (fields[columnIndex - 1].getPGType().equals("bytea"))
{
return PGbytea.toBytes(getString(columnIndex));
return PGbytea.toBytes(this_row[columnIndex - 1]);
}
else
{

24
src/interfaces/jdbc/org/postgresql/util/PGbytea.java
View File

@ -5,40 +5,40 @@ import java.sql.*;
/*
* Converts to and from the postgresql bytea datatype used by the backend.
*
* $Id: PGbytea.java,v 1.3 2001/11/19 22:33:39 momjian Exp $
* $Id: PGbytea.java,v 1.4 2002/01/05 22:26:23 barry Exp $
*/
public class PGbytea
{
/*
* Converts a PG bytea string (i.e. the text representation
* Converts a PG bytea raw value (i.e. the raw binary representation
* of the bytea data type) into a java byte[]
*/
public static byte[] toBytes(String s) throws SQLException
public static byte[] toBytes(byte[] s) throws SQLException
{
if (s == null)
return null;
int slength = s.length();
int slength = s.length;
byte[] buf = new byte[slength];
int bufpos = 0;
int thebyte;
char nextchar;
char secondchar;
byte nextbyte;
byte secondbyte;
for (int i = 0; i < slength; i++)
{
nextchar = s.charAt(i);
if (nextchar == '\\')
nextbyte = s[i];
if (nextbyte == (byte)'\\')
{
secondchar = s.charAt(++i);
if (secondchar == '\\')
secondbyte = s[++i];
if (secondbyte == (byte)'\\')
{
//escaped \
buf[bufpos++] = (byte)'\\';
}
else
{
thebyte = (secondchar - 48) * 64 + (s.charAt(++i) - 48) * 8 + (s.charAt(++i) - 48);
thebyte = (secondbyte - 48) * 64 + (s[++i] - 48) * 8 + (s[++i] - 48);
if (thebyte > 127)
thebyte -= 256;
buf[bufpos++] = (byte)thebyte;
@ -46,7 +46,7 @@ public class PGbytea
}
else
{
buf[bufpos++] = (byte)nextchar;
buf[bufpos++] = nextbyte;
}
}
byte[] l_return = new byte[bufpos];