Projects information

Chunk

Conflicting content
map.put("WAIT", Token.WAIT); map.put("NOWAIT", Token.NOWAIT); map.put("SESSION", Token.SESSION); <<<<<<< HEAD map.put("AT", Token.AT); map.put("LOCAL", Token.LOCAL); map.put("TIME", Token.TIME); map.put("ZONE", Token.ZONE); ======= >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 DEFAULT_ORACLE_KEYWORDS = new Keywords(map); }

Conflicting content

        map.put("WAIT", Token.WAIT);
        map.put("NOWAIT", Token.NOWAIT);
        map.put("SESSION", Token.SESSION);
<<<<<<< HEAD
        map.put("AT", Token.AT);
        map.put("LOCAL", Token.LOCAL);
        map.put("TIME", Token.TIME);
        map.put("ZONE", Token.ZONE);
=======
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6

        DEFAULT_ORACLE_KEYWORDS = new Keywords(map);
    }

Solution content
map.put("WAIT", Token.WAIT); map.put("NOWAIT", Token.NOWAIT); map.put("SESSION", Token.SESSION); map.put("AT", Token.AT); map.put("LOCAL", Token.LOCAL); map.put("TIME", Token.TIME); map.put("ZONE", Token.ZONE); DEFAULT_ORACLE_KEYWORDS = new Keywords(map); }

Solution content

        map.put("WAIT", Token.WAIT);
        map.put("NOWAIT", Token.NOWAIT);
        map.put("SESSION", Token.SESSION);
        map.put("AT", Token.AT);
        map.put("LOCAL", Token.LOCAL);
        map.put("TIME", Token.TIME);
        map.put("ZONE", Token.ZONE);

        DEFAULT_ORACLE_KEYWORDS = new Keywords(map);
    }

File
OracleLexer.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
} queryBlock.setGroupBy(groupBy); <<<<<<< HEAD } } protected String as() throws ParserException { if (lexer.token() == Token.CONNECT) { return null; ======= >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 } return super.as();

Conflicting content

            }
            
            queryBlock.setGroupBy(groupBy);
<<<<<<< HEAD
        }
    }
    
    protected String as() throws ParserException {
        if (lexer.token() == Token.CONNECT) {
            return null;
=======
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
        }
        
        return super.as();

Solution content
} queryBlock.setGroupBy(groupBy); } } protected String as() throws ParserException { if (lexer.token() == Token.CONNECT) { return null; } return super.as();

File
OracleSelectParser.java

Developer's decision
Version 1

Kind of conflict
If statement
Method signature
Return statement

Chunk

Conflicting content
@Override @Override public void endVisit(OracleMethodInvokeStatement x) { <<<<<<< HEAD } @Override public boolean visit(OracleDatetimeExpr x) { return true; } public void endVisit(OracleDatetimeExpr x) { ======= >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 } }

Conflicting content

    @Override
    @Override
    public void endVisit(OracleMethodInvokeStatement x) {

<<<<<<< HEAD
    }

    @Override
    public boolean visit(OracleDatetimeExpr x) {
        return true;
    }

    public void endVisit(OracleDatetimeExpr x) {
        
=======
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
    }

}

Solution content
@Override public void endVisit(OracleMethodInvokeStatement x) { } @Override public boolean visit(OracleDatetimeExpr x) { return true; } @Override public void endVisit(OracleDatetimeExpr x) { } }

File
OracleASTVIsitorAdapter.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration
Method signature

Chunk

Conflicting content
boolean visit(OracleMethodInvokeStatement x); void endVisit(OracleMethodInvokeStatement x); <<<<<<< HEAD boolean visit(OracleDatetimeExpr x); void endVisit(OracleDatetimeExpr x); ======= >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 }

Conflicting content

    boolean visit(OracleMethodInvokeStatement x);
    
    void endVisit(OracleMethodInvokeStatement x);
<<<<<<< HEAD
    
    boolean visit(OracleDatetimeExpr x);
    
    void endVisit(OracleDatetimeExpr x);
=======
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
}

Solution content
boolean visit(OracleMethodInvokeStatement x); void endVisit(OracleMethodInvokeStatement x); boolean visit(OracleDatetimeExpr x); void endVisit(OracleDatetimeExpr x); }

File
OracleASTVisitor.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content
public void endVisit(OracleMethodInvokeStatement x) { } <<<<<<< HEAD @Override public boolean visit(OracleDatetimeExpr x) { x.getExpr().accept(this); SQLExpr timeZone = x.getTimeZone(); if (timeZone instanceof SQLIdentifierExpr) { if (((SQLIdentifierExpr) timeZone).getName().equalsIgnoreCase("LOCAL")) { print(" AT LOCAL"); return false; } } print(" AT TIME ZONE "); timeZone.accept(this); return false; } @Override public void endVisit(OracleDatetimeExpr x) { } ======= >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 }

Conflicting content

    public void endVisit(OracleMethodInvokeStatement x) {
        
    }
