Can't vacuum within a transaction! and commenting out a DROP INDEX.

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/pines-2.3-2.4.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/pines-2.3-2.4.0-upgrade-db.sql
index 2a5fb5b..1ca721d 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/pines-2.3-2.4.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/pines-2.3-2.4.0-upgrade-db.sql
@@ -82,7 +82,7 @@ DROP INDEX metabib.metabib_title_field_entry_value_idx;
 -- Also dropping indexes used by PINES
 DROP INDEX authority.authority_full_rec_index_vector_idx;
 DROP INDEX metabib.lccn_gist_idx;
-DROP INDEX metabib.metabib_full_rec_index_vector_idx;
+--DROP INDEX metabib.metabib_full_rec_index_vector_idx;
 DROP INDEX metabib.metabib_author_field_entry_index_vector_idx;
 DROP INDEX metabib.metabib_keyword_field_entry_index_vector_idx;
 DROP INDEX metabib.metabib_series_field_entry_index_vector_idx;

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/pines-pre-2.3-2.4.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/pines-pre-2.3-2.4.0-upgrade-db.sql
index cc22f87..33159b2 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/pines-pre-2.3-2.4.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/pines-pre-2.3-2.4.0-upgrade-db.sql
@@ -31,6 +31,8 @@ DELETE FROM config.hold_matrix_matchpoint WHERE circ_modifier IN ('bestsellernh'
 
 DELETE FROM config.circ_modifier WHERE code IN ('bestsellernh', 'filmstrip', 'new-av', 'computer', 'internet', 'internethg', 'internethm');
 
+COMMIT;
+
 VACUUM ANALYZE asset.call_number;
 VACUUM ANALYZE biblio.record_entry;
 VACUUM ANALYZE asset.copy;
@@ -39,4 +41,3 @@ VACUUM ANALYZE config.hold_matrix_matchpoint;
 VACUUM ANALYZE config.circ_modifier;
 VACUUM ANALYZE config.copy_status;
 
-COMMIT;