| Chunk |
|---|
| Conflicting content |
|---|
stmt.setName(this.exprParser.name());
<<<<<<< HEAD
=======
return stmt;
}
MySqlShowCreateProcedureStatement stmt = new MySqlShowCreateProcedureStatement();
if (lexer.token() == Token.TABLE) {
lexer.nextToken();
MySqlShowCreateTableStatement stmt = new MySqlShowCreateTableStatement();
stmt.setName(this.exprParser.name());
>>>>>>> 3c676a7d70eed39d05df0bc15afeccb937ce8d1a
return stmt;
}
|
| Solution content |
|---|
MySqlShowCreateProcedureStatement stmt = new MySqlShowCreateProcedureStatement();
stmt.setName(this.exprParser.name());
return stmt;
}
if (lexer.token() == Token.TABLE) {
lexer.nextToken();
MySqlShowCreateTableStatement stmt = new MySqlShowCreateTableStatement();
stmt.setName(this.exprParser.name());
return stmt;
}
if (lexer.token() == Token.VIEW) {
lexer.nextToken();
MySqlShowCreateViewStatement stmt = new MySqlShowCreateViewStatement();
stmt.setName(this.exprParser.name());
return stmt;
}
if (identifierEquals("TRIGGER")) {
lexer.nextToken();
MySqlShowCreateTriggerStatement stmt = new MySqlShowCreateTriggerStatement();
stmt.setName(this.exprParser.name());
return stmt;
}
|
| File |
|---|
| MySqlStatementParser.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Return statement |
| Variable |