Author: vmassol
Date: 2008-02-06 00:09:09 +0100 (Wed, 06 Feb 2008)
New Revision: 7304
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
Log:
XWIKI-2066: Migrator fails to upgrade sub wiki databases
Merged from 1.2 branch (rev 7302)
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
2008-02-05 23:08:39 UTC (rev 7303)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/AbstractXWikiMigrationManager.java
2008-02-05 23:09:09 UTC (rev 7304)
@@ -119,6 +119,13 @@
context.setDatabase(database);
context.setOriginalDatabase(database);
try {
+ // Force the schema update since it's not been
executed yet for sub wikis
+ // databases.
+ // TODO: In the future intead of doing this, move all
the database schema
+ // update + migrations into XWiki's init (see
http://jira.xwiki.org/jira/browse/XWIKI-2075).
+
context.getWiki().getHibernateStore().updateSchema(context, false);
+
+ // Run the migrations on the current database
startMigrationsForDatabase(context);
} catch (XWikiException e) {
LOG.info(new Formatter().format("Failed to migrate
database [%s]...",
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
