From 02025e2ecd5d41a38b1b35f74044087005b8d29a Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 25 Sep 2012 06:46:30 +0000
Subject: [PATCH] SqlMigrationTest: increase number of migration to be tested
migration-095-096.sql: Add cascade in drop column statement. PostgreSQL 9.1
or 9.2 seems to need it.
SVN: 26780
---
.../migration/SqlMigrationTestAbstract.java | 2 +-
.../postgresql/migration/migration-095-096.sql | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java
index db10a848f00..ba4489c3ee8 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java
@@ -42,7 +42,7 @@ import ch.systemsx.cisd.dbmigration.postgresql.DumpPreparator;
public abstract class SqlMigrationTestAbstract
{
- private static final int CHECK_NUMBER_OF_MIGRATIONS = 4;
+ private static final int CHECK_NUMBER_OF_MIGRATIONS = 30;
private File sqlScriptOutputDirectory;
diff --git a/openbis/source/sql/postgresql/migration/migration-095-096.sql b/openbis/source/sql/postgresql/migration/migration-095-096.sql
index 53dbd065cf0..d7b34105f4f 100644
--- a/openbis/source/sql/postgresql/migration/migration-095-096.sql
+++ b/openbis/source/sql/postgresql/migration/migration-095-096.sql
@@ -4,8 +4,8 @@ alter table material_properties_history add column vocabulary_term identifier;
alter table material_properties_history add column material identifier;
update material_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
update material_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table material_properties_history drop column cvte_id;
-alter table material_properties_history drop column mate_prop_id;
+alter table material_properties_history drop column cvte_id cascade;
+alter table material_properties_history drop column mate_prop_id cascade;
ALTER TABLE MATERIAL_PROPERTIES_HISTORY ADD CONSTRAINT MAPRH_CK CHECK
((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR
(VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
@@ -16,8 +16,8 @@ alter table experiment_properties_history add column vocabulary_term identifier;
alter table experiment_properties_history add column material identifier;
update experiment_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
update experiment_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table experiment_properties_history drop column cvte_id;
-alter table experiment_properties_history drop column mate_prop_id;
+alter table experiment_properties_history drop column cvte_id cascade;
+alter table experiment_properties_history drop column mate_prop_id cascade;
ALTER TABLE EXPERIMENT_PROPERTIES_HISTORY ADD CONSTRAINT EXPRH_CK CHECK
((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR
(VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
@@ -28,8 +28,8 @@ alter table sample_properties_history add column vocabulary_term identifier;
alter table sample_properties_history add column material identifier;
update sample_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
update sample_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table sample_properties_history drop column cvte_id;
-alter table sample_properties_history drop column mate_prop_id;
+alter table sample_properties_history drop column cvte_id cascade;
+alter table sample_properties_history drop column mate_prop_id cascade;
ALTER TABLE SAMPLE_PROPERTIES_HISTORY ADD CONSTRAINT SAPRH_CK CHECK
((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR
(VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
@@ -40,8 +40,8 @@ alter table data_set_properties_history add column vocabulary_term identifier;
alter table data_set_properties_history add column material identifier;
update data_set_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
update data_set_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table data_set_properties_history drop column cvte_id;
-alter table data_set_properties_history drop column mate_prop_id;
+alter table data_set_properties_history drop column cvte_id cascade;
+alter table data_set_properties_history drop column mate_prop_id cascade;
ALTER TABLE DATA_SET_PROPERTIES_HISTORY ADD CONSTRAINT DSPRH_CK CHECK
((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR
(VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
--
GitLab