Revision 44139 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/symboltable/SQLSymbolTable.java

View differences:

SQLSymbolTable.java
34 34
import org.gvsig.expressionevaluator.impl.function.numeric.TanFunction;
35 35
import org.gvsig.expressionevaluator.impl.function.numeric.TanhFunction;
36 36
import org.gvsig.expressionevaluator.impl.function.numeric.ZeroFunction;
37
import org.gvsig.expressionevaluator.impl.function.obj.IFNULLFunction;
38
import org.gvsig.expressionevaluator.impl.function.obj.IIFFunction;
37
import org.gvsig.expressionevaluator.impl.function.programming.IFNULLFunction;
38
import org.gvsig.expressionevaluator.impl.function.programming.IIFFunction;
39 39
import org.gvsig.expressionevaluator.impl.function.operator.AddOperator;
40 40
import org.gvsig.expressionevaluator.impl.function.operator.AndOperator;
41
import org.gvsig.expressionevaluator.impl.function.operator.ConcatOperator;
41 42
import org.gvsig.expressionevaluator.impl.function.operator.DivOperator;
42 43
import org.gvsig.expressionevaluator.impl.function.operator.EqOperator;
43 44
import org.gvsig.expressionevaluator.impl.function.operator.GeOperator;
......
59 60
import org.gvsig.expressionevaluator.impl.function.string.CharFunction;
60 61
import org.gvsig.expressionevaluator.impl.function.string.ConcatFunction;
61 62
import org.gvsig.expressionevaluator.impl.function.string.DecodeFunction;
63
import org.gvsig.expressionevaluator.impl.function.string.FormatFunction;
62 64
import org.gvsig.expressionevaluator.impl.function.string.InstrFunction;
63 65
import org.gvsig.expressionevaluator.impl.function.string.LTrimFunction;
64 66
import org.gvsig.expressionevaluator.impl.function.string.LeftFunction;
......
66 68
import org.gvsig.expressionevaluator.impl.function.string.LocateFunction;
67 69
import org.gvsig.expressionevaluator.impl.function.string.LowerFunction;
68 70
import org.gvsig.expressionevaluator.impl.function.string.LpadFunction;
71
import org.gvsig.expressionevaluator.impl.function.string.MidFunction;
69 72
import org.gvsig.expressionevaluator.impl.function.string.PositionFunction;
70 73
import org.gvsig.expressionevaluator.impl.function.string.RTrimFunction;
71 74
import org.gvsig.expressionevaluator.impl.function.string.RepeatFunction;
......
76 79
import org.gvsig.expressionevaluator.impl.function.string.SubstringFunction;
77 80
import org.gvsig.expressionevaluator.impl.function.string.TrimFunction;
78 81
import org.gvsig.expressionevaluator.impl.function.string.UpperFunction;
82
import org.gvsig.expressionevaluator.impl.function.typeconversion.CastFunction;
83
import org.gvsig.expressionevaluator.impl.function.typeconversion.DoubleFunction;
84
import org.gvsig.expressionevaluator.impl.function.typeconversion.FloatFunction;
85
import org.gvsig.expressionevaluator.impl.function.typeconversion.IntFunction;
86
import org.gvsig.expressionevaluator.impl.function.typeconversion.LongFunction;
87
import org.gvsig.expressionevaluator.impl.function.typeconversion.StrFunction;
79 88
import org.gvsig.expressionevaluator.spi.AbstractSymbolTable;
80 89

  
81 90
/**
......
106 115
        this.addOperator(new NotOperator());
107 116
        this.addOperator(new OrOperator());
108 117
        this.addOperator(new SubstOperator());
118
        this.addOperator(new ConcatOperator());
109 119
        
110 120
        this.addOperator(new IlikeOperator());
111 121
        this.addOperator(new LikeOperator());
......
162 172
        this.addFunction(new SubstringFunction());
163 173
        this.addFunction(new TrimFunction());
164 174
        this.addFunction(new UpperFunction());
175
        this.addFunction(new MidFunction());
165 176
        
166 177
        this.addFunction(new NowFunction());
167 178
        this.addFunction(new DateFunction());
......
172 183

  
173 184
        this.addFunction(new IIFFunction());
174 185
        this.addFunction(new IFNULLFunction());
186
        this.addFunction(new FormatFunction());
175 187

  
188
        this.addFunction(new CastFunction());
189
        this.addFunction(new StrFunction());
190
        this.addFunction(new DoubleFunction());
191
        this.addFunction(new FloatFunction());
192
        this.addFunction(new IntFunction());
193
        this.addFunction(new LongFunction());
194
        
195
        
176 196
    }
177 197

  
178 198
    private void addOperator(Function operator) {

Also available in: Unified diff