fixed change in behavior introduced in bytea / getBytes changes. This patch...

fixed change in behavior introduced in bytea / getBytes changes.  This patch reverts back unintentional change in behavior to return raw value even when not bytea column

src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java

@@ -391,22 +391,30 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
 		if (columnIndex < 1 || columnIndex > fields.length)
 			throw new PSQLException("postgresql.res.colrange");
 
-		//If the data is already binary then just return it
+		wasNullFlag = (this_row[columnIndex - 1] == null);
+		if (!wasNullFlag)
+		{
 		    if (binaryCursor)
+		    {
+			//If the data is already binary then just return it
 			return this_row[columnIndex - 1];
-
-		if (connection.haveMinimumCompatibleVersion("7.2"))
+		    }
+		    else if (connection.haveMinimumCompatibleVersion("7.2"))
 		    {
 			//Version 7.2 supports the bytea datatype for byte arrays
+			if (fields[columnIndex - 1].getPGType().equals("bytea"))
+			{
 			    return PGbytea.toBytes(getString(columnIndex));
 			}
 			else
+			{
+			    return this_row[columnIndex - 1];
+			}
+		    }
+		    else
 		    {
 			//Version 7.1 and earlier supports LargeObjects for byte arrays
-			wasNullFlag = (this_row[columnIndex - 1] == null);
 			// Handle OID's as BLOBS
-			if (!wasNullFlag)
-			{
 			if ( fields[columnIndex - 1].getOID() == 26)
 			{
 			    LargeObjectManager lom = connection.getLargeObjectAPI();
@@ -415,6 +423,10 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
 			    lob.close();
 			    return buf;
 			}
+			else
+			{
+			    return this_row[columnIndex - 1];
+			}
 		    }
 		}
 		return null;

src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java

@@ -318,22 +318,30 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
 		if (columnIndex < 1 || columnIndex > fields.length)
 			throw new PSQLException("postgresql.res.colrange");
 
-		//If the data is already binary then just return it
+		wasNullFlag = (this_row[columnIndex - 1] == null);
+		if (!wasNullFlag)
+		{
 		    if (binaryCursor)
+		    {
+			//If the data is already binary then just return it
 			return this_row[columnIndex - 1];
-
-		if (connection.haveMinimumCompatibleVersion("7.2"))
+		    }
+		    else if (connection.haveMinimumCompatibleVersion("7.2"))
 		    {
 			//Version 7.2 supports the bytea datatype for byte arrays
+			if (fields[columnIndex - 1].getPGType().equals("bytea"))
+			{
 			    return PGbytea.toBytes(getString(columnIndex));
 			}
 			else
+			{
+			    return this_row[columnIndex - 1];
+			}
+		    }
+		    else
 		    {		       
 			//Version 7.1 and earlier supports LargeObjects for byte arrays
-			wasNullFlag = (this_row[columnIndex - 1] == null);
 			// Handle OID's as BLOBS
-			if (!wasNullFlag)
-			{
 			if ( fields[columnIndex - 1].getOID() == 26)
 			{
 			    LargeObjectManager lom = connection.getLargeObjectAPI();
@@ -342,6 +350,10 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
 			    lob.close();
 			    return buf;
 			}
+			else
+			{
+			    return this_row[columnIndex - 1];
+			}
 		    }
 		}
 		return null;