Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit35a945f

Browse files
committed
New stuff from Peter Mount for jdbc.
1 parentc37adac commit35a945f

File tree

8 files changed

+198
-198
lines changed

8 files changed

+198
-198
lines changed

‎src/interfaces/jdbc/example/psql.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void displayResult(ResultSet rs) throws SQLException
123123
if(rs.wasNull())
124124
System.out.print("{null}"+(i<cols?"\t":"\n"));
125125
else
126-
System.out.print(rs.getObject(i).toString()+(i<cols?"\t":"\n"));
126+
System.out.print(o.toString()+(i<cols?"\t":"\n"));
127127
}
128128
}
129129

‎src/interfaces/jdbc/postgresql/Connection.java

Lines changed: 38 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public class Connection implements java.sql.Connection
3434
// This is set by postgresql.Statement.setMaxRows()
3535
protectedintmaxrows =0;// maximum no. of rows; 0 = unlimited
3636

37+
// This is a cache of the DatabaseMetaData instance for this connection
38+
protectedDatabaseMetaDatametadata;
39+
3740
privateStringPG_HOST;
3841
privateintPG_PORT;
3942
privateStringPG_USER;
@@ -44,17 +47,6 @@ public class Connection implements java.sql.Connection
4447
publicbooleanCONNECTION_OK =true;
4548
publicbooleanCONNECTION_BAD =false;
4649

47-
//private static final int STARTUP_LEN = 288;// Length of a startup packet
48-
49-
// These are defined in src/include/libpq/pqcomm.h
50-
//private int STARTUP_CODE = STARTUP_USER;
51-
//private static final int STARTUP_USER = 7;// User auth
52-
//private static final int STARTUP_KRB4 = 10;// Kerberos 4 (unused)
53-
//private static final int STARTUP_KRB5 = 11;// Kerberos 5 (unused)
54-
//private static final int STARTUP_HBA = 12;// Host Based
55-
//private static final int STARTUP_NONE = 13;// Unauthenticated (unused)
56-
//private static final int STARTUP_PASS = 14;// Password auth
57-
5850
privatebooleanautoCommit =true;
5951
privatebooleanreadOnly =false;
6052

@@ -88,12 +80,6 @@ public class Connection implements java.sql.Connection
8880
// be across all connections, which could be to different backends.
8981
protectedHashtablefieldCache =newHashtable();
9082

