Revision 47542
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/src/test/java/org/gvsig/sqlite/dal/TestUtils.java | ||
|---|---|---|
| 26 | 26 |
public static final Logger LOGGER = LoggerFactory.getLogger(TestUtils.class); |
| 27 | 27 |
|
| 28 | 28 |
public static final String PROVIDER_NAME = SQLiteLibrary.NAME; |
| 29 |
|
|
| 30 |
public static final String BASE_RESOURCES_FOLDER = "/org/gvsig/sqlite/dal/"; |
|
| 29 | 31 |
|
| 30 | 32 |
private static int dbcounter = 1; |
| 31 | 33 |
|
| ... | ... | |
| 85 | 87 |
|
| 86 | 88 |
public static FeatureStore openCountriesStore() throws Exception {
|
| 87 | 89 |
DataManager dataManager = DALLocator.getDataManager(); |
| 88 |
File f = getResourceAsFile("/org/gvsig/fmap/dal/store/h2/countries.csv");
|
|
| 90 |
File f = getResourceAsFile(BASE_RESOURCES_FOLDER+"countries.csv");
|
|
| 89 | 91 |
FeatureStore store = (FeatureStore) dataManager.openStore( |
| 90 | 92 |
DataStore.CSV_PROVIDER_NAME, |
| 91 | 93 |
"file=",f, |
| ... | ... | |
| 97 | 99 |
|
| 98 | 100 |
public static FeatureStore openSourceStore1() throws Exception {
|
| 99 | 101 |
DataManager dataManager = DALLocator.getDataManager(); |
| 100 |
File f = getResourceAsFile("/org/gvsig/fmap/dal/store/h2/testCreateSource1.csv");
|
|
| 102 |
File f = getResourceAsFile(BASE_RESOURCES_FOLDER+"testCreateSource1.csv");
|
|
| 101 | 103 |
FeatureStore store = (FeatureStore) dataManager.openStore( |
| 102 | 104 |
DataStore.CSV_PROVIDER_NAME, |
| 103 | 105 |
"file=",f, |
| ... | ... | |
| 109 | 111 |
|
| 110 | 112 |
public static FeatureStore openStoreTest(String baseFile) throws Exception {
|
| 111 | 113 |
DataManager dataManager = DALLocator.getDataManager(); |
| 112 |
File f = getResourceAsFile("/org/gvsig/fmap/dal/store/h2/"+baseFile);
|
|
| 114 |
File f = getResourceAsFile(BASE_RESOURCES_FOLDER+baseFile);
|
|
| 113 | 115 |
FeatureStore store = (FeatureStore) dataManager.openStore( |
| 114 | 116 |
DataStore.CSV_PROVIDER_NAME, |
| 115 | 117 |
"file=",f, |
| ... | ... | |
| 122 | 124 |
|
| 123 | 125 |
public static FeatureStore openSourceStore2() throws Exception {
|
| 124 | 126 |
DataManager dataManager = DALLocator.getDataManager(); |
| 125 |
File f = getResourceAsFile("/org/gvsig/fmap/dal/store/h2/testCreateSource2.csv");
|
|
| 127 |
File f = getResourceAsFile(BASE_RESOURCES_FOLDER+"testCreateSource2.csv");
|
|
| 126 | 128 |
FeatureStore store = (FeatureStore) dataManager.openStore( |
| 127 | 129 |
DataStore.CSV_PROVIDER_NAME, |
| 128 | 130 |
"file=",f, |
| ... | ... | |
| 134 | 136 |
|
| 135 | 137 |
|
| 136 | 138 |
public static List<String> getSQLs(String name) throws Exception {
|
| 137 |
File f = getResourceAsFile("/org/gvsig/fmap/dal/store/h2/"+name);
|
|
| 139 |
File f = getResourceAsFile(BASE_RESOURCES_FOLDER+name);
|
|
| 138 | 140 |
List<String> SQLs = new ArrayList<>(); |
| 139 | 141 |
List<String> lines = FileUtils.readLines(f); |
| 140 | 142 |
StringBuilder sb = new StringBuilder(); |
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/src/test/java/org/gvsig/sqlite/dal/TestCreate.java | ||
|---|---|---|
| 256 | 256 |
|
| 257 | 257 |
|
| 258 | 258 |
public void testCreatePopulateAndCheckData() throws Exception {
|
| 259 |
FeatureStore sourceStore = TestUtils.openSourceStore1(); |
|
| 260 |
JDBCServerExplorer explorer = TestUtils.openServerExplorer(DBNAME); |
|
| 261 |
|
|
| 262 |
createFrom(explorer, sourceStore); |
|
| 263 |
|
|
| 264 |
checkTypes(explorer, sourceStore.getDefaultFeatureType()); |
|
| 265 |
copyFrom(explorer, sourceStore, FeatureStore.MODE_APPEND); |
|
| 266 |
checkData(explorer, sourceStore); |
|
| 267 |
|
|
| 268 |
JDBCStoreParameters params = explorer.get(this.getTargetName()); |
|
| 269 |
explorer.remove(params); |
|
| 270 |
|
|
| 271 |
createFrom(explorer, sourceStore); |
|
| 272 |
copyFrom(explorer, sourceStore, FeatureStore.MODE_FULLEDIT); |
|
| 273 |
checkData(explorer, sourceStore); |
|
| 259 |
try {
|
|
| 260 |
FeatureStore sourceStore = TestUtils.openSourceStore1(); |
|
| 261 |
JDBCServerExplorer explorer = TestUtils.openServerExplorer(DBNAME); |
|
| 274 | 262 |
|
| 263 |
createFrom(explorer, sourceStore); |
|
| 264 |
|
|
| 265 |
checkTypes(explorer, sourceStore.getDefaultFeatureType()); |
|
| 266 |
copyFrom(explorer, sourceStore, FeatureStore.MODE_APPEND); |
|
| 267 |
checkData(explorer, sourceStore); |
|
| 268 |
|
|
| 269 |
JDBCStoreParameters params = explorer.get(this.getTargetName()); |
|
| 270 |
explorer.remove(params); |
|
| 271 |
|
|
| 272 |
createFrom(explorer, sourceStore); |
|
| 273 |
copyFrom(explorer, sourceStore, FeatureStore.MODE_FULLEDIT); |
|
| 274 |
checkData(explorer, sourceStore); |
|
| 275 |
} catch(Throwable t) {
|
|
| 276 |
LOGGER.warn("",t);
|
|
| 277 |
throw t; |
|
| 278 |
} |
|
| 275 | 279 |
} |
| 276 | 280 |
|
| 277 | 281 |
public void testFilterByDate() throws Exception {
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/src/main/java/org/gvsig/sqlite/dal/SQLiteExplorer.java | ||
|---|---|---|
| 1 |
package org.gvsig.sqlite.dal; |
|
| 2 |
|
|
| 3 |
import java.io.File; |
|
| 4 |
import org.apache.commons.lang3.StringUtils; |
|
| 5 |
import org.gvsig.fmap.dal.DataStore; |
|
| 6 |
import org.gvsig.fmap.dal.NewDataStoreParameters; |
|
| 7 |
import org.gvsig.fmap.dal.exception.DataException; |
|
| 8 |
import org.gvsig.fmap.dal.exception.InitializeException; |
|
| 9 |
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices; |
|
| 10 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
|
| 11 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper; |
|
| 12 |
import org.gvsig.fmap.dal.store.jdbc2.spi.JDBCServerExplorerBase; |
|
| 13 |
import org.gvsig.tools.resourcesstorage.ResourcesStorage; |
|
| 14 |
|
|
| 15 |
/** |
|
| 16 |
* |
|
| 17 |
* @author gvSIG Team |
|
| 18 |
*/ |
|
| 19 |
@SuppressWarnings("UseSpecificCatch")
|
|
| 20 |
public class SQLiteExplorer extends JDBCServerExplorerBase {
|
|
| 21 |
|
|
| 22 |
public SQLiteExplorer(JDBCServerExplorerParameters parameters, DataServerExplorerProviderServices services, JDBCHelper helper) throws InitializeException {
|
|
| 23 |
super(parameters, services, helper); |
|
| 24 |
} |
|
| 25 |
|
|
| 26 |
@Override |
|
| 27 |
public SQLiteExplorerParameters getParameters() {
|
|
| 28 |
return (SQLiteExplorerParameters) super.getParameters(); |
|
| 29 |
} |
|
| 30 |
|
|
| 31 |
@Override |
|
| 32 |
public ResourcesStorage getResourcesStorage(DataStore dataStore) {
|
|
| 33 |
ResourcesStorage ress = super.getResourcesStorage(dataStore); |
|
| 34 |
return ress; |
|
| 35 |
} |
|
| 36 |
|
|
| 37 |
@Override |
|
| 38 |
public SQLiteHelper getHelper() {
|
|
| 39 |
return (SQLiteHelper) super.getHelper(); |
|
| 40 |
} |
|
| 41 |
|
|
| 42 |
@Override |
|
| 43 |
public boolean exists() {
|
|
| 44 |
try {
|
|
| 45 |
SQLiteExplorerParameters serverParameters = this.getParameters(); |
|
| 46 |
return SQLiteUtils.existsdb(serverParameters.getFile()); |
|
| 47 |
} catch(Throwable th) {
|
|
| 48 |
return false; |
|
| 49 |
} |
|
| 50 |
} |
|
| 51 |
|
|
| 52 |
@Override |
|
| 53 |
public boolean add(String providerName, NewDataStoreParameters theParams, boolean overwrite) throws DataException {
|
|
| 54 |
// FIXME: probablemente el aqui se deberia crear si no existe y |
|
| 55 |
// llenar con lo que toque la tabla gpkg_spatial_ref_sys antes de intentar |
|
| 56 |
// crear la tabla que se quiere a?adir a la BBDD. |
|
| 57 |
return super.add(providerName, theParams, overwrite); |
|
| 58 |
} |
|
| 59 |
|
|
| 60 |
} |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/src/main/java/org/gvsig/sqlite/dal/SQLiteHelper.java | ||
|---|---|---|
| 33 | 33 |
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.TABLE_CONFIGURATION_NAME; |
| 34 | 34 |
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.TABLE_RESOURCES_NAME; |
| 35 | 35 |
import org.gvsig.fmap.dal.exception.DataException; |
| 36 |
import org.gvsig.fmap.dal.exception.InitializeException; |
|
| 36 | 37 |
import org.gvsig.fmap.dal.resource.exception.AccessResourceException; |
| 38 |
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices; |
|
| 37 | 39 |
import org.gvsig.fmap.dal.spi.DataTransactionServices; |
| 38 | 40 |
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters; |
| 39 | 41 |
import org.gvsig.fmap.dal.store.jdbc.JDBCNewStoreParameters; |
| ... | ... | |
| 41 | 43 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
| 42 | 44 |
import org.gvsig.fmap.dal.store.jdbc.exception.JDBCDriverClassNotFoundException; |
| 43 | 45 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCConnection; |
| 46 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer; |
|
| 44 | 47 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCUtils; |
| 45 | 48 |
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory; |
| 46 | 49 |
import org.gvsig.fmap.dal.store.jdbc2.spi.AbstractConnectionProvider; |
| ... | ... | |
| 393 | 396 |
return super.getGeometryFromColumn(rs, index); |
| 394 | 397 |
} |
| 395 | 398 |
|
| 396 |
} |
|
| 399 |
@Override |
|
| 400 |
public JDBCServerExplorer createServerExplorer( |
|
| 401 |
JDBCServerExplorerParameters parameters, |
|
| 402 |
DataServerExplorerProviderServices providerServices |
|
| 403 |
) throws InitializeException {
|
|
| 404 |
|
|
| 405 |
JDBCServerExplorer explorer = new SQLiteExplorer( |
|
| 406 |
parameters, |
|
| 407 |
providerServices, |
|
| 408 |
this |
|
| 409 |
); |
|
| 410 |
this.initialize(explorer, parameters, null); |
|
| 411 |
return explorer; |
|
| 412 |
} |
|
| 413 |
|
|
| 414 |
} |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/pom.xml | ||
|---|---|---|
| 160 | 160 |
<scope>test</scope> |
| 161 | 161 |
</dependency> |
| 162 | 162 |
<dependency> |
| 163 |
<groupId>org.gvsig</groupId> |
|
| 164 |
<artifactId>org.gvsig.fmap.dal.file.csv</artifactId> |
|
| 165 |
<scope>test</scope> |
|
| 166 |
</dependency> |
|
| 167 |
<dependency> |
|
| 163 | 168 |
<groupId>junit</groupId> |
| 164 | 169 |
<artifactId>junit</artifactId> |
| 165 | 170 |
<type>jar</type> |
| ... | ... | |
| 195 | 200 |
<artifactId>maven-surefire-plugin</artifactId> |
| 196 | 201 |
<configuration> |
| 197 | 202 |
<!-- Skip test execution ? --> |
| 198 |
<skipTests>true</skipTests>
|
|
| 203 |
<skipTests>false</skipTests>
|
|
| 199 | 204 |
<!-- Ignore test execution failure ? --> |
| 200 | 205 |
<testFailureIgnore>true</testFailureIgnore> |
| 201 | 206 |
<!-- |
| ... | ... | |
| 218 | 223 |
<goal>testCompile</goal> |
| 219 | 224 |
</goals> |
| 220 | 225 |
<configuration> |
| 221 |
<skip>true</skip>
|
|
| 226 |
<skip>false</skip>
|
|
| 222 | 227 |
</configuration> |
| 223 | 228 |
</execution> |
| 224 | 229 |
</executions> |
Also available in: Unified diff