Revision 46106

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/test/java/org/gvsig/fmap/dal/store/jdbc2/AbstractTestComputedAttributes.java
190 190
            features0 = null;
191 191
            String[] header = new String[]{"ID", "Comunidad", "Provincia", "Ciudad", "Poblacion", "Densidad", "Fecha", "CompuID", "CompuPob", "CompuProv", "ExtraID900", "ExtraPobDen", "ExtraAno"};
192 192
            ArrayList<Object[]> values = new ArrayList<>();
193
            values.add(new Object[]{0, null, null, null, null, null, null, 0, null, "", 900, null, null});
194 193
            values.add(new Object[]{5, "GVA", null, null, 200, null, null, 5, 201, "ALICANTE", 905, 206, 2019});
195 194
            values.add(new Object[]{6, "GVA", null, null, 20, null, null, 6, 422, "ALICANTE", 1813, 1135, 2020});
196 195
            values.add(new Object[]{8, "GVA", null, null, 100, null, null, 8, 702, "CASTELLON", 1817, 719, 2019});
197 196
            values.add(new Object[]{1, "GVA", null, null, 500, null, null, 1, 1502, "VALENCIA", 1803, 1505, 2019});
198 197
            values.add(new Object[]{3, "GVA", null, null, 50, null, null, 3, 352, "VALENCIA", 1807, 359, 2020});
198
            values.add(new Object[]{0, null, null, null, null, null, null, 0, null, "", 900, null, null});
199 199
            for (int i = 0; i < features.size(); i++) {
200 200
                for (int j = 0; j < header.length; j++) {
201 201
                    assertEquals("feature[" + i + "][" + header[j] + "]:", values.get(i)[j], features.get(i).get(header[j]));
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/test/java/org/gvsig/fmap/dal/store/jdbc2/AbstractTestUtils.java
16 16
import org.apache.commons.lang3.math.NumberUtils;
17 17
import org.gvsig.fmap.dal.DALLocator;
18 18
import org.gvsig.fmap.dal.DataManager;
19
import org.gvsig.fmap.dal.DataServerExplorerParameters;
20 19
import org.gvsig.fmap.dal.DataStore;
21 20
import static org.gvsig.fmap.dal.DataStore.H2SPATIAL_PROVIDER_NAME;
22
import org.gvsig.fmap.dal.DataStoreParameters;
23 21
import org.gvsig.fmap.dal.DatabaseWorkspaceManager;
24
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.FIELD_RESOURCES_NAME;
25
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.TABLE_RESOURCES_NAME;
26 22
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
27 23
import org.gvsig.fmap.dal.feature.EditableFeature;
28 24
import org.gvsig.fmap.dal.feature.EditableFeatureType;
......
35 31
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
36 32
import org.gvsig.tools.resourcesstorage.ResourcesStorage;
37 33
import org.gvsig.tools.util.HasAFile;
38
import org.hibernate.dialect.H2Dialect;
39 34
import org.slf4j.Logger;
40 35
import org.slf4j.LoggerFactory;
41 36

  
......
137 132
        public boolean stripStart = false;
138 133
        public boolean removeNL = false;
139 134

  
135
        public String startLineComment = "-- ";
136
        
140 137
        private static class CommandLine {
141 138

  
142 139
            private final String[] cmd;
......
170 167
        public void parse(File f) throws Exception {
171 168
            final int SEARCHING_ITEM = 0;
172 169
            final int READING_ITEM = 1;
173
            final String startLineComment = "-- ";
174 170
            boolean localNormaliceSpaces = false;
175 171
            boolean localStripStart = false;
176 172
            boolean localRemoveNL = false;
......
289 285
    public void removeResource(JDBCServerExplorer explorer, String storeName, String resourceName) throws Exception {
290 286
        JDBCStoreParameters storeParams = explorer.get(storeName);
291 287
        ResourcesStorage resourcesStorage = explorer.getResourcesStorage(storeParams);
292
        resourcesStorage.remove(resourceName);
288
        if( resourcesStorage.allowRemove() ) {
289
            resourcesStorage.remove(resourceName);
290
        }
293 291
    }
294 292

  
295 293
    public void info_h2sql(String label, File file) {
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.spi/src/main/java/org/gvsig/fmap/dal/feature/spi/SQLBuilderBase.java
982 982
                return this.custom;
983 983
            }
984 984
            if (this.ascending) {
985
                return this.value.toString(formatter) + " ASC";
985
                return this.value.toString(formatter) + " ASC NULLS LAST";
986 986
            }
987
            return this.value.toString(formatter) + " DESC";
987
            return this.value.toString(formatter) + " DESC NULLS FIRST";
988 988
        }
989 989
    }
990 990

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/test/resources/org/gvsig/fmap/dal/store/h2/resultSetForSetProvider.sql
6 6
    "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
7 7
    "Bool2", "String", "Bool3", "Double", "Bool4", "Float", "Bool5", "Decimal", 
8 8
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL) 
9
  FROM "PUBLIC"."test" ORDER BY "ID" ASC;
9
  FROM "PUBLIC"."test" ORDER BY "ID" ASC NULLS LAST;
10 10

  
11 11
-- Simple Group by
12 12
SELECT 
......
16 16
    NULL AS "Bool4", NULL AS "Float", NULL AS "Bool5", NULL AS "Decimal", 
17 17
    NULL AS "Geometry" 
18 18
  FROM "PUBLIC"."test" 
19
  GROUP BY "test"."Long" ORDER BY "test"."Long" ASC, "ID" ASC;
19
  GROUP BY "test"."Long" ORDER BY "test"."Long" ASC NULLS LAST, "ID" ASC NULLS LAST;
20 20

  
21 21
-- Subselect
22 22
SELECT 
......
34 34
    SELECT "ISO_A2" 
35 35
    FROM "countries" 
36 36
    WHERE (("TEST"."STRING" = "countries"."CONTINENT") AND 
37
      ("countries"."LASTCENSUS" < 0)) LIMIT 1)),TRUE,FALSE) ORDER BY "ID" ASC;
37
      ("countries"."LASTCENSUS" < 0)) LIMIT 1)),TRUE,FALSE) ORDER BY "ID" ASC NULLS LAST;
38 38

  
39 39
-- Group and Subselect
40 40
SELECT 
......
49 49
    FROM "countries" 
50 50
    WHERE (("TEST"."STRING" = "countries"."CONTINENT") AND 
51 51
      ("countries"."LASTCENSUS" < 0)) LIMIT 1)),TRUE,FALSE) 
52
  GROUP BY "test"."Long" ORDER BY "test"."Long" ASC, "ID" ASC;
52
  GROUP BY "test"."Long" ORDER BY "test"."Long" ASC NULLS LAST, "ID" ASC NULLS LAST;
53 53

  
54 54
-- Simple
55 55
SELECT 
56 56
    "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
57 57
    "Bool2", "String", "Bool3", "Double", "Bool4", "Float", "Bool5", "Decimal", 
58 58
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL), "ID" 
59
  FROM "PUBLIC"."test" ORDER BY "ID" ASC;
59
  FROM "PUBLIC"."test" ORDER BY "ID" ASC NULLS LAST;
60 60

  
61 61
-- Computed Attribute
62 62
SELECT "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
63 63
    "Bool2", "String", "Bool3", "Double", "Bool4", "Float", "Bool5", "Decimal", 
64 64
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL), 
65 65
    ("ID" * 2) AS "Compu1" 
66
FROM "PUBLIC"."test" ORDER BY "ID" ASC;
66
FROM "PUBLIC"."test" ORDER BY "ID" ASC NULLS LAST;
67 67

  
68 68
-- Computed Attribute 2
69 69
SELECT "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
......
71 71
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL), 
72 72
    ("ID" * 2) AS "Compu1", 
73 73
    (("Long" + 10) + ("ID" * 2)) AS "Compu2" 
74
FROM "PUBLIC"."test" ORDER BY "ID" ASC;
74
FROM "PUBLIC"."test" ORDER BY "ID" ASC NULLS LAST;
75 75

  
76 76
-- Computed Extra column 1
77 77
SELECT "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
......
79 79
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL), 
80 80
    ("ID" * 2) AS "Compu1", 
81 81
    (("Long" + 10) + ("ID" * 2)) AS "Extra1" 
82
FROM "PUBLIC"."test" ORDER BY "ID" ASC;
82
FROM "PUBLIC"."test" ORDER BY "ID" ASC NULLS LAST;
83 83

  
84 84
-- Computed Extra column 2
85 85
SELECT "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
......
87 87
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL), 
88 88
    ("ID" * 2) AS "Extra1", 
89 89
    (("Long" + 10) + ("ID" * 2)) AS "Extra2" 
90
FROM "PUBLIC"."test" ORDER BY "ID" ASC;
90
FROM "PUBLIC"."test" ORDER BY "ID" ASC NULLS LAST;
91 91

  
92 92
-- Computed Extra column with where
93 93
SELECT "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
......
95 95
    NVL2("Geometry",ST_AsBinary("Geometry"),NULL), 
96 96
    ("ID" * 2) AS "Compu1", 
97 97
    (("Long" + 10) + ("ID" * 2)) AS "Extra1" 
98
FROM "PUBLIC"."test" WHERE ((("Long" + 10) + (("ID" * 2))) > 10) ORDER BY "Extra1" ASC, "ID" ASC;
98
FROM "PUBLIC"."test" WHERE ((("Long" + 10) + (("ID" * 2))) > 10) ORDER BY "Extra1" ASC NULLS LAST, "ID" ASC NULLS LAST;
99 99

  
100 100
-- Group by with computed columns and aggregate functions
101 101
SELECT MIN("test"."ID") AS "ID", MAX("test"."Byte") AS "Byte", NULL AS "Bool1", "Long", 
......
108 108
    SUM(((20 + "Byte") + ("ID" * 2))) AS "Extra2", 
109 109
    (("Long" + 10) + (("ID" * 2))) AS "Extra1" 
110 110
FROM "PUBLIC"."test" GROUP BY "test"."Long", (("Long" + 10) + (("ID" * 2))), (("ID" * 2)) 
111
ORDER BY "test"."Long" ASC, "Extra1" ASC, "Compu1" ASC, "ID" ASC;
111
ORDER BY "test"."Long" ASC NULLS LAST, "Extra1" ASC NULLS LAST, "Compu1" ASC NULLS LAST, "ID" ASC NULLS LAST;
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/test/resources/org/gvsig/fmap/dal/store/h2/testSTDistance.sql
11 11
   ( ((ST_GeomFromWKB(X'00000000030000000100000021402600000000000040240000000000004025f6297cff75cb40239c1d1f0e59684025d906bcf328d440233c10eaca8ab54025a9b66290ea1a4022e38c4c65197440256a09e667f3bd402295f619980c4340251c73b39ae68d402256499d6f15e64024c3ef1535754b402226f9430cd72c402463e2e0f1a698402209d683008a354024000000000000402200000000000040239c1d1f0e5968402209d683008a3540233c10eaca8ab5402226f9430cd72c4022e38c4c651974402256499d6f15e6402295f619980c43402295f619980c43402256499d6f15e64022e38c4c651974402226f9430cd72c40233c10eaca8ab5402209d683008a3540239c1d1f0e596840220000000000004024000000000000402209d683008a35402463e2e0f1a699402226f9430cd72c4024c3ef1535754c402256499d6f15e640251c73b39ae68d402295f619980c4440256a09e667f3bd4022e38c4c6519744025a9b66290ea1b40233c10eaca8ab64025d906bcf328d540239c1d1f0e59694025f6297cff75cb40240000000000014026000000000000402463e2e0f1a69a4025f6297cff75cb4024c3ef1535754d4025d906bcf328d440251c73b39ae68e4025a9b66290ea1940256a09e667f3be40256a09e667f3bb4025a9b66290ea1b40251c73b39ae68b4025d906bcf328d54024c3ef153575494025f6297cff75cb402463e2e0f1a69640260000000000004024000000000000', 4326)) && ("Geometry")) AND 
12 12
    ST_Intersects((ST_GeomFromWKB(X'00000000030000000100000021402600000000000040240000000000004025f6297cff75cb40239c1d1f0e59684025d906bcf328d440233c10eaca8ab54025a9b66290ea1a4022e38c4c65197440256a09e667f3bd402295f619980c4340251c73b39ae68d402256499d6f15e64024c3ef1535754b402226f9430cd72c402463e2e0f1a698402209d683008a354024000000000000402200000000000040239c1d1f0e5968402209d683008a3540233c10eaca8ab5402226f9430cd72c4022e38c4c651974402256499d6f15e6402295f619980c43402295f619980c43402256499d6f15e64022e38c4c651974402226f9430cd72c40233c10eaca8ab5402209d683008a3540239c1d1f0e596840220000000000004024000000000000402209d683008a35402463e2e0f1a699402226f9430cd72c4024c3ef1535754c402256499d6f15e640251c73b39ae68d402295f619980c4440256a09e667f3bd4022e38c4c6519744025a9b66290ea1b40233c10eaca8ab64025d906bcf328d540239c1d1f0e59694025f6297cff75cb40240000000000014026000000000000402463e2e0f1a69a4025f6297cff75cb4024c3ef1535754d4025d906bcf328d440251c73b39ae68e4025a9b66290ea1940256a09e667f3be40256a09e667f3bb4025a9b66290ea1b40251c73b39ae68b4025d906bcf328d54024c3ef153575494025f6297cff75cb402463e2e0f1a69640260000000000004024000000000000', 4326)),("Geometry") )) 
13 13
  ORDER BY 
14
    ST_Distance(ST_GeomFromWKB(X'00000000030000000100000021402600000000000040240000000000004025f6297cff75cb40239c1d1f0e59684025d906bcf328d440233c10eaca8ab54025a9b66290ea1a4022e38c4c65197440256a09e667f3bd402295f619980c4340251c73b39ae68d402256499d6f15e64024c3ef1535754b402226f9430cd72c402463e2e0f1a698402209d683008a354024000000000000402200000000000040239c1d1f0e5968402209d683008a3540233c10eaca8ab5402226f9430cd72c4022e38c4c651974402256499d6f15e6402295f619980c43402295f619980c43402256499d6f15e64022e38c4c651974402226f9430cd72c40233c10eaca8ab5402209d683008a3540239c1d1f0e596840220000000000004024000000000000402209d683008a35402463e2e0f1a699402226f9430cd72c4024c3ef1535754c402256499d6f15e640251c73b39ae68d402295f619980c4440256a09e667f3bd4022e38c4c6519744025a9b66290ea1b40233c10eaca8ab64025d906bcf328d540239c1d1f0e59694025f6297cff75cb40240000000000014026000000000000402463e2e0f1a69a4025f6297cff75cb4024c3ef1535754d4025d906bcf328d440251c73b39ae68e4025a9b66290ea1940256a09e667f3be40256a09e667f3bb4025a9b66290ea1b40251c73b39ae68b4025d906bcf328d54024c3ef153575494025f6297cff75cb402463e2e0f1a69640260000000000004024000000000000', 4326), "Geometry") ASC, "ID" ASC 
14
    ST_Distance(ST_GeomFromWKB(X'00000000030000000100000021402600000000000040240000000000004025f6297cff75cb40239c1d1f0e59684025d906bcf328d440233c10eaca8ab54025a9b66290ea1a4022e38c4c65197440256a09e667f3bd402295f619980c4340251c73b39ae68d402256499d6f15e64024c3ef1535754b402226f9430cd72c402463e2e0f1a698402209d683008a354024000000000000402200000000000040239c1d1f0e5968402209d683008a3540233c10eaca8ab5402226f9430cd72c4022e38c4c651974402256499d6f15e6402295f619980c43402295f619980c43402256499d6f15e64022e38c4c651974402226f9430cd72c40233c10eaca8ab5402209d683008a3540239c1d1f0e596840220000000000004024000000000000402209d683008a35402463e2e0f1a699402226f9430cd72c4024c3ef1535754c402256499d6f15e640251c73b39ae68d402295f619980c4440256a09e667f3bd4022e38c4c6519744025a9b66290ea1b40233c10eaca8ab64025d906bcf328d540239c1d1f0e59694025f6297cff75cb40240000000000014026000000000000402463e2e0f1a69a4025f6297cff75cb4024c3ef1535754d4025d906bcf328d440251c73b39ae68e4025a9b66290ea1940256a09e667f3be40256a09e667f3bb4025a9b66290ea1b40251c73b39ae68b4025d906bcf328d54024c3ef153575494025f6297cff75cb402463e2e0f1a69640260000000000004024000000000000', 4326), "Geometry") ASC NULLS LAST, "ID" ASC NULLS LAST 
15 15
  LIMIT 1;
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/test/resources/org/gvsig/fmap/dal/store/h2/date.sql
13 13
    ) OR (
14 14
    ("Date" > DATE '2019-02-17') AND 
15 15
    ("Date" < DATE '2020-02-23')
16
  )) ORDER BY "ID" ASC;
16
  )) ORDER BY "ID" ASC NULLS LAST;
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/test/resources/org/gvsig/fmap/dal/store/h2/usecases/arena2/testGroupByForeignValue.sql
3 3

  
4 4
-- Select 
5 5
SELECT NULL AS "LID_CONDUCTOR", NULL AS "ID_ACCIDENTE", NULL AS "LID_VEHICULO", NULL AS "ID_VEHICULO", NULL AS "POSIBLE_RESPONSABLE", NULL AS "FECHA_NACIMIENTO", NULL AS "SEXO", NULL AS "NACIONALIDAD", NULL AS "PAIS_RESIDENCIA", NULL AS "PROVINCIA_RESIDENCIA", NULL AS "MUNICIPIO_RESIDENCIA", NULL AS "ASISTENCIA_SANITARIA", NULL AS "INFLU_FACT_ATENCION", NULL AS "FACTORES_ATENCION", NULL AS "INFLU_PRES_ERROR", NULL AS "PRESUNTOS_ERRORES", NULL AS "CARACT_PERMISO", NULL AS "CLASE_PERMISO", NULL AS "FECHA_PERMISO", NULL AS "MOTIVO_DESPLAZAMIENTO", NULL AS "DESPLAZAMIENTO_PREVISTO", NULL AS "ACC_SEG_CINTURON", NULL AS "ACC_SEG_CASCO", NULL AS "ACC_SEG_BRAZOS", NULL AS "ACC_SEG_ESPALDA", NULL AS "ACC_SEG_TORSO", NULL AS "ACC_SEG_MANOS", NULL AS "ACC_SEG_PIERNAS", NULL AS "ACC_SEG_PIES", NULL AS "ACC_SEG_PRENDA_REF", NULL AS "INFLU_ALCOHOL", NULL AS "PRUEBA_ALCOHOLEMIA", NULL AS "TASA_ALCOHOLEMIA1", NULL AS "TASA_ALCOHOLEMIA2", NULL AS "PRUEBA_ALC_SANGRE", NULL AS "SIGNOS_INFLU_ALCOHOL", NULL AS "INFLU_DROGAS", NULL AS "PRUEBA_DROGAS", NULL AS "AMP", NULL AS "CONFIRMADO_AMP", NULL AS "BDZ", NULL AS "CONFIRMADO_BDZ", NULL AS "COC", NULL AS "CONFIRMADO_COC", NULL AS "THC", NULL AS "CONFIRMADO_THC", NULL AS "METH", NULL AS "CONFIRMADO_METH", NULL AS "OPI", NULL AS "CONFIRMADO_OPI", NULL AS "OTRAS", NULL AS "CONFIRMADO_OTRAS", NULL AS "SIGNOS_INFLU_DROGAS", NULL AS "INFLU_PRES_INFRAC_COND", NULL AS "PRES_INFRAC_COND", NULL AS "PRES_INFRAC_SIN_LUCES", NULL AS "PRES_INFRAC_SIN_TRIANGULO", NULL AS "INFLU_PRES_INFRAC_VEL", NULL AS "PRES_INFRAC_VEL_COND", NULL AS "INFLU_OTRA_INFRAC", NULL AS "OTRA_INFRAC_COND", NULL AS "EXTRA", SUM(1) AS "Acc", EXTRACT(YEAR FROM "public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE") AS "ano", "public"."ARENA2_ACCIDENTES"."COD_PROVINCIA" AS "provincia", CASE WHEN (("ASISTENCIA_SANITARIA" = 1)) THEN ('Muerto') WHEN (("ASISTENCIA_SANITARIA" = 2)) THEN ('Grave') WHEN (((((("ASISTENCIA_SANITARIA" = 3) OR ("ASISTENCIA_SANITARIA" = 4)) OR ("ASISTENCIA_SANITARIA" = 5)) OR ("ASISTENCIA_SANITARIA" = 6)) OR ("ASISTENCIA_SANITARIA" = 7))) THEN ('Leve') WHEN (("ASISTENCIA_SANITARIA" = 8)) THEN ('Ileso') ELSE ('Se Desconoce') END AS "lesividad" FROM "public"."ARENA2_CONDUCTORES" LEFT JOIN "public"."ARENA2_ACCIDENTES" ON ( ("public"."ARENA2_CONDUCTORES"."ID_ACCIDENTE") = ("public"."ARENA2_ACCIDENTES"."ID_ACCIDENTE") ) LEFT JOIN "public"."ARENA2_VEHICULOS" ON ( ("public"."ARENA2_CONDUCTORES"."LID_VEHICULO") = ("public"."ARENA2_VEHICULOS"."LID_VEHICULO") ) WHERE ((("public"."ARENA2_ACCIDENTES"."TITULARIDAD_VIA" = 2) AND ((("public"."ARENA2_VEHICULOS"."TIPO_VEHICULO" = 5) OR ("public"."ARENA2_VEHICULOS"."TIPO_VEHICULO" = 6)) OR ("public"."ARENA2_VEHICULOS"."TIPO_VEHICULO" = 7))) AND (("public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE" >= DATE '2019-01-01') AND ("public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE" <= DATE '2019-12-31'))) GROUP BY EXTRACT(YEAR FROM "public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE"), "public"."ARENA2_ACCIDENTES"."COD_PROVINCIA", CASE WHEN (("ASISTENCIA_SANITARIA" = 1)) THEN ('Muerto') WHEN (("ASISTENCIA_SANITARIA" = 2)) THEN ('Grave') WHEN (((((("ASISTENCIA_SANITARIA" = 3) OR ("ASISTENCIA_SANITARIA" = 4)) OR ("ASISTENCIA_SANITARIA" = 5)) OR ("ASISTENCIA_SANITARIA" = 6)) OR ("ASISTENCIA_SANITARIA" = 7))) THEN ('Leve') WHEN (("ASISTENCIA_SANITARIA" = 8)) THEN ('Ileso') ELSE ('Se Desconoce') END 
6
ORDER BY "provincia" ASC, "ano" ASC, "lesividad" ASC, "LID_CONDUCTOR" ASC;
6
ORDER BY "provincia" ASC NULLS LAST, "ano" ASC NULLS LAST, "lesividad" ASC NULLS LAST, "LID_CONDUCTOR" ASC NULLS LAST;
7 7

  
8 8
-- Count
9 9
SELECT COUNT(*) FROM ( SELECT COUNT(*) FROM "public"."ARENA2_CONDUCTORES" LEFT JOIN "public"."ARENA2_ACCIDENTES" ON ( ("public"."ARENA2_CONDUCTORES"."ID_ACCIDENTE") = ("public"."ARENA2_ACCIDENTES"."ID_ACCIDENTE") ) LEFT JOIN "public"."ARENA2_VEHICULOS" ON ( ("public"."ARENA2_CONDUCTORES"."LID_VEHICULO") = ("public"."ARENA2_VEHICULOS"."LID_VEHICULO") ) WHERE ((("public"."ARENA2_ACCIDENTES"."TITULARIDAD_VIA" = 2) AND ((("public"."ARENA2_VEHICULOS"."TIPO_VEHICULO" = 5) OR ("public"."ARENA2_VEHICULOS"."TIPO_VEHICULO" = 6)) OR ("public"."ARENA2_VEHICULOS"."TIPO_VEHICULO" = 7))) AND (("public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE" >= DATE '2019-01-01') AND ("public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE" <= DATE '2019-12-31'))) GROUP BY EXTRACT(YEAR FROM "public"."ARENA2_ACCIDENTES"."FECHA_ACCIDENTE"), "public"."ARENA2_ACCIDENTES"."COD_PROVINCIA", CASE WHEN (("ASISTENCIA_SANITARIA" = 1)) THEN ('Muerto') WHEN (("ASISTENCIA_SANITARIA" = 2)) THEN ('Grave') WHEN (((((("ASISTENCIA_SANITARIA" = 3) OR ("ASISTENCIA_SANITARIA" = 4)) OR ("ASISTENCIA_SANITARIA" = 5)) OR ("ASISTENCIA_SANITARIA" = 6)) OR ("ASISTENCIA_SANITARIA" = 7))) THEN ('Leve') WHEN (("ASISTENCIA_SANITARIA" = 8)) THEN ('Ileso') ELSE ('Se Desconoce') END) as _subquery_alias_ ;
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/test/resources/org/gvsig/fmap/dal/store/h2/usecases/arena2/testOrderByExtraValue.sql
46 46
WHEN (("ASISTENCIA_SANITARIA" = 8)) THEN ('Ileso') 
47 47
ELSE ('Se Desconoce') 
48 48
END 
49
ORDER BY "ano" ASC, "provincia" ASC, "lesividad" ASC, "LID_CONDUCTOR" ASC 
49
ORDER BY "ano" ASC NULLS LAST, "provincia" ASC NULLS LAST, "lesividad" ASC NULLS LAST, "LID_CONDUCTOR" ASC NULLS LAST 
50 50
LIMIT 15;
51 51

  
52 52
-- Count

Also available in: Unified diff