diff options
Diffstat (limited to 'src/interfaces/jdbc/org/postgresql/jdbc1')
3 files changed, 23 insertions, 14 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java index a7337d3923a..f0b50c1f62d 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java @@ -250,7 +250,7 @@ public abstract class AbstractJdbc1DatabaseMetaData */ public String getDriverVersion() throws SQLException { - String driverVersion = connection.this_driver.getVersion(); + String driverVersion = Driver.getVersion(); if (Driver.logDebug) Driver.debug("getDriverVersion " + driverVersion); return driverVersion; @@ -3412,7 +3412,6 @@ public abstract class AbstractJdbc1DatabaseMetaData { Field f[] = new Field[18]; - ResultSet r; // ResultSet for the SQL query that we need to do Vector v = new Vector(); // The new ResultSet tuple stuff f[0] = new Field(connection, "TYPE_NAME", iVarcharOid, getMaxNameLength()); diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java index 4065f3d2101..681cc8b18f4 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java @@ -1,12 +1,11 @@ package org.postgresql.jdbc1; -import java.lang.*; -import java.util.*; import org.postgresql.core.Field; -import org.postgresql.util.*; +import org.postgresql.util.PSQLException; import java.sql.SQLException; import java.sql.Types; +import java.util.Vector; public abstract class AbstractJdbc1ResultSetMetaData { @@ -180,7 +179,6 @@ public abstract class AbstractJdbc1ResultSetMetaData { Field f = getField(column); String type_name = f.getPGType(); - int sql_type = f.getSQLType(); int typmod = f.getMod(); // I looked at other JDBC implementations and couldn't find a consistent diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java index c473dd240bd..456697cd362 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java @@ -1,19 +1,31 @@ package org.postgresql.jdbc1; -import java.io.*; - -import java.math.BigDecimal; -import java.sql.*; -import java.util.Vector; import org.postgresql.core.BaseConnection; import org.postgresql.core.BaseResultSet; import org.postgresql.core.BaseStatement; import org.postgresql.core.Field; import org.postgresql.core.QueryExecutor; -import org.postgresql.largeobject.*; -import org.postgresql.util.*; +import org.postgresql.largeobject.LargeObject; +import org.postgresql.largeobject.LargeObjectManager; +import org.postgresql.util.PGbytea; +import org.postgresql.util.PGobject; +import org.postgresql.util.PSQLException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.sql.CallableStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.Time; +import java.sql.Timestamp; +import java.sql.Types; +import java.util.Vector; -/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.21 2003/05/03 20:40:45 barry Exp $ +/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.22 2003/05/29 04:39:49 barry Exp $ * This class defines methods of the jdbc1 specification. This class is * extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2 * methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement |