Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git

Browse Source 
Conflicts:
	src/main/java/com/alibaba/druid/common/jdbc/StatementBase.java
	src/main/java/com/alibaba/druid/mock/MockStatement.java
This commit is contained in:
温少
2012-05-18 21:27:25 +08:00
parent b2d558cf19 c9204dc18a
commit 07ef6df2e3
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/mock/MockStatement.java
+22
View File
@@ -18,6 +18,10 @@ package com.alibaba.druid.mock;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
<<<<<<< HEAD
=======
import java.sql.SQLFeatureNotSupportedException;
>>>>>>> branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git
import java.sql.Statement;
import com.alibaba.druid.common.jdbc.StatementBase;
@@ -27,6 +31,11 @@ public class MockStatement extends StatementBase implements Statement {
public final static String ERROR_SQL = "THROW ERROR";
protected MockConnection mockConnection;
<<<<<<< HEAD
=======
private int updateCount;
>>>>>>> branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git
public MockStatement(Connection connection){
super(connection);
@@ -78,6 +87,19 @@ public class MockStatement extends StatementBase implements Statement {
}
@Override
<<<<<<< HEAD
=======
public void close() throws SQLException {
this.closed = true;
}
@Override
public void cancel() throws SQLException {
checkOpen();
}
@Override
>>>>>>> branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git
public boolean execute(String sql) throws SQLException {
checkOpen();