Projects >> druid >>07ef6df2e3bc624109969e565141a2368128209a

Chunk
Conflicting content 
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
<<<<<<< HEAD
import java.sql.SQLFeatureNotSupportedException;
=======
>>>>>>> c9204dc18af0988b10ee8ca582a0111bdfda5662
import java.sql.SQLWarning;
import java.sql.Statement;
Solution content 
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.Statement;
File
StatementBase.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private boolean    escapeProcessing;
    private String     cursorName;
    private SQLWarning warnings;
<<<<<<< HEAD
    private int        updateCount;
    protected boolean  closed = false;
    private boolean    poolable;

    private ResultSet  generatedKeys;
    private ResultSet  resultSet;
=======
>>>>>>> c9204dc18af0988b10ee8ca582a0111bdfda5662

    public StatementBase(Connection connection){
        super();
Solution content 
    private boolean    escapeProcessing;
    private String     cursorName;
    private SQLWarning warnings;
    private int        updateCount;
    protected boolean  closed = false;
    private boolean    poolable;

    private ResultSet  generatedKeys;
    private ResultSet  resultSet;

    public StatementBase(Connection connection){
        super();
File
StatementBase.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        checkOpen();

    public void setWarning(SQLWarning warning) {
        this.warnings = warning;
    }
<<<<<<< HEAD

    @Override
    public int getUpdateCount() throws SQLException {
        checkOpen();

        return updateCount;
    }

    public void setUpdateCount(int updateCount) {
        this.updateCount = updateCount;
    }

    @Override
    public void close() throws SQLException {
        this.closed = true;
    }

    @SuppressWarnings("unchecked")
    @Override
    public  T unwrap(Class iface) throws SQLException {
        if (iface == null) {
            return null;
        }

        if (iface.isInstance(this)) {
            return (T) this;
        }

        return null;
    }

    @Override
    public boolean isWrapperFor(Class iface) throws SQLException {
        if (iface == null) {
            return false;
        }

        if (iface.isInstance(this)) {
            return true;
        }

        return false;
    }

    public boolean isPoolable() throws SQLException {
        checkOpen();
        return poolable;
    }

    public void setPoolable(boolean poolable) throws SQLException {
        checkOpen();
        this.poolable = poolable;
    }

    public void closeOnCompletion() throws SQLException {
        throw new SQLFeatureNotSupportedException();
    }

    public boolean isCloseOnCompletion() throws SQLException {
        throw new SQLFeatureNotSupportedException();
    }

    @Override
    public boolean isClosed() throws SQLException {
        return closed;
    }

    @Override
    public boolean getMoreResults() throws SQLException {
        checkOpen();

        return false;
    }

    @Override
    public void addBatch(String sql) throws SQLException {
        checkOpen();
    }

    @Override
    public void clearBatch() throws SQLException {
        checkOpen();
    }

    @Override
    public ResultSet getGeneratedKeys() throws SQLException {
        checkOpen();
        return this.generatedKeys;
    }

    public void setGeneratedKeys(ResultSet generatedKeys) {
        this.generatedKeys = generatedKeys;
    }

    @Override
    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
        checkOpen();
        return 0;
    }

    @Override
    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
        checkOpen();
        return 0;
    }

    @Override
    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
        checkOpen();
        return 0;
    }

    @Override
    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
        checkOpen();
        return false;
    }

    @Override
    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
        checkOpen();
        return false;
    }

    @Override
    public boolean execute(String sql, String[] columnNames) throws SQLException {
        checkOpen();
        return false;
    }

    @Override
    public ResultSet getResultSet() throws SQLException {
        return resultSet;
    }

    @Override
    public int[] executeBatch() throws SQLException {
        checkOpen();

        return new int[0];
    }

    @Override
    public boolean getMoreResults(int current) throws SQLException {
        checkOpen();
        return false;
    }

    public void setWarnings(SQLWarning warnings) {
        this.warnings = warnings;
    }

    public void setResultSet(ResultSet resultSet) {
        this.resultSet = resultSet;
    }

    @Override
    public boolean execute(String sql) throws SQLException {
        checkOpen();

        return false;
    }

    @Override
    public ResultSet executeQuery(String sql) throws SQLException {
        return null;
    }

    @Override
    public int executeUpdate(String sql) throws SQLException {
        return 0;
    }

    @Override
    public void cancel() throws SQLException {
        checkOpen();
    }
=======
>>>>>>> c9204dc18af0988b10ee8ca582a0111bdfda5662
}
Solution content 
    @Override


    public void setWarning(SQLWarning warning) {
        this.warnings = warning;
    }

    @Override
    public int getUpdateCount() throws SQLException {
        checkOpen();

        return updateCount;
    }

    }
    public void setUpdateCount(int updateCount) {
        this.updateCount = updateCount;
    }

    public void close() throws SQLException {
        this.closed = true;
    }

    @SuppressWarnings("unchecked")
    @Override
    public  T unwrap(Class iface) throws SQLException {
        if (iface == null) {
            return null;
        }

        if (iface.isInstance(this)) {
            return (T) this;
        }

        return null;
    }

    @Override
    public boolean isWrapperFor(Class iface) throws SQLException {
        if (iface == null) {
            return false;
        }

        if (iface.isInstance(this)) {
            return true;
        }

        return false;
    }

    public boolean isPoolable() throws SQLException {
        checkOpen();
        return poolable;
    }

    public void setPoolable(boolean poolable) throws SQLException {
        checkOpen();
        this.poolable = poolable;
    }

    public void closeOnCompletion() throws SQLException {
        throw new SQLFeatureNotSupportedException();
    }

    public boolean isCloseOnCompletion() throws SQLException {
        throw new SQLFeatureNotSupportedException();
    }

    @Override
    public boolean isClosed() throws SQLException {
        return closed;
    }

    @Override
    public boolean getMoreResults() throws SQLException {
        checkOpen();

        return false;
    }

    @Override
    public void addBatch(String sql) throws SQLException {
        checkOpen();
    }

    @Override
    public void clearBatch() throws SQLException {
        checkOpen();
    }

    @Override
    public ResultSet getGeneratedKeys() throws SQLException {
        checkOpen();
        return this.generatedKeys;
    }

    public void setGeneratedKeys(ResultSet generatedKeys) {
        this.generatedKeys = generatedKeys;
    }

    @Override
    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
        checkOpen();
        return 0;
    }

    @Override
    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
        checkOpen();
        return 0;
    }

    @Override
    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
        checkOpen();
        return 0;
    }

    @Override
    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
        checkOpen();
        return false;
    }

    @Override
    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
        checkOpen();
        return false;
    }

    @Override
    public boolean execute(String sql, String[] columnNames) throws SQLException {
        checkOpen();
        return false;
    @Override
    public ResultSet getResultSet() throws SQLException {
        checkOpen();

        return resultSet;
    }

    @Override
    public int[] executeBatch() throws SQLException {
        checkOpen();

        return new int[0];
    }
    @Override
    public boolean getMoreResults(int current) throws SQLException {
        checkOpen();
        return false;
    }

    public void setWarnings(SQLWarning warnings) {
        this.warnings = warnings;
    }

    public void setResultSet(ResultSet resultSet) {
        this.resultSet = resultSet;
    }

    @Override
    public boolean execute(String sql) throws SQLException {
        checkOpen();

        return false;
    }

    @Override
    public ResultSet executeQuery(String sql) throws SQLException {
        return null;
    }

    @Override
    public int executeUpdate(String sql) throws SQLException {
        return 0;
    }

    @Override
    public void cancel() throws SQLException {
        checkOpen();
    }
}
File
StatementBase.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
<<<<<<< HEAD
=======
import java.sql.SQLFeatureNotSupportedException;
>>>>>>> c9204dc18af0988b10ee8ca582a0111bdfda5662
import java.sql.Statement;

import com.alibaba.druid.common.jdbc.StatementBase;
Solution content 
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;
File
MockStatement.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
    public final static String ERROR_SQL = "THROW ERROR";

    protected MockConnection   mockConnection;
<<<<<<< HEAD
=======

    private int                updateCount;
>>>>>>> c9204dc18af0988b10ee8ca582a0111bdfda5662

    public MockStatement(Connection connection){
        super(connection);
Solution content 
    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);
File
MockStatement.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
    @Override
    }

<<<<<<< HEAD
=======
    public void close() throws SQLException {
        this.closed = true;
    }

    @Override
    public void cancel() throws SQLException {
        checkOpen();
    }

    @Override
>>>>>>> c9204dc18af0988b10ee8ca582a0111bdfda5662
    public boolean execute(String sql) throws SQLException {
        checkOpen();
Solution content 
    }

    @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();
File
MockStatement.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration