Changeset 1255

Timestamp:

09-12-10 17:49:30 (3 years ago)

Author:

work@…

Message:

- fixed an issue with the automated database upgrade where the idx's needed to be updated (idx=idx-1 where idx>X) which resulted in 'null' objects in template lists... Database upgrade should now perform properly in other environments.

Files:

• trunk/grails-app/conf/DatabaseUpgrade.groovy (modified) (1 diff)

trunk/grails-app/conf/DatabaseUpgrade.groovy

@@ -56 +56 @@
                                 sql.execute("DELETE FROM study_template_text_fields WHERE template_text_fields_idx='Description'")
 
-                                // delete all template_template_field references
-                                sql.execute("DELETE FROM template_template_field WHERE template_field_id=${id}")
+                                // find all template id's where this field is used
+                                sql.eachRow("SELECT DISTINCT template_fields_id, fields_idx FROM template_template_field WHERE template_field_id=${id}") { row ->
+                                        // delete the template_template_field reference
+                                        sql.execute("DELETE FROM template_template_field WHERE template_field_id=${id} AND template_fields_id=${row.template_fields_id}")
+
+                                        // and lower the idx-es of the remaining fields
+                                        sql.execute("UPDATE template_template_field SET fields_idx=fields_idx-1 WHERE fields_idx>${row.fields_idx} AND template_fields_id=${row.template_fields_id}")
+                                }
 
                                 // and delete the obsolete template field