<<<<<<< HEAD

    @Override
    public boolean visit(OracleDatetimeExpr x) {
        x.getExpr().accept(this);
        SQLExpr timeZone = x.getTimeZone();
        
        if (timeZone instanceof SQLIdentifierExpr) {
            if (((SQLIdentifierExpr) timeZone).getName().equalsIgnoreCase("LOCAL")) {
                print(" AT LOCAL");
                return false;
            }
        }
        
        print(" AT TIME ZONE ");
        timeZone.accept(this);
        
        return false;
    }

    @Override
    public void endVisit(OracleDatetimeExpr x) {
        
    }
=======
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
}

Solution content
public void endVisit(OracleMethodInvokeStatement x) { } @Override public boolean visit(OracleDatetimeExpr x) { x.getExpr().accept(this); SQLExpr timeZone = x.getTimeZone(); if (timeZone instanceof SQLIdentifierExpr) { if (((SQLIdentifierExpr) timeZone).getName().equalsIgnoreCase("LOCAL")) { print(" AT LOCAL"); return false; } } print(" AT TIME ZONE "); timeZone.accept(this); return false; } @Override public void endVisit(OracleDatetimeExpr x) { } }

Solution content

    public void endVisit(OracleMethodInvokeStatement x) {
        
    }

    @Override
    public boolean visit(OracleDatetimeExpr x) {
        x.getExpr().accept(this);
        SQLExpr timeZone = x.getTimeZone();
        
        if (timeZone instanceof SQLIdentifierExpr) {
            if (((SQLIdentifierExpr) timeZone).getName().equalsIgnoreCase("LOCAL")) {
                print(" AT LOCAL");
                return false;
            }
        }
        
        print(" AT TIME ZONE ");
        timeZone.accept(this);
        
        return false;
    }

    @Override
    public void endVisit(OracleDatetimeExpr x) {
        
    }
}

File
OracleOutputVisitor.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content
@Override public void endVisit(OracleLockTableStatement x) { <<<<<<< HEAD } @Override public boolean visit(OracleDatetimeExpr x) { return true; } @Override ======= public void endVisit(OracleDatetimeExpr x) { >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 } }

Conflicting content

        
    @Override
    public void endVisit(OracleLockTableStatement x) {

<<<<<<< HEAD
    }

    @Override
    public boolean visit(OracleDatetimeExpr x) {
        return true;
    }

    @Override
=======
    public void endVisit(OracleDatetimeExpr x) {
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
    }
}

Solution content
@Override public void endVisit(OracleLockTableStatement x) { } @Override public boolean visit(OracleDatetimeExpr x) { return true; } @Override public void endVisit(OracleDatetimeExpr x) { } }

File
OracleSchemaStatVisitor.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration
Method signature

Chunk

Conflicting content
return alias; } <<<<<<< HEAD if (lexer.token() == Token.YEAR \|\| lexer.token() == Token.DAY \|\| lexer.token() == Token.KEY \|\| lexer.token() == Token.CASE) { ======= if (lexer.token() == Token.YEAR \|\| lexer.token() == Token.DAY \|\| lexer.token() == Token.KEY) { >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 alias = lexer.token.name(); lexer.nextToken(); return alias;

Conflicting content

                return alias;
            }

<<<<<<< HEAD
            if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY || lexer.token() == Token.KEY || lexer.token() == Token.CASE) {
=======
            if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY || lexer.token() == Token.KEY) {
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
                alias = lexer.token.name();
                lexer.nextToken();
                return alias;

Solution content
return alias; } if (lexer.token() == Token.YEAR \|\| lexer.token() == Token.DAY \|\| lexer.token() == Token.KEY \|\| lexer.token() == Token.CASE) { alias = lexer.token.name(); lexer.nextToken(); return alias;

Solution content

                return alias;
            }

            if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY || lexer.token() == Token.KEY || lexer.token() == Token.CASE) {
                alias = lexer.token.name();
                lexer.nextToken();
                return alias;

File
SQLParser.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content
WAIT("WAIT"), ADVISE("ADVISE"), SESSION("SESSION"), <<<<<<< HEAD AT("AT"), LOCAL("LOCAL"), TIME("TIME"), ZONE("ZONE"), ======= >>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6 // transact-sql TOP("TOP"),

Conflicting content

    WAIT("WAIT"),
    ADVISE("ADVISE"),
    SESSION("SESSION"),
<<<<<<< HEAD
    AT("AT"),
    LOCAL("LOCAL"),
    TIME("TIME"),
    ZONE("ZONE"),
=======
>>>>>>> 3e7026f63ab32e09b7613c70b89b438bd3cf47c6
    
    // transact-sql
    TOP("TOP"),

Solution content
WAIT("WAIT"), ADVISE("ADVISE"), SESSION("SESSION"), AT("AT"), LOCAL("LOCAL"), TIME("TIME"), ZONE("ZONE"), // transact-sql TOP("TOP"),

File
Token.java

Developer's decision
Version 1

Kind of conflict
Enum value

Projects >> druid >>50ff42ab6817cc867173d3cfb8bbadaad7f43349