Re: [xwiki-devs] [proposal] Migrate database to store passwords in LargeStringClass and begin using crypto.passwd#protectPassword

I have a proposed change to XWikiHibernateStore#saveXWikiProperty which will make this migration possible. The change makes it so that when one saves a property which has the same name and number as an existing property, the old property is cleared and replaced rather than causing an exception. This will not only smooth over any problems caused by stray properties which were not deleted properly but will make it much easier to change a property type. Here's the patch as I propose it (I plan to add a number of tests if there isn't disagreement with the change) Index: src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java =================================================================== --- src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java (revision 30732) +++ src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java (working copy) @@ -1416,14 +1416,28 @@ final Session session = this.getSession(context); final Query query = session.createQuery( - "select prop.name from BaseProperty as prop where prop.id.id = :id and prop.id.name= :name"); + "select prop.classType from BaseProperty as prop where prop.id.id = :id and prop.id.name= :name"); query.setInteger("id", property.getId()); query.setString("name", property.getName()); - if (query.uniqueResult() == null) { + final List response = query.list(); + + if (response.size() > 0) { + if (!property.getClassType().equals(response.get(0))) { + // If we are trying to save a property and there is already a property of a different type, + // lets remove it first rather than blowing up with an exception. + final BaseProperty toDelete = new BaseProperty(); + toDelete.setId(property.getId()); + toDelete.setName(property.getName()); + session.delete(toDelete); + session.save(property); + } else { + // Property already in the database. + session.update(property); + } + } else { + // Property not already in the database. session.save(property); - } else { - session.update(property); } if (bTransaction) { WDYT? Caleb Caleb James DeLisle wrote: