- ADD COLUMN "order" INTEGER NOT NULL
- DEFAULT nextval('bundlepatch_tmp_seq');
-ALTER TABLE patchwork_bundlepatch ALTER COLUMN "order" DROP DEFAULT;
-DROP SEQUENCE bundlepatch_tmp_seq;
-ALTER TABLE patchwork_bundlepatch ADD UNIQUE("bundle_id", "order");
+ ALTER COLUMN "order" TYPE INTEGER;
+
+-- initialise the starting number for this sequence
+SELECT setval('patchwork_bundlepatch_id_seq',
+ (SELECT max(id) + 1 FROM patchwork_bundlepatch));
+
+DROP TABLE patchwork_bundle_patches;
+
+-- normalise ordering: order should start with 1 in each bundle
+UPDATE patchwork_bundlepatch SET "order" = 1 + "order" -
+ (SELECT min("order") FROM patchwork_bundlepatch AS p2
+ WHERE p2.bundle_id = patchwork_bundlepatch.bundle_id);
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON patchwork_bundlepatch TO "www-data";
+GRANT SELECT, UPDATE ON patchwork_bundlepatch_id_seq TO "www-data";
+