1
0
mirror of https://github.com/postgres/postgres.git synced 2025-08-31 17:02:12 +03:00

Backpatch jdbc2 fixes to jdbc1, ANT fixes, from Peter Eisentraut

This commit is contained in:
Bruce Momjian
2001-05-16 16:20:53 +00:00
parent 1292467db1
commit 9cdf723142
4 changed files with 17 additions and 16 deletions

View File

@@ -227,7 +227,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
*/
public short getShort(int columnIndex) throws SQLException
{
String s = getString(columnIndex);
String s = getFixedString(columnIndex);
if (s != null)
{
@@ -250,7 +250,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
*/
public int getInt(int columnIndex) throws SQLException
{
String s = getString(columnIndex);
String s = getFixedString(columnIndex);
if (s != null)
{
@@ -273,7 +273,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
*/
public long getLong(int columnIndex) throws SQLException
{
String s = getString(columnIndex);
String s = getFixedString(columnIndex);
if (s != null)
{
@@ -296,7 +296,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
*/
public float getFloat(int columnIndex) throws SQLException
{
String s = getString(columnIndex);
String s = getFixedString(columnIndex);
if (s != null)
{
@@ -319,7 +319,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
*/
public double getDouble(int columnIndex) throws SQLException
{
String s = getString(columnIndex);
String s = getFixedString(columnIndex);
if (s != null)
{
@@ -344,7 +344,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
*/
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException
{
String s = getString(columnIndex);
String s = getFixedString(columnIndex);
BigDecimal val;
if (s != null)
@@ -412,12 +412,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
String s = getString(columnIndex);
if(s==null)
return null;
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
try {
return new java.sql.Date(df.parse(s).getTime());
} catch (ParseException e) {
throw new PSQLException("postgresql.res.baddate",new Integer(e.getErrorOffset()),s);
}
return java.sql.Date.valueOf(s);
}
/**

View File

@@ -22,7 +22,7 @@ import org.postgresql.util.PSQLException;
* @see java.sql.Statement
* @see ResultSet
*/
public class Statement implements java.sql.Statement
public class Statement extends org.postgresql.Statement implements java.sql.Statement
{
Connection connection; // The connection who created us
java.sql.ResultSet result = null; // The current results