QueryExpression.java (hsqldb-2.6.0) | : | QueryExpression.java (hsqldb-2.6.1) | ||
---|---|---|---|---|
skipping to change at line 58 | skipping to change at line 58 | |||
import org.hsqldb.persist.PersistentStore; | import org.hsqldb.persist.PersistentStore; | |||
import org.hsqldb.result.Result; | import org.hsqldb.result.Result; | |||
import org.hsqldb.result.ResultMetaData; | import org.hsqldb.result.ResultMetaData; | |||
import org.hsqldb.types.Type; | import org.hsqldb.types.Type; | |||
import org.hsqldb.types.Types; | import org.hsqldb.types.Types; | |||
/** | /** | |||
* Implementation of an SQL query expression | * Implementation of an SQL query expression | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.6.0 | * @version 2.6.1 | |||
* @since 1.9.0 | * @since 1.9.0 | |||
*/ | */ | |||
public class QueryExpression implements RangeGroup { | public class QueryExpression implements RangeGroup { | |||
public static final int NOUNION = 0, | public static final int NOUNION = 0, | |||
UNION = 1, | UNION = 1, | |||
UNION_ALL = 2, | UNION_ALL = 2, | |||
INTERSECT = 3, | INTERSECT = 3, | |||
INTERSECT_ALL = 4, | INTERSECT_ALL = 4, | |||
EXCEPT_ALL = 5, | EXCEPT_ALL = 5, | |||
EXCEPT = 6, | EXCEPT = 6, | |||
UNION_TERM = 7; | UNION_TERM = 7; | |||
// | // | |||
int columnCount; | int columnCount; | |||
QueryExpression leftQueryExpression; | QueryExpression leftQueryExpression; | |||
QueryExpression rightQueryExpression; | QueryExpression rightQueryExpression; | |||
SortAndSlice sortAndSlice; | public SortAndSlice sortAndSlice; | |||
private int unionType; | private int unionType; | |||
private boolean unionCorresponding; | private boolean unionCorresponding; | |||
private OrderedHashSet unionCorrespondingColumns; | private OrderedHashSet unionCorrespondingColumns; | |||
int[] unionColumnMap; | int[] unionColumnMap; | |||
Type[] unionColumnTypes; | Type[] unionColumnTypes; | |||
boolean isFullOrder; | boolean isFullOrder; | |||
// | // | |||
List unresolvedExpressions; | List unresolvedExpressions; | |||
skipping to change at line 114 | skipping to change at line 114 | |||
boolean isUpdatable; | boolean isUpdatable; | |||
boolean isInsertable; | boolean isInsertable; | |||
boolean isCheckable; | boolean isCheckable; | |||
boolean isTopLevel; | boolean isTopLevel; | |||
boolean isRecursive; | boolean isRecursive; | |||
boolean isSingleRow; | boolean isSingleRow; | |||
boolean acceptsSequences; | boolean acceptsSequences; | |||
boolean isCorrelated; | boolean isCorrelated; | |||
boolean isTable; | boolean isTable; | |||
boolean isValueList; | boolean isValueList; | |||
boolean lowerCaseResultIdentifier; | ||||
public TableBase resultTable; | public TableBase resultTable; | |||
public Index mainIndex; | public Index mainIndex; | |||
public Index fullIndex; | public Index fullIndex; | |||
public Index orderIndex; | public Index orderIndex; | |||
public Index idIndex; | public Index idIndex; | |||
// | // | |||
TableDerived recursiveWorkTable; | TableDerived recursiveWorkTable; | |||
TableDerived recursiveResultTable; | TableDerived recursiveResultTable; | |||
RecursiveQuerySettings recursiveSettings; | RecursiveQuerySettings recursiveSettings; | |||
skipping to change at line 1195 | skipping to change at line 1196 | |||
int resultRangePosition) { | int resultRangePosition) { | |||
leftQueryExpression.replaceExpressions(expressions, | leftQueryExpression.replaceExpressions(expressions, | |||
resultRangePosition); | resultRangePosition); | |||
rightQueryExpression.replaceExpressions(expressions, | rightQueryExpression.replaceExpressions(expressions, | |||
resultRangePosition); | resultRangePosition); | |||
} | } | |||
public void setAsExists() {} | public void setAsExists() {} | |||
public void setLowerCaseResultIdentifer() { | ||||
lowerCaseResultIdentifier = true; | ||||
} | ||||
static class RecursiveQuerySettings { | static class RecursiveQuerySettings { | |||
static final int none = 0; | static final int none = 0; | |||
static final int depthFirst = 1; | static final int depthFirst = 1; | |||
static final int breadthFirst = 2; | static final int breadthFirst = 2; | |||
static final int findCycle = 1; | static final int findCycle = 1; | |||
int searchOrderType; | int searchOrderType; | |||
SortAndSlice searchOrderSort; | SortAndSlice searchOrderSort; | |||
ColumnSchema searchOrderSetColumn; | ColumnSchema searchOrderSetColumn; | |||
int cycle; | int cycle; | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added |