r2185 - in trunk: wao-persistence/src/main/resources wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-web/src/main/resources/i18n
Author: bleny Date: 2014-07-29 18:45:18 +0200 (Tue, 29 Jul 2014) New Revision: 2185 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2185 Log: fixes #4481 migrate schema to pass hibernate validation Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/resources/wao.properties trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:45:18 UTC (rev 2185) @@ -146,3 +146,6 @@ ALTER TABLE BoatInfos ALTER COLUMN contactPostalCode TYPE TEXT; ALTER TABLE Company ALTER COLUMN postalCode TYPE TEXT; +-- On corrige les erreurs de validation du schéma indiquées par hibernate + +ALTER TABLE SampleRow ALTER COLUMN averageObservationsCount TYPE integer; Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -34,6 +34,8 @@ hibernate.c3p0.timeout=1800 hibernate.c3p0.max_statements=50 +hibernate.hbm2ddl.auto=validate + # hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -22,6 +22,7 @@ # #L% ### model.tagValue.version=4.1 +model.tagValue.useEnumerationName=true # orderBy tagValues fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -137,9 +137,9 @@ wao.ui.contacts.createFromBoatAndSelectedSampleRow=Create a contact for this boat and sample row %s (%s) wao.ui.contacts.district=Boat District Code wao.ui.contacts.division=Fishing Zone Division -wao.ui.contacts.registrationCode=Boat registration code wao.ui.contacts.observations=Mammals wao.ui.contacts.observers=Main observer +wao.ui.contacts.registrationCode=Boat registration code wao.ui.contacts.title=%s contacts found wao.ui.contacts.validation=Validation wao.ui.contacts.validation.failure=An error occurs %s @@ -169,9 +169,9 @@ wao.ui.field.Boat.district.long=Boat district for boat wao.ui.field.Boat.districtCode=District oode wao.ui.field.Boat.fleet=Fleet -wao.ui.field.Boat.registrationCode=Registration number wao.ui.field.Boat.name=Name wao.ui.field.Boat.portOfRegistry=Port of registry +wao.ui.field.Boat.registrationCode=Registration number wao.ui.field.Boat.shipOwner=Shipowner wao.ui.field.BoatDistrict.code=District code wao.ui.field.BoatInfos.comment=Comment Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -138,9 +138,9 @@ wao.ui.contacts.createFromBoatAndSelectedSampleRow=Créer un nouveau contact avec ce navire pour la ligne %s (%s) wao.ui.contacts.district=CQ wao.ui.contacts.division=Division -wao.ui.contacts.registrationCode=N° wao.ui.contacts.observations=Observations et captures accidentelles wao.ui.contacts.observers=Observateurs +wao.ui.contacts.registrationCode=N° wao.ui.contacts.title=%s contacts trouvés wao.ui.contacts.validation=Validations wao.ui.contacts.validation.failure=Une erreur est survenue %s @@ -170,9 +170,9 @@ wao.ui.field.Boat.district.long=Quartier maritime du navire wao.ui.field.Boat.districtCode=Code quartier wao.ui.field.Boat.fleet=Flotille -wao.ui.field.Boat.registrationCode=Immatriculation wao.ui.field.Boat.name=Nom wao.ui.field.Boat.portOfRegistry=Port d'attache +wao.ui.field.Boat.registrationCode=Immatriculation wao.ui.field.Boat.shipOwner=Armateur wao.ui.field.BoatDistrict.code=Code du quartier maritime wao.ui.field.BoatInfos.comment=Commentaire
participants (1)
-
bleny@users.forge.codelutin.com