Skip to content

Commit 509a9cd

Browse files
author
Barry Lind
committed
More SQLState updates from Kim Ho at Redhat.
Also a patch from Kris Jurka to correctly report SQLState support. Modified Files: jdbc/org/postgresql/Driver.java.in jdbc/org/postgresql/core/QueryExecutor.java jdbc/org/postgresql/fastpath/Fastpath.java jdbc/org/postgresql/geometric/PGbox.java jdbc/org/postgresql/geometric/PGcircle.java jdbc/org/postgresql/geometric/PGline.java jdbc/org/postgresql/geometric/PGlseg.java jdbc/org/postgresql/geometric/PGpath.java jdbc/org/postgresql/geometric/PGpoint.java jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java jdbc/org/postgresql/jdbc2/Array.java jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java jdbc/org/postgresql/util/PGmoney.java jdbc/org/postgresql/util/PSQLState.java
1 parent f8c365c commit 509a9cd

19 files changed

+92
-72
lines changed

‎src/interfaces/jdbc/org/postgresql/Driver.java.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/Driver.java.in,v 1.35 2003/09/08 17:30:22 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/Driver.java.in,v 1.36 2003/09/13 04:02:12 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -142,7 +142,7 @@ public class Driver implements java.sql.Driver
142142
{
143143
if (Driver.logDebug)
144144
Driver.debug("error", ex);
145-
throw new PSQLException("postgresql.jvm.version", ex);
145+
throw new PSQLException("postgresql.jvm.version", PSQLState.SYSTEM_ERROR, ex);
146146
}
147147
catch (PSQLException ex1)
148148
{
@@ -155,7 +155,7 @@ public class Driver implements java.sql.Driver
155155
if (Driver.logDebug) {
156156
Driver.debug("error", ex2);
157157
}
158-
throw new PSQLException("postgresql.unusual", ex2);
158+
throw new PSQLException("postgresql.unusual", PSQLState.UNEXPECTED_ERROR, ex2);
159159
}
160160
}
161161

@@ -504,6 +504,6 @@ public class Driver implements java.sql.Driver
504504

505505

506506
//The build number should be incremented for every new build
507-
private static int m_buildNumber = 208;
507+
private static int m_buildNumber = 209;
508508

509509
}

‎src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.25 2003/09/09 10:49:16 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.26 2003/09/13 04:02:13 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -311,7 +311,7 @@ private void sendQueryV3() throws SQLException
311311
for ( int i = 0; i < m_binds.length ; i++ )
312312
{
313313
if ( m_binds[i] == null )
314-
throw new PSQLException("postgresql.prep.param", PSQLState.PARAMETER_ERROR, new Integer(i + 1));
314+
throw new PSQLException("postgresql.prep.param", PSQLState.INVALID_PARAMETER_VALUE, new Integer(i + 1));
315315
}
316316
try
317317
{
@@ -352,7 +352,7 @@ private void sendQueryV2() throws SQLException
352352
for ( int i = 0; i < m_binds.length ; i++ )
353353
{
354354
if ( m_binds[i] == null )
355-
throw new PSQLException("postgresql.prep.param", PSQLState.PARAMETER_ERROR, new Integer(i + 1));
355+
throw new PSQLException("postgresql.prep.param", PSQLState.INVALID_PARAMETER_VALUE, new Integer(i + 1));
356356
}
357357
try
358358
{

‎src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.15 2003/09/08 17:30:22 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.16 2003/09/13 04:02:13 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -178,7 +178,7 @@ else if (l_valueLen == 0)
178178
break;
179179

180180
default:
181-
throw new PSQLException("postgresql.fp.protocol", new Character((char)c));
181+
throw new PSQLException("postgresql.fp.protocol", PSQLState.COMMUNICATION_ERROR, new Character((char)c));
182182
}
183183
}
184184

@@ -279,12 +279,12 @@ private Object fastpathV2(int fnid, boolean resulttype, FastpathArg[] args) thro
279279
break;
280280

281281
default:
282-
throw new PSQLException("postgresql.fp.protocol", new Character((char)c));
282+
throw new PSQLException("postgresql.fp.protocol", PSQLState.COMMUNICATION_ERROR, new Character((char)c));
283283
}
284284
}
285285

286286
if ( errorMessage != null )
287-
throw new PSQLException("postgresql.fp.error", errorMessage.toString());
287+
throw new PSQLException("postgresql.fp.error", PSQLState.COMMUNICATION_ERROR, errorMessage.toString());
288288

289289
return result;
290290
}
@@ -422,7 +422,7 @@ public int getID(String name) throws SQLException
422422
// so, until we know we can do this (needs testing, on the TODO list)
423423
// for now, we throw the exception and do no lookups.
424424
if (id == null)
425-
throw new PSQLException("postgresql.fp.unknown", name);
425+
throw new PSQLException("postgresql.fp.unknown", PSQLState.UNEXPECTED_ERROR, name);
426426

427427
return id.intValue();
428428
}

‎src/interfaces/jdbc/org/postgresql/geometric/PGbox.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGbox.java,v 1.4 2003/03/07 18:39:42 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGbox.java,v 1.5 2003/09/13 04:02:14 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
package org.postgresql.geometric;
1414

15-
import java.sql.SQLException;
16-
import java.io.Serializable;
1715
import org.postgresql.util.PGobject;
1816
import org.postgresql.util.PGtokenizer;
1917
import org.postgresql.util.PSQLException;
18+
import org.postgresql.util.PSQLState;
19+
20+
import java.io.Serializable;
21+
import java.sql.SQLException;
2022

2123
public class PGbox extends PGobject implements Serializable, Cloneable
2224
{
@@ -78,7 +80,7 @@ public void setValue(String value) throws SQLException
7880
{
7981
PGtokenizer t = new PGtokenizer(value, ',');
8082
if (t.getSize() != 2)
81-
throw new PSQLException("postgresql.geo.box", value);
83+
throw new PSQLException("postgresql.geo.box", PSQLState.DATA_TYPE_MISMATCH, value);
8284

8385
point[0] = new PGpoint(t.getToken(0));
8486
point[1] = new PGpoint(t.getToken(1));

‎src/interfaces/jdbc/org/postgresql/geometric/PGcircle.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 2003, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGcircle.java,v 1.5 2003/05/29 04:39:48 barry Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGcircle.java,v 1.6 2003/09/13 04:02:14 barry Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,6 +16,8 @@
1616
import org.postgresql.util.PGobject;
1717
import org.postgresql.util.PGtokenizer;
1818
import org.postgresql.util.PSQLException;
19+
import org.postgresql.util.PSQLState;
20+
1921
import java.io.Serializable;
2022
import java.sql.SQLException;
2123

@@ -78,7 +80,7 @@ public void setValue(String s) throws SQLException
7880
{
7981
PGtokenizer t = new PGtokenizer(PGtokenizer.removeAngle(s), ',');
8082
if (t.getSize() != 2)
81-
throw new PSQLException("postgresql.geo.circle", s);
83+
throw new PSQLException("postgresql.geo.circle", PSQLState.DATA_TYPE_MISMATCH, s);
8284

8385
try
8486
{
@@ -87,7 +89,7 @@ public void setValue(String s) throws SQLException
8789
}
8890
catch (NumberFormatException e)
8991
{
90-
throw new PSQLException("postgresql.geo.circle", e);
92+
throw new PSQLException("postgresql.geo.circle", PSQLState.DATA_TYPE_MISMATCH, e);
9193
}
9294
}
9395

‎src/interfaces/jdbc/org/postgresql/geometric/PGline.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGline.java,v 1.4 2003/03/07 18:39:42 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGline.java,v 1.5 2003/09/13 04:02:15 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
package org.postgresql.geometric;
1414

15-
import java.io.Serializable;
16-
import java.sql.SQLException;
1715
import org.postgresql.util.PGobject;
1816
import org.postgresql.util.PGtokenizer;
1917
import org.postgresql.util.PSQLException;
18+
import org.postgresql.util.PSQLState;
19+
20+
import java.io.Serializable;
21+
import java.sql.SQLException;
2022

2123
/*
2224
* Currently line is not yet implemented in the backend, but this class
@@ -77,7 +79,7 @@ public void setValue(String s) throws SQLException
7779
{
7880
PGtokenizer t = new PGtokenizer(PGtokenizer.removeBox(s), ',');
7981
if (t.getSize() != 2)
80-
throw new PSQLException("postgresql.geo.line", s);
82+
throw new PSQLException("postgresql.geo.line", PSQLState.DATA_TYPE_MISMATCH, s);
8183

8284
point[0] = new PGpoint(t.getToken(0));
8385
point[1] = new PGpoint(t.getToken(1));

‎src/interfaces/jdbc/org/postgresql/geometric/PGlseg.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGlseg.java,v 1.4 2003/03/07 18:39:42 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGlseg.java,v 1.5 2003/09/13 04:02:15 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
package org.postgresql.geometric;
1414

15-
import java.io.Serializable;
16-
import java.sql.SQLException;
1715
import org.postgresql.util.PGobject;
1816
import org.postgresql.util.PGtokenizer;
1917
import org.postgresql.util.PSQLException;
18+
import org.postgresql.util.PSQLState;
19+
20+
import java.io.Serializable;
21+
import java.sql.SQLException;
2022

2123
public class PGlseg extends PGobject implements Serializable, Cloneable
2224
{
@@ -73,7 +75,7 @@ public void setValue(String s) throws SQLException
7375
{
7476
PGtokenizer t = new PGtokenizer(PGtokenizer.removeBox(s), ',');
7577
if (t.getSize() != 2)
76-
throw new PSQLException("postgresql.geo.lseg");
78+
throw new PSQLException("postgresql.geo.lseg", PSQLState.DATA_TYPE_MISMATCH);
7779

7880
point[0] = new PGpoint(t.getToken(0));
7981
point[1] = new PGpoint(t.getToken(1));

‎src/interfaces/jdbc/org/postgresql/geometric/PGpath.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpath.java,v 1.5 2003/03/07 18:39:42 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpath.java,v 1.6 2003/09/13 04:02:15 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
package org.postgresql.geometric;
1414

15-
import java.io.Serializable;
16-
import java.sql.SQLException;
1715
import org.postgresql.util.PGobject;
1816
import org.postgresql.util.PGtokenizer;
1917
import org.postgresql.util.PSQLException;
18+
import org.postgresql.util.PSQLState;
19+
20+
import java.io.Serializable;
21+
import java.sql.SQLException;
2022

2123
public class PGpath extends PGobject implements Serializable, Cloneable
2224
{
@@ -77,7 +79,7 @@ else if (s.startsWith("(") && s.endsWith(")"))
7779
s = PGtokenizer.removePara(s);
7880
}
7981
else
80-
throw new PSQLException("postgresql.geo.path");
82+
throw new PSQLException("postgresql.geo.path", PSQLState.DATA_TYPE_MISMATCH);
8183

8284
PGtokenizer t = new PGtokenizer(s, ',');
8385
int npoints = t.getSize();

‎src/interfaces/jdbc/org/postgresql/geometric/PGpoint.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpoint.java,v 1.5 2003/05/29 04:39:48 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpoint.java,v 1.6 2003/09/13 04:02:15 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -15,6 +15,8 @@
1515
import org.postgresql.util.PGobject;
1616
import org.postgresql.util.PGtokenizer;
1717
import org.postgresql.util.PSQLException;
18+
import org.postgresql.util.PSQLState;
19+
1820
import java.awt.Point;
1921
import java.io.Serializable;
2022
import java.sql.SQLException;
@@ -80,7 +82,7 @@ public void setValue(String s) throws SQLException
8082
}
8183
catch (NumberFormatException e)
8284
{
83-
throw new PSQLException("postgresql.geo.point", e.toString());
85+
throw new PSQLException("postgresql.geo.point", PSQLState.DATA_TYPE_MISMATCH, e.toString());
8486
}
8587
}
8688

‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright (c) 2003, PostgreSQL Global Development Group
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.25 2003/09/09 10:49:16 barry Exp $
12+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.26 2003/09/13 04:02:15 barry Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -373,7 +373,7 @@ private void openConnectionV3(String p_host, int p_port, Properties p_info, Stri
373373
case AUTH_REQ_SCM:
374374
if (Driver.logDebug)
375375
Driver.debug("postgresql: SCM");
376-
throw new PSQLException("postgresql.con.scm");
376+
throw new PSQLException("postgresql.con.scm", PSQLState.CONNECTION_REJECTED);
377377

378378

379379
case AUTH_REQ_PASSWORD:

‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright (c) 2003, PostgreSQL Global Development Group
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.17 2003/09/09 10:49:16 barry Exp $
12+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.18 2003/09/13 04:02:15 barry Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -211,7 +211,7 @@ public byte getByte(int columnIndex) throws SQLException
211211
}
212212
catch (NumberFormatException e)
213213
{
214-
throw new PSQLException("postgresql.res.badbyte", s);
214+
throw new PSQLException("postgresql.res.badbyte", PSQLState.NUMERIC_VALUE_OUT_OF_RANGE, s);
215215
}
216216
}
217217
return 0; // SQL NULL
@@ -565,7 +565,7 @@ public Object getObject(int columnIndex) throws SQLException
565565
Field field;
566566

567567
if (columnIndex < 1 || columnIndex > fields.length)
568-
throw new PSQLException("postgresql.res.colrange");
568+
throw new PSQLException("postgresql.res.colrange", PSQLState.INVALID_PARAMETER_VALUE);
569569
field = fields[columnIndex - 1];
570570

571571
// some fields can be null, mainly from those returned by MetaData methods
@@ -788,7 +788,7 @@ protected void checkResultSet( int column ) throws SQLException
788788
if ( this_row == null )
789789
throw new PSQLException("postgresql.res.nextrequired");
790790
if ( column < 1 || column > fields.length )
791-
throw new PSQLException("postgresql.res.colrange" );
791+
throw new PSQLException("postgresql.res.colrange", PSQLState.INVALID_PARAMETER_VALUE );
792792
}
793793

794794
//----------------- Formatting Methods -------------------

‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.postgresql.core.Field;
55
import org.postgresql.util.PSQLException;
6+
import org.postgresql.util.PSQLState;
67
import java.sql.SQLException;
78
import java.sql.Types;
89
import java.util.Vector;
@@ -454,7 +455,7 @@ public boolean isDefinitelyWritable(int column) throws SQLException
454455
private Field getField(int columnIndex) throws SQLException
455456
{
456457
if (columnIndex < 1 || columnIndex > fields.length)
457-
throw new PSQLException("postgresql.res.colrange");
458+
throw new PSQLException("postgresql.res.colrange", PSQLState.INVALID_PARAMETER_VALUE);
458459
return fields[columnIndex - 1];
459460
}
460461
}

0 commit comments

Comments
 (0)