diff --git a/catalogue/1.1/mysql_catalogue_schema.sql b/catalogue/1.1/mysql_catalogue_schema.sql index 58ce204a681a7a4da6ef03a0961c4e999da67fa4..98091bae83e349cff7741091c70a062506f3a93a 100644 --- a/catalogue/1.1/mysql_catalogue_schema.sql +++ b/catalogue/1.1/mysql_catalogue_schema.sql @@ -25,7 +25,7 @@ CREATE TABLE CTA_CATALOGUE( NEXT_SCHEMA_VERSION_MAJOR BIGINT UNSIGNED, NEXT_SCHEMA_VERSION_MINOR BIGINT UNSIGNED, STATUS VARCHAR(100), - CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) + CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) ); CREATE TABLE ADMIN_USER( ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL, diff --git a/catalogue/1.1/oracle_catalogue_schema.sql b/catalogue/1.1/oracle_catalogue_schema.sql index 309e084368e3924c56fcd7a8df0b3c15d7e430b5..3c8118053baec41b8af6e29552b8f51744b61bac 100644 --- a/catalogue/1.1/oracle_catalogue_schema.sql +++ b/catalogue/1.1/oracle_catalogue_schema.sql @@ -47,7 +47,7 @@ CREATE TABLE CTA_CATALOGUE( NEXT_SCHEMA_VERSION_MAJOR NUMERIC(20, 0), NEXT_SCHEMA_VERSION_MINOR NUMERIC(20, 0), STATUS VARCHAR2(100), - CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) + CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) ); CREATE TABLE ADMIN_USER( ADMIN_USER_NAME VARCHAR2(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL, diff --git a/catalogue/1.1/postgres_catalogue_schema.sql b/catalogue/1.1/postgres_catalogue_schema.sql index 4c6449e5605a3c1c2b24f0293f67c9f59fa3a4be..440ee7a3c564936bd18f9d94ca15ebd8a6dd4f52 100644 --- a/catalogue/1.1/postgres_catalogue_schema.sql +++ b/catalogue/1.1/postgres_catalogue_schema.sql @@ -32,7 +32,7 @@ CREATE TABLE CTA_CATALOGUE( NEXT_SCHEMA_VERSION_MAJOR NUMERIC(20, 0), NEXT_SCHEMA_VERSION_MINOR NUMERIC(20, 0), STATUS VARCHAR(100), - CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) + CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) ); CREATE TABLE ADMIN_USER( ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL, diff --git a/catalogue/1.1/sqlite_catalogue_schema.sql b/catalogue/1.1/sqlite_catalogue_schema.sql index f76363b816a6738121c39ba3dabc156dcabd0a60..29fc3ae46928328edb0210e96b6146667a72a614 100644 --- a/catalogue/1.1/sqlite_catalogue_schema.sql +++ b/catalogue/1.1/sqlite_catalogue_schema.sql @@ -16,7 +16,7 @@ CREATE TABLE CTA_CATALOGUE( NEXT_SCHEMA_VERSION_MAJOR INTEGER, NEXT_SCHEMA_VERSION_MINOR INTEGER, STATUS VARCHAR(100), - CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) + CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) ); CREATE TABLE ADMIN_USER( ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL, diff --git a/catalogue/AllCatalogueSchema.hpp b/catalogue/AllCatalogueSchema.hpp index b9eab1c5d51a69f376c3595d866414df6b71296a..188cb7f1f37dcdc1a299c560f424c9333309484c 100644 --- a/catalogue/AllCatalogueSchema.hpp +++ b/catalogue/AllCatalogueSchema.hpp @@ -1272,7 +1272,7 @@ namespace catalogue{ " NEXT_SCHEMA_VERSION_MAJOR NUMERIC(20, 0)," " NEXT_SCHEMA_VERSION_MINOR NUMERIC(20, 0)," " STATUS VARCHAR2(100)," - " CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" + " CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" ");" "CREATE TABLE ADMIN_USER(" " ADMIN_USER_NAME VARCHAR2(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL," @@ -1569,7 +1569,7 @@ namespace catalogue{ " NEXT_SCHEMA_VERSION_MAJOR BIGINT UNSIGNED," " NEXT_SCHEMA_VERSION_MINOR BIGINT UNSIGNED," " STATUS VARCHAR(100)," - " CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" + " CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" ");" "CREATE TABLE ADMIN_USER(" " ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL," @@ -1856,7 +1856,7 @@ namespace catalogue{ " NEXT_SCHEMA_VERSION_MAJOR INTEGER," " NEXT_SCHEMA_VERSION_MINOR INTEGER," " STATUS VARCHAR(100)," - " CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" + " CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" ");" "CREATE TABLE ADMIN_USER(" " ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL," @@ -2159,7 +2159,7 @@ namespace catalogue{ " NEXT_SCHEMA_VERSION_MAJOR NUMERIC(20, 0)," " NEXT_SCHEMA_VERSION_MINOR NUMERIC(20, 0)," " STATUS VARCHAR(100)," - " CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" + " CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING'))" ");" "CREATE TABLE ADMIN_USER(" " ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL," diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql index ec43d70f81ce8f952dc7a2e5dd116ae8afedbea5..8fe8319bbfac288c8375a8ffc1017db1df9c873b 100644 --- a/catalogue/common_catalogue_schema.sql +++ b/catalogue/common_catalogue_schema.sql @@ -4,7 +4,7 @@ CREATE TABLE CTA_CATALOGUE( NEXT_SCHEMA_VERSION_MAJOR UINT64TYPE, NEXT_SCHEMA_VERSION_MINOR UINT64TYPE, STATUS VARCHAR(100), - CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) + CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')) ); CREATE TABLE ADMIN_USER( ADMIN_USER_NAME VARCHAR(100) CONSTRAINT ADMIN_USER_AUN_NN NOT NULL, diff --git a/catalogue/migrations/liquibase/oracle/1.0to1.1.sql b/catalogue/migrations/liquibase/oracle/1.0to1.1.sql index 2a69b5ae6f2195640d727b1476381b62be547c2a..de17977389ec003d9ba2522117d483f06dd44659 100644 --- a/catalogue/migrations/liquibase/oracle/1.0to1.1.sql +++ b/catalogue/migrations/liquibase/oracle/1.0to1.1.sql @@ -17,8 +17,8 @@ ADD ( --changeset ccaffy:2 failOnError:true dbms:oracle --preconditions onFail:HALT onError:HALT --precondition-sql-check expectedResult:"1.0" SELECT CONCAT(CONCAT(CAST(SCHEMA_VERSION_MAJOR as VARCHAR(10)),'.'), CAST(SCHEMA_VERSION_MINOR AS VARCHAR(10))) AS CATALOGUE_VERSION FROM CTA_CATALOGUE; -ALTER TABLE CTA_CATALOGUE ADD CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')); ---rollback ALTER TABLE CTA_CATALOGUE DROP CONSTRAINT CTA_CATALOGUE_STATUS_CONTENT_CK; +ALTER TABLE CTA_CATALOGUE ADD CONSTRAINT CATALOGUE_STATUS_CONTENT_CK CHECK((NEXT_SCHEMA_VERSION_MAJOR IS NULL AND NEXT_SCHEMA_VERSION_MINOR IS NULL AND STATUS='COMPLETE') OR (STATUS='UPGRADING')); +--rollback ALTER TABLE CTA_CATALOGUE DROP CONSTRAINT CATALOGUE_STATUS_CONTENT_CK; --changeset ccaffy:3 failOnError:true dbms:oracle --preconditions onFail:HALT onError:HALT