improved jdk7 support & postgresql support.

This commit is contained in:
wenshao
2017-07-11 15:48:00 +08:00
parent 1e0ce32284
commit 15ac64e501
10 changed files with 134 additions and 9 deletions
@@ -203,6 +203,10 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
@Override
public Connection getConnection() {
if (!holder.isUnderlyingAutoCommit()) {
createTransactionInfo();
}
return conn;
}
@@ -755,6 +759,12 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
return transactionInfo;
}
protected void createTransactionInfo() {
DruidAbstractDataSource dataSource = holder.getDataSource();
dataSource.incrementStartTransactionCount();
transactionInfo = new TransactionInfo(dataSource.createTransactionId());
}
@Override
public void rollback() throws SQLException {
if (transactionInfo == null) {
@@ -859,6 +869,10 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
public DatabaseMetaData getMetaData() throws SQLException {
checkState();
if (!holder.isUnderlyingAutoCommit()) {
createTransactionInfo();
}
return conn.getMetaData();
}
@@ -983,6 +997,10 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
public int getHoldability() throws SQLException {
checkState();
if (!holder.isUnderlyingAutoCommit()) {
createTransactionInfo();
}
return conn.getHoldability();
}