diff --git a/src/CoolKernel/CoolKernel/VersionInfo.h b/src/CoolKernel/CoolKernel/VersionInfo.h index d76617505dd040310b6cf0e8b207eb5a25554a9c..4c471932b9ed7bd0afcf31a8aa473b3f0384692a 100644 --- a/src/CoolKernel/CoolKernel/VersionInfo.h +++ b/src/CoolKernel/CoolKernel/VersionInfo.h @@ -24,8 +24,8 @@ #ifdef COOL300 #define COOL_VERSIONINFO_RELEASE_MAJOR 3 #define COOL_VERSIONINFO_RELEASE_MINOR 1 -#define COOL_VERSIONINFO_RELEASE_PATCH 0 -#define COOL_VERSIONINFO_RELEASE "3.1.0" +#define COOL_VERSIONINFO_RELEASE_PATCH 1 +#define COOL_VERSIONINFO_RELEASE "3.1.1" #else #define COOL_VERSIONINFO_RELEASE_MAJOR 2 #define COOL_VERSIONINFO_RELEASE_MINOR 9 diff --git a/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py b/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py index a2af6c9bd1b72966341b9b108dafef3f3b71272d..abe1ce08a8858cbf1212320211120d6dc73e49c0 100644 --- a/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py +++ b/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py @@ -155,7 +155,8 @@ class ReferenceDbMgr: self.svcVersion == "3.0.2" or \ self.svcVersion == "3.0.3" or \ self.svcVersion == "3.0.4" or \ - self.svcVersion == "3.1.0" ): + self.svcVersion == "3.1.0" or \ + self.svcVersion == "3.1.1" ): self.svcVersion2xx = True self.svcVersion22x = True self.svcVersion28x = True diff --git a/src/RelationalCool/src/RelationalDatabase.cpp b/src/RelationalCool/src/RelationalDatabase.cpp index 4570a5072242768c23d981ca3c5eb37087cd2e23..3964ac1795af74bd490d1876e3d1e04d39f0be9b 100644 --- a/src/RelationalCool/src/RelationalDatabase.cpp +++ b/src/RelationalCool/src/RelationalDatabase.cpp @@ -273,9 +273,9 @@ RelationalDatabase::areReleaseAndSchemaCompatible { if ( #if defined(COOL300) - // This release (3.1.0) can read 3.1.x - ( db_rel_version == "3.1.0" ) || - // This release (3.1.0) can read 3.0.x + // This release (3.1.1) can read 3.1.x + ( db_rel_version >= "3.1.0" && db_rel_version <= "3.1.1" ) || + // This release (3.1.1) can read 3.0.x ( db_rel_version >= "3.0.0" && db_rel_version <= "3.0.4" ) || #endif // This release (2.9.7) can read 2.9.x diff --git a/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp b/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp index 8d4839cf5a2b7110a4075679efa86d17423f080b..571fdb5b79a5670a570dead17d7dfb65b338f4c2 100644 --- a/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp +++ b/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp @@ -1240,6 +1240,7 @@ public: openable.push_back( "3.0.3" ); openable.push_back( "3.0.4" ); openable.push_back( "3.1.0" ); + openable.push_back( "3.1.1" ); #endif // Check for failure - too old even for schema evolution std::vector<std::string> ::iterator rel; diff --git a/src/Utilities/PerformanceReport/runTest.py b/src/Utilities/PerformanceReport/runTest.py index 27a67c46045928ef40e745ffd21a6b34f588b739..c9ab9897f439cd3babe1eeb517c6374bd8b34a9c 100644 --- a/src/Utilities/PerformanceReport/runTest.py +++ b/src/Utilities/PerformanceReport/runTest.py @@ -145,6 +145,7 @@ elif ( svcVersion == "3.0.2" ): svcVersion290 = True elif ( svcVersion == "3.0.3" ): svcVersion290 = True elif ( svcVersion == "3.0.4" ): svcVersion290 = True elif ( svcVersion == "3.1.0" ): svcVersion290 = True +elif ( svcVersion == "3.1.1" ): svcVersion290 = True if ( vectorPayload and not svcVersion290 ): print 'ERROR! Vector payload performance test not supported for service version:', svcVersion sys.exit(-1)