91-
// This is used by Field to cache oid -> names.
92-
// It's here, because it's shared across this connection only.
93-
// Hence it cannot be static within the Field class, because it would then
94-
// be across all connections, which could be to different backends.
95-
protectedHashtablefieldCache =newHashtable();
96-
9783
/**
9884
* This is the current date style of the backend
9985
*/
@@ -150,8 +136,6 @@ public class Connection implements java.sql.Connection
150136
*/
151137
publicConnection(Stringhost,intport,Propertiesinfo,Stringdatabase,Stringurl,Driverd)throwsSQLException
152138
{
153-
//int len = STARTUP_LEN;// Length of a startup packet
154-
155139
// Throw an exception if the user or password properties are missing
156140
// This occasionally occurs when the client uses the properties version
157141
// of getConnection(), and is a common question on the email lists
@@ -169,61 +153,33 @@ public Connection(String host, int port, Properties info, String database, Strin
169153
PG_HOST =newString(host);
170154
PG_STATUS =CONNECTION_BAD;
171155

172-
// Pre 6.3 code
173-
// This handles the auth property. Any value begining with p enables
174-
// password authentication, while anything begining with i enables
175-
// ident (RFC 1413) authentication. Any other values default to trust.
176-
//
177-
// Also, the postgresql.auth system property can be used to change the
178-
// local default, if the auth property is not present.
179-
//
180-
//String auth = info.getProperty("auth",System.getProperty("postgresql.auth","trust")).toLowerCase();
181-
//if(auth.startsWith("p")) {
182-
//// Password authentication
183-
//STARTUP_CODE=STARTUP_PASS;
184-
//} else if(auth.startsWith("i")) {
185-
//// Ident (RFC 1413) authentication
186-
//STARTUP_CODE=STARTUP_HBA;
187-
//} else {
188-
//// Anything else defaults to trust authentication
189-
//STARTUP_CODE=STARTUP_USER;
190-
//}
191-
192156
// Now make the initial connection
193157
try
194158
{
195159
pg_stream =newPG_Stream(host,port);
160+
}catch (ConnectExceptioncex) {
161+
// Added by Peter Mount <peter@retep.org.uk>
162+
// ConnectException is thrown when the connection cannot be made.
163+
// we trap this an return a more meaningful message for the end user
164+
thrownewSQLException ("Connection refused. Check that the hostname and port is correct, and that the postmaster is running with the -i flag, which enables TCP/IP networking.");
196165
}catch (IOExceptione) {
197166
thrownewSQLException ("Connection failed: " +e.toString());
198167
}
199168

200169
// Now we need to construct and send a startup packet
201170
try
202171
{
203-
// Pre 6.3 code
204-
//pg_stream.SendInteger(len, 4);len -= 4;
205-
//pg_stream.SendInteger(STARTUP_CODE, 4);len -= 4;
206-
//pg_stream.Send(database.getBytes(), 64);len -= 64;
207-
//pg_stream.Send(PG_USER.getBytes(), len);
208-
//
209-
//// Send the password packet if required
210-
//if(STARTUP_CODE == STARTUP_PASS) {
211-
//len=STARTUP_LEN;
212-
//pg_stream.SendInteger(len, 4);len -= 4;
213-
//pg_stream.SendInteger(STARTUP_PASS, 4);len -= 4;
214-
//pg_stream.Send(PG_USER.getBytes(), PG_USER.length());
215-
//len-=PG_USER.length();
216-
//pg_stream.SendInteger(0,1);len -= 1;
217-
//pg_stream.Send(PG_PASSWORD.getBytes(), len);
218-
//}
219-
220172
// Ver 6.3 code
221173
pg_stream.SendInteger(4+4+SM_DATABASE+SM_USER+SM_OPTIONS+SM_UNUSED+SM_TTY,4);
222174
pg_stream.SendInteger(PG_PROTOCOL_LATEST_MAJOR,2);
223175
pg_stream.SendInteger(PG_PROTOCOL_LATEST_MINOR,2);
224176
pg_stream.Send(database.getBytes(),SM_DATABASE);
177+
178+
// This last send includes the unused fields
225179
pg_stream.Send(PG_USER.getBytes(),SM_USER+SM_OPTIONS+SM_UNUSED+SM_TTY);
226-
// The last send includes the unused fields
180+
181+
// now flush the startup packets to the backend
182+
pg_stream.flush();
227183

228184
// Now get the response from the backend, either an error message
229185
// or an authentication request
@@ -233,6 +189,12 @@ public Connection(String host, int port, Properties info, String database, Strin
233189
switch(beresp)
234190
{
235191
case'E':
192+
// An error occured, so pass the error message to the
193+
// user.
194+
//
195+
// The most common one to be thrown here is:
196+
// "User authentication failed"
197+
//
236198
thrownewSQLException(pg_stream.ReceiveString(4096));
237199

238200
case'R':
@@ -267,7 +229,7 @@ public Connection(String host, int port, Properties info, String database, Strin
267229
pg_stream.SendInteger(5+PG_PASSWORD.length(),4);
268230
pg_stream.Send(PG_PASSWORD.getBytes());
269231
pg_stream.SendInteger(0,1);
270-
//pg_stream.SendPacket(PG_PASSWORD.getBytes());
232+
pg_stream.flush();
271233
break;
272234

273235
caseAUTH_REQ_CRYPT:
@@ -276,11 +238,11 @@ public Connection(String host, int port, Properties info, String database, Strin
276238
pg_stream.SendInteger(5+crypted.length(),4);
277239
pg_stream.Send(crypted.getBytes());
278240
pg_stream.SendInteger(0,1);
279-
//pg_stream.SendPacket(UnixCrypt.crypt(salt,PG_PASSWORD).getBytes());
241+
pg_stream.flush();
280242
break;
281243

282244
default:
283-
thrownewSQLException("Authentication type "+areq+" not supported");
245+
thrownewSQLException("Authentication type "+areq+" not supported. Check that you have configured the pg_hba.conf file to include the client's IP address or Subnet, and is using a supported authentication scheme.");
284246
}
285247
break;
286248

@@ -511,7 +473,9 @@ public boolean isClosed() throws SQLException
511473
*/
512474
publicjava.sql.DatabaseMetaDatagetMetaData()throwsSQLException
513475
{
514-
returnnewDatabaseMetaData(this);
476+
if(metadata==null)
477+
metadata =newDatabaseMetaData(this);
478+
returnmetadata;
515479
}
516480

517481
/**
@@ -631,8 +595,6 @@ public void clearWarnings() throws SQLException
631595
*/
632596
publicvoidaddWarning(Stringmsg)
633597
{
634-
//PrintStream log = DriverManager.getLogStream();
635-
//if(log!=null)
636598
DriverManager.println(msg);
637599

638600
// Add the warning to the chain
@@ -691,6 +653,7 @@ public synchronized ResultSet ExecSQL(String sql) throws SQLException
691653
buf =sql.getBytes();
692654
pg_stream.Send(buf);
693655
pg_stream.SendChar(0);
656+
pg_stream.flush();
694657
}catch (IOExceptione) {
695658
thrownewSQLException("I/O Error: " +e.toString());
696659
}
@@ -726,6 +689,7 @@ public synchronized ResultSet ExecSQL(String sql) throws SQLException
726689
pg_stream.SendChar('Q');
727690
pg_stream.SendChar(' ');
728691
pg_stream.SendChar(0);
692+
pg_stream.flush();
729693
}catch (IOExceptione) {
730694
thrownewSQLException("I/O Error: " +e.toString());
731695
}
@@ -964,6 +928,8 @@ protected Object getObject(String type,String value) throws SQLException
964928
return ((Serialize)o).fetch(Integer.parseInt(value));
965929
}
966930
}catch(SQLExceptionsx) {
931+
// rethrow the exception. Done because we capture any others next
932+
sx.fillInStackTrace();
967933
throwsx;
968934
}catch(Exceptionex) {
969935
thrownewSQLException("Failed to create object for "+type+": "+ex);
@@ -999,14 +965,17 @@ protected int putObject(Object o) throws SQLException
999965
// If so, then call it's fetch method.
1000966
if(xinstanceofSerialize)
1001967
return ((Serialize)x).store(o);
968+
969+
// Thow an exception because the type is unknown
970+
thrownewSQLException("The object could not be stored. Check that any tables required have already been created in the database.");
971+
1002972
}catch(SQLExceptionsx) {
973+
// rethrow the exception. Done because we capture any others next
974+
sx.fillInStackTrace();
1003975
throwsx;
1004976
}catch(Exceptionex) {
1005977
thrownewSQLException("Failed to store object: "+ex);
1006978
}
1007-
1008-
// should never be reached
1009-
return0;
1010979
}
1011980

1012981
/**
@@ -1045,10 +1014,12 @@ public void addDataType(String type,String name)
10451014
privatestaticfinalStringdefaultObjectTypes[][] = {
10461015
{"box","postgresql.geometric.PGbox"},
10471016
{"circle","postgresql.geometric.PGcircle"},
1017+
{"line","postgresql.geometric.PGline"},
10481018
{"lseg","postgresql.geometric.PGlseg"},
10491019
{"path","postgresql.geometric.PGpath"},
10501020
{"point","postgresql.geometric.PGpoint"},
1051-
{"polygon","postgresql.geometric.PGpolygon"}
1021+
{"polygon","postgresql.geometric.PGpolygon"},
1022+
{"money","postgresql.util.PGmoney"}
10521023
};
10531024

10541025
// This initialises the objectTypes hashtable

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp