Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/rxm.git
source/java/com/whitemagicsoftware/rxm/tree/xml/WhereClause.java
QueryParser.TableColumnContext tableColumn = ctx.tableColumn();
QueryParser.ExprSetContext set = ctx.exprSet();
- QueryParser.ExprValueContext value = ctx.exprValue();
// If the terminal node is null, then the equality is T_INEQ.
- TerminalNode equal = ctx.getToken( QueryParser.T_EQ, 0 );
+ TerminalNode equals = ctx.getToken( QueryParser.T_EQ, 0 );
String entity = tableColumn.getText();
+ String equalTo = (equals == null) ? "NOT " : "";
if( set == null ) {
- // Presume = or <> by default (could change to IS or IS NOT).
+ // Presume = or <> by default (changes to IS or IS NOT as needed).
String comparator = ctx.getChild(1).getText();
-
- QueryParser.LiteralContext literal = value.literal();
+ QueryParser.LiteralContext literal = ctx.exprValue().literal();
if( literal == null ) {
if( literal.T_NULL() != null ) {
rhs = "NULL";
- comparator = " IS " + (equal == null ? "NOT " : "");
+ comparator = " IS " + equalTo;
}
append( String.format( "%s%s%s", entity, comparator, rhs ) );
}
}
else {
// Transform to ANSI SQL set notation.
append( String.format( "%s %sIN (%s)",
entity,
- equal == null ? "NOT " : "",
+ equalTo,
set.exprList().getText() ) );
}

Reorganized variables. Eliminated duplicate code.

Author Dave Jarvis <email>
Date 2015-03-22 00:32:26 GMT-0700
Commit e12553635e022199ccd5e212270c0d49ca142999
Parent 9489855
Delta 6 lines added, 7 lines removed, 1-line decrease