diff options
| author | Dave Cramer <davec@fastcrypt.com> | 2002-12-23 16:12:36 +0000 |
|---|---|---|
| committer | Dave Cramer <davec@fastcrypt.com> | 2002-12-23 16:12:36 +0000 |
| commit | 3daad2ae913208c4bb873aec800725c4dd3c4642 (patch) | |
| tree | 9bfd7f95b0bb72a40ce8760863a9a54027deae62 | |
| parent | b222867534ab1d200d7268f877fdebade452bbb6 (diff) | |
| download | postgresql-3daad2ae913208c4bb873aec800725c4dd3c4642.tar.gz postgresql-3daad2ae913208c4bb873aec800725c4dd3c4642.zip | |
case sensitive updates by Kris Jurka
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java index 23191b16a69..bb74d6ddce4 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java @@ -15,7 +15,7 @@ import org.postgresql.util.PGbytea; import org.postgresql.util.PSQLException; -/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2ResultSet.java,v 1.10 2002/11/04 06:42:33 barry Exp $ +/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2ResultSet.java,v 1.11 2002/12/23 16:12:36 davec Exp $ * This class defines methods of the jdbc2 specification. This class extends * org.postgresql.jdbc1.AbstractJdbc1ResultSet which provides the jdbc1 * methods. The real Statement class (for jdbc2) is org.postgresql.jdbc2.Jdbc2ResultSet @@ -1009,7 +1009,9 @@ public abstract class AbstractJdbc2ResultSet extends org.postgresql.jdbc1.Abstra { String column = (String) columns.nextElement(); - updateSQL.append( column + "= ?"); + updateSQL.append("\""); + updateSQL.append( column ); + updateSQL.append("\" = ?"); if ( i < numColumns - 1 ) { @@ -1026,7 +1028,9 @@ public abstract class AbstractJdbc2ResultSet extends org.postgresql.jdbc1.Abstra { PrimaryKey primaryKey = ((PrimaryKey) primaryKeys.get(i)); - updateSQL.append(primaryKey.name).append("= ?"); + updateSQL.append("\""); + updateSQL.append(primaryKey.name); + updateSQL.append("\" = ?"); if ( i < numKeys - 1 ) { @@ -1328,7 +1332,16 @@ public abstract class AbstractJdbc2ResultSet extends org.postgresql.jdbc1.Abstra else { // otherwise go and get the primary keys and create a hashtable of keys - java.sql.ResultSet rs = ((java.sql.Connection) connection).getMetaData().getPrimaryKeys("", "", tableName); + // if the user has supplied a quoted table name + // remove the quotes, but preserve the case. + // otherwise fold to lower case. + String quotelessTableName; + if (tableName.startsWith("\"") && tableName.endsWith("\"")) { + quotelessTableName = tableName.substring(1,tableName.length()-1); + } else { + quotelessTableName = tableName.toLowerCase(); + } + java.sql.ResultSet rs = ((java.sql.Connection) connection).getMetaData().getPrimaryKeys("", "", quotelessTableName); for (; rs.next(); i++ ) |