Author: chatellier Date: 2011-03-17 10:33:07 +0000 (Thu, 17 Mar 2011) New Revision: 3171 Log: Disable migration when schema is created or restored Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:32:16 UTC (rev 3170) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:33:07 UTC (rev 3171) @@ -202,17 +202,28 @@ /** * Returns the storage. * - * Update shema if necessary. + * Storage is auto configured to perform shema migration. * * @return Returns the storage. */ public TopiaContext getStorage() { + TopiaContext topiaContext = getStorage(true); + return topiaContext; + } + + /** + * Returns the storage. + * + * @param performMigration if {@code true} perform migration + * @return Returns the storage. + */ + public TopiaContext getStorage(boolean performMigration) { if (storage == null || storage.isClosed()) { log.info("Create new storage for " + getName()); try { // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, getDirectory()); + IsisH2Config.addDatabaseConfig(config, getDirectory(), performMigration); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext @@ -289,7 +300,8 @@ // load data // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, rootDirDest); + // false = don't perform, schema is empty + IsisH2Config.addDatabaseConfig(config, rootDirDest, false); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext