@@ -50,38 +50,6 @@ public class Driver implements java.sql.Driver
5050}
5151}
5252
53- /*
54- * Construct a new driver and register it with DriverManager
55- *
56- * @exception SQLException for who knows what!
57- */
58- public Driver() throws SQLException
59- {
60- // Set the connectClass variable so that future calls will handle the correct
61- // base class
62- //if (System.getProperty("java.version").startsWith("1.1")) {
63- //connectClass = "postgresql.jdbc1.Connection";
64- //} else {
65- //connectClass = "postgresql.jdbc2.Connection";
66- //}
67-
68- // Ok, when the above code was introduced in 6.5 it's intention was to allow
69- // the driver to automatically detect which version of JDBC was being used
70- // and to detect the version of the JVM accordingly.
71- //
72- // It did this by using the java.version parameter.
73- //
74- // However, it was quickly discovered that not all JVM's returned an easily
75- // parseable version number (ie "1.2") and some don't return a value at all.
76- // The latter came from a discussion on the advanced java list.
77- //
78- // So, to solve this, I've moved the decision out of the driver, and it's now
79- // a compile time parameter.
80- //
81- // For this to work, the Makefile creates a pseudo class which contains the class
82- // name that will actually make the connection.
83- }
84-
8553/*
8654 * Try to make a database connection to the given URL.The driver
8755 * should return "null" if it realizes it is the wrong kind of
@@ -209,22 +177,9 @@ public class Driver implements java.sql.Driver
209177 */
210178public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException
211179{
180+ //This method isn't really implemented
212181Properties p = parseURL(url, info);
213-
214- // naughty, but its best for speed. If anyone adds a property here, then
215- // this _MUST_ be increased to accomodate them.
216- DriverPropertyInfo d, dpi[] = new DriverPropertyInfo[0];
217- //int i=0;
218-
219- //dpi[i++] = d = new DriverPropertyInfo("auth",p.getProperty("auth","default"));
220- //d.description = "determines if password authentication is used";
221- //d.choices = new String[4];
222- //d.choices[0]="default";// Get value from org.postgresql.auth property, defaults to trust
223- //d.choices[1]="trust"; // No password authentication
224- //d.choices[2]="password";// Password authentication
225- //d.choices[3]="ident"; // Ident (RFC 1413) protocol
226-
227- return dpi;
182+ return new DriverPropertyInfo[0];
228183}
229184
230185/*
@@ -394,7 +349,7 @@ public class Driver implements java.sql.Driver
394349}
395350
396351/*
397- * @return the port number portion of the URL or-1 if no port was specified
352+ * @return the port number portion of the URL orthe default if no port was specified
398353 */
399354public int port()
400355{