@@ -412,2 +412,3 @@
+    assert resp2.json['data'][1] == resp.json['data'][2]
     assert resp2.json['data'][2] == resp.json['data'][1]
-    assert resp2.json['data'][3] == resp.json['data'][2]
+    assert resp2.json['data'][3] == resp.json['data'][0]

@@ -158,0 +158,4 @@
+    if d.get('form_receipt_datetime'):
+        d['form_receipt_datetime'] = make_naive(d['form_receipt_datetime'].replace(microsecond=0))
+    if d.get('form_last_update_datetime'):
+        d['form_last_update_datetime'] = make_naive(d['form_last_update_datetime'].replace(microsecond=0))

@@ -2788,1 +2786,3 @@
-                    'last_update_time': datetime.datetime(*filled.last_update_time[:6]),
+                    'receipt_time': make_naive(filled.receipt_time.replace(microsecond=0))
+                    if filled.receipt_time
+                    else None,

@@ -515,3 +515,3 @@
             (table_name,),
         )
-        existing_fields = {x[0] for x in cur.fetchall()}
+        existing_field_types = {x[0]: x[1] for x in cur.fetchall()}

@@ -539,0 +541,4 @@
+        if existing_field_types.get('receipt_time') not in (None, 'timestamp with time zone'):
+            cur.execute(f'ALTER TABLE {table_name} ALTER COLUMN receipt_time SET DATA TYPE timestamptz')
+        if existing_field_types.get('last_update_time') not in (None, 'timestamp with time zone'):
+            cur.execute(f'ALTER TABLE {table_name} ALTER COLUMN last_update_time SET DATA TYPE timestamptz')

@@ -1339,0 +1356,4 @@
+            '''SELECT table_name FROM information_schema.views
+                        WHERE table_schema = 'public'
+                          AND table_name LIKE %s''',
+            ('wcs\\_carddata\\_view\\_%',),

@@ -5325,4 +5344,4 @@
         for formdef in FormDef.select() + CardDef.select():
             do_formdef_tables(formdef, rebuild_views=False, rebuild_global_views=False)
         migrate_views(conn, cur)
         set_reindex('formdata', 'needed', conn=conn, cur=cur)