diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt index e053625f0fb73fb7e774a4ec3a8b9b967030c244..d2d776162ff51563104ce4153027ec6ad226f1eb 100644 --- a/catalogue/CMakeLists.txt +++ b/catalogue/CMakeLists.txt @@ -96,10 +96,14 @@ target_link_libraries (ctacatalogue ctacommon ctardbms) +#Generate insert_cta_catalogue_version.sql +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/insert_cta_catalogue_version.sql.in insert_cta_catalogue_version.sql) + add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sql oracle_catalogue_schema.sql postgres_catalogue_schema.sql COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/sqlite_catalogue_schema_header.sql ${CMAKE_CURRENT_SOURCE_DIR}/common_catalogue_schema.sql + insert_cta_catalogue_version.sql ${CMAKE_CURRENT_SOURCE_DIR}/sqlite_catalogue_schema_trailer.sql | sed 's/UINT8TYPE/INTEGER/g' | sed 's/UINT16TYPE/INTEGER/g' @@ -111,6 +115,7 @@ add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sq COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/mysql_catalogue_schema_header.sql ${CMAKE_CURRENT_SOURCE_DIR}/common_catalogue_schema.sql + insert_cta_catalogue_version.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_catalogue_schema_trailer.sql | sed 's/UINT8TYPE/TINYINT UNSIGNED/g' | sed 's/UINT16TYPE/SMALLINT UNSIGNED/g' @@ -122,6 +127,7 @@ add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sq COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/oracle_catalogue_schema_header.sql ${CMAKE_CURRENT_SOURCE_DIR}/common_catalogue_schema.sql + insert_cta_catalogue_version.sql ${CMAKE_CURRENT_SOURCE_DIR}/oracle_catalogue_schema_trailer.sql | sed 's/UINT8TYPE/NUMERIC\(3, 0\)/g' | sed 's/UINT16TYPE/NUMERIC\(5, 0\)/g' @@ -133,6 +139,7 @@ add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sq COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/postgres_catalogue_schema_header.sql ${CMAKE_CURRENT_SOURCE_DIR}/common_catalogue_schema.sql + insert_cta_catalogue_version.sql ${CMAKE_CURRENT_SOURCE_DIR}/postgres_catalogue_schema_trailer.sql | sed 's/UINT8TYPE/NUMERIC\(3, 0\)/g' | sed 's/UINT16TYPE/NUMERIC\(5, 0\)/g' @@ -142,6 +149,7 @@ add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sq > postgres_catalogue_schema.sql DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/common_catalogue_schema.sql + ${CMAKE_SOURCE_DIR}/cmake/CTAVersions.cmake ${CMAKE_CURRENT_SOURCE_DIR}/sqlite_catalogue_schema_header.sql ${CMAKE_CURRENT_SOURCE_DIR}/sqlite_catalogue_schema_trailer.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_catalogue_schema_header.sql diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql index 13fb702029f46d2a7a3d2a9163824a893c996ac8..d15ddfaebba383824905ea057716ee5eaaa15a46 100644 --- a/catalogue/common_catalogue_schema.sql +++ b/catalogue/common_catalogue_schema.sql @@ -261,9 +261,3 @@ CREATE TABLE EXPERIMENTS ( NAME VARCHAR(20), GID NUMERIC(6, 0) CONSTRAINT EXPERIMENTS_GID_PK PRIMARY KEY ); -INSERT INTO CTA_CATALOGUE( - SCHEMA_VERSION_MAJOR, - SCHEMA_VERSION_MINOR) -VALUES( - 0, - 0); diff --git a/catalogue/insert_cta_catalogue_version.sql.in b/catalogue/insert_cta_catalogue_version.sql.in new file mode 100644 index 0000000000000000000000000000000000000000..22d3d0b3a8bc22bc8d261e41d7a76af413920f27 --- /dev/null +++ b/catalogue/insert_cta_catalogue_version.sql.in @@ -0,0 +1,6 @@ +INSERT INTO CTA_CATALOGUE( + SCHEMA_VERSION_MAJOR, + SCHEMA_VERSION_MINOR) +VALUES( + @CTA_CATALOGUE_SCHEMA_VERSION_MAJOR@, + @CTA_CATALOGUE_SCHEMA_VERSION_MINOR@); \ No newline at end of file diff --git a/cmake/CTAVersions.cmake b/cmake/CTAVersions.cmake index e68f523cc0ec085633e6aa05d3ec43a0edfd2783..b9baec220714980d5f6a9e053b6abc5d307e9475 100644 --- a/cmake/CTAVersions.cmake +++ b/cmake/CTAVersions.cmake @@ -2,6 +2,10 @@ set(CTA_VERSION 0) set(CTA_RELEASE 1) +# Catalogue Schema Version +set(CTA_CATALOGUE_SCHEMA_VERSION_MAJOR 0) +set(CTA_CATALOGUE_SCHEMA_VERSION_MINOR 0) + # Shared object internal version (used in SONAME) set(CTA_SOVERSION 0) diff --git a/version.hpp.in b/version.hpp.in index d33b955cd50b46223344c2edfd88fbba6d7eec06..a22605055af82d961c60c76e97cf29c226a7ef26 100644 --- a/version.hpp.in +++ b/version.hpp.in @@ -20,3 +20,5 @@ #define CTA_VERSION "@CTA_VERSION@-@CTA_RELEASE@" +#define CTA_CATALOGUE_SCHEMA_VERSION_MAJOR @CTA_CATALOGUE_SCHEMA_VERSION_MAJOR@ +#define CTA_CATALOGUE_SCHEMA_VERSION_MINOR @CTA_CATALOGUE_SCHEMA_VERSION_MINOR@ \ No newline at end of file