mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

one more change to correctly support the removeall of autocommit

Browse Source
This commit is contained in:
Barry Lind 2003-05-29 21:44:47 +00:00
parent 9fbd52808e
commit 4fb5b92769
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
View File

@ -9,7 +9,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.19 2003/05/29 03:21:32 barry Exp $ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.20 2003/05/29 21:44:47 barry Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -770,15 +770,26 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
String dbEncoding = resultSet.getString(2); String dbEncoding = resultSet.getString(2);
encoding = Encoding.getEncoding(dbEncoding, info.getProperty("charSet")); encoding = Encoding.getEncoding(dbEncoding, info.getProperty("charSet"));
//TODO: remove this once the set is done as part of V3protocol connection initiation
if (haveMinimumServerVersion("7.4"))
{
BaseResultSet acRset =
execSQL("set client_encoding = 'UNICODE'");
//set encoding to be unicode
encoding = Encoding.getEncoding("UNICODE", null);
}
//In 7.3 we are forced to do a second roundtrip to handle the case //In 7.3 we are forced to do a second roundtrip to handle the case
//where a database may not be running in autocommit mode //where a database may not be running in autocommit mode
//jdbc by default assumes autocommit is on until setAutoCommit(false) //jdbc by default assumes autocommit is on until setAutoCommit(false)
//is called. Therefore we need to ensure a new connection is //is called. Therefore we need to ensure a new connection is
//initialized to autocommit on. //initialized to autocommit on.
//We also set the client encoding so that the driver only needs //We also set the client encoding so that the driver only needs
//to deal with utf8. We can only do this in 7.3 because multibyte //to deal with utf8. We can only do this in 7.3+ because multibyte
//support is now always included //support is now always included
if (haveMinimumServerVersion("7.3")) if (haveMinimumServerVersion("7.3") && !haveMinimumServerVersion("7.4"))
{ {
BaseResultSet acRset = BaseResultSet acRset =
execSQL("set client_encoding = 'UNICODE'; show autocommit"); execSQL("set client_encoding = 'UNICODE'; show autocommit");