@@ -2437,2 +2437,4 @@
 
 
+def test_migration_99_formdata_page_id(pub):
+    # prout

@@ -2436,6 +2436,35 @@ def test_migration_86_card_uuid(pub):
     cur.close()
 
 
+def test_migration_99_formdata_page_id(pub):

@@ -2439,0 +2439,4 @@
+def test_migration_99_formdata_page_id(pub):
+    FormDef.wipe()
+    formdef = FormDef()
+    formdef.name = 'tests migration 99'

@@ -2439,0 +2453,4 @@
+    cur.execute('UPDATE wcs_meta SET value = 98 WHERE key = %s', ('sql_level',))
+
+    # drop uuid column
+    cur.execute('ALTER TABLE %s DROP COLUMN page_id' % sql.get_formdef_table_name(formdef))

@@ -2439,0 +2459,4 @@
+    sql.migrate()
+
+    assert column_exists_in_table(cur, sql.get_formdef_table_name(formdef), 'page_id')
+    assert migration_level(cur) >= 99

@@ -1435,0 +1423,4 @@
+            try:
+                page = self.pages[page_no]
+            except IndexError:
+                page = None

@@ -1624,3 +1611,3 @@
         return redirect(get_publisher().get_root_url())
 
-    def autosave_draft(self, draft_id, page_no, form_data, where=None):
+    def autosave_draft(self, draft_id, page_no, page, form_data, where=None):

@@ -1711,3 +1699,3 @@
         return json.dumps({'result': 'success'})
 
-    def save_draft(self, data, page_no=None, where=None):
+    def save_draft(self, data, page_no=None, page=None, where=None):

@@ -1721,2 +1709,4 @@
         if page_no is not None:
             filled.page_no = page_no
+        if page is not None:
+            filled.page_id = page.id

@@ -1601,0 +1606,4 @@
+            return self.pages[page_no].id
+        if self.has_confirmation_page():
+            return '_confirmation_page'
+        return None