ExpressionColumn.java (hsqldb-2.7.0) | : | ExpressionColumn.java (hsqldb-2.7.1) | ||
---|---|---|---|---|
skipping to change at line 52 | skipping to change at line 52 | |||
import org.hsqldb.lib.Set; | import org.hsqldb.lib.Set; | |||
import org.hsqldb.map.ValuePool; | import org.hsqldb.map.ValuePool; | |||
import org.hsqldb.navigator.RangeIterator; | import org.hsqldb.navigator.RangeIterator; | |||
import org.hsqldb.persist.PersistentStore; | import org.hsqldb.persist.PersistentStore; | |||
import org.hsqldb.types.Type; | import org.hsqldb.types.Type; | |||
/** | /** | |||
* Implementation of column, variable, parameter, etc. access operations. | * Implementation of column, variable, parameter, etc. access operations. | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.6.1 | * @version 2.7.1 | |||
* @since 1.9.0 | * @since 1.9.0 | |||
*/ | */ | |||
public class ExpressionColumn extends Expression { | public class ExpressionColumn extends Expression { | |||
public static final ExpressionColumn[] emptyArray = | public static final ExpressionColumn[] emptyArray = | |||
new ExpressionColumn[]{}; | new ExpressionColumn[]{}; | |||
static final SimpleName rownumName = | static final SimpleName rownumName = | |||
HsqlNameManager.getSimpleName("ROWNUM", false); | HsqlNameManager.getSimpleName("ROWNUM", false); | |||
// | // | |||
skipping to change at line 701 | skipping to change at line 701 | |||
nullability = SchemaObject.Nullability.NO_NULLS; | nullability = SchemaObject.Nullability.NO_NULLS; | |||
for (int i = 0; i < nodes.length; i++) { | for (int i = 0; i < nodes.length; i++) { | |||
type = Type.getAggregateType(nodes[i].dataType, type); | type = Type.getAggregateType(nodes[i].dataType, type); | |||
} | } | |||
dataType = type; | dataType = type; | |||
break; | break; | |||
} | } | |||
case OpTypes.COLUMN : { | ||||
if (dataType == null) { | ||||
dataType = column.getDataType(); | ||||
} | ||||
} | ||||
} | } | |||
} | } | |||
public Object getValue(Session session) { | public Object getValue(Session session) { | |||
switch (opType) { | switch (opType) { | |||
case OpTypes.GROUPING : | case OpTypes.GROUPING : | |||
if (session.sessionContext.groupSet == null) { | if (session.sessionContext.groupSet == null) { | |||
return 0; | return 0; | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 6 lines changed or added |