postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-18 03:23:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing downgrade script files

Browse Source 
Some of the downgrade script files were only added to the release
branch and no downgrade path existed for downgrading from the 2.4.2
release to the 2.4.1 release.

Add the missing downgrade files for 2.4.x releases to the main
development branch.

Also, avoid generating downgrade scripts for old versions, so that
only the downgrade script for the current version is generated by
default. A new CMake option `GENERATE_OLD_DOWNGRADE_SCRIPTS` is added
to control this behavior. Note that `GENERATE_DOWNGRADE_SCRIPT` needs
to be `ON` for the new option to work.

The reason we want to keep the ability to generate old downgrade
scripts is to be able to fix bugs in old downgrade scripts.
This commit is contained in:
Erik Nordström 2021-10-27 09:36:41 +02:00 committed by Erik Nordström
parent d117d8772f
commit e02f48c19d
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -5,6 +5,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(GitCommands) include(GitCommands)
include(GenerateScripts) include(GenerateScripts)
include(CMakeDependentOption)
# This requires all tests to run. This defaults to OFF but can be enabled to # This requires all tests to run. This defaults to OFF but can be enabled to
# ensure that no tests are skipped because of missing tools. # ensure that no tests are skipped because of missing tools.
@ -131,6 +132,12 @@ option(EXPERIMENTAL "Skip postgres version compatibility check" OFF)
option(GENERATE_DOWNGRADE_SCRIPT option(GENERATE_DOWNGRADE_SCRIPT
"Generate downgrade script. Defaults to not generate a downgrade script." "Generate downgrade script. Defaults to not generate a downgrade script."
OFF) OFF)
cmake_dependent_option(
GENERATE_OLD_DOWNGRADE_SCRIPTS
"Generate downgrade scripts for old versions. Requires setting GENERATE_DOWNGRADE_SCRIPT to ON. Defaults to OFF."
OFF
"GENERATE_DOWNGRADE_SCRIPT"
ON)
if(CMAKE_BUILD_TYPE MATCHES Debug) if(CMAKE_BUILD_TYPE MATCHES Debug)
# CMAKE_BUILD_TYPE is set at CMake configuration type. But usage of # CMAKE_BUILD_TYPE is set at CMake configuration type. But usage of

51
sql/CMakeLists.txt
View File

@ -31,9 +31,14 @@ set(MOD_FILES
updates/2.4.0--2.4.1.sql updates/2.4.0--2.4.1.sql
updates/2.4.1--2.4.2.sql) updates/2.4.1--2.4.2.sql)
# Files for downgrade scripts. This should only include files for downgrade to # The downgrade file to generate a downgrade script for the current version, as
# previous version since we do not support skipping versions when downgrading # specified in version.config
set(REV_FILES) set(CURRENT_REV_FILE reverse-dev.sql)
# Files for generating old downgrade scripts. This should only include files for
# downgrade to from one version to its previous version since we do not support
# skipping versions when downgrading.
set(OLD_REV_FILES 2.3.1--2.3.0.sql 2.4.0--2.3.1.sql 2.4.1--2.4.0.sql
2.4.2--2.4.1.sql)
set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}") set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
set(LOADER_PATHNAME "$libdir/timescaledb") set(LOADER_PATHNAME "$libdir/timescaledb")
@ -56,25 +61,27 @@ else()
INPUT_DIRECTORY INPUT_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/updates ${CMAKE_CURRENT_SOURCE_DIR}/updates
FILES FILES
reverse-dev.sql) ${CURRENT_REV_FILE})
foreach(_downgrade_file ${REV_FILES}) if(GENERATE_OLD_DOWNGRADE_SCRIPTS)
if(${_downgrade_file} MATCHES foreach(_downgrade_file ${OLD_REV_FILES})
"([0-9]+\\.[0-9]+\\.*[0-9]*)--([0-9]+\\.[0-9]+\\.*[0-9]*).sql") if(${_downgrade_file} MATCHES
set(_source_version ${CMAKE_MATCH_1}) "([0-9]+\\.[0-9]+\\.*[0-9]*)--([0-9]+\\.[0-9]+\\.*[0-9]*).sql")
set(_target_version ${CMAKE_MATCH_2}) set(_source_version ${CMAKE_MATCH_1})
generate_downgrade_script( set(_target_version ${CMAKE_MATCH_2})
SOURCE_VERSION generate_downgrade_script(
${_source_version} SOURCE_VERSION
TARGET_VERSION ${_source_version}
${_target_version} TARGET_VERSION
INPUT_DIRECTORY ${_target_version}
${CMAKE_CURRENT_SOURCE_DIR}/updates INPUT_DIRECTORY
FILES ${CMAKE_CURRENT_SOURCE_DIR}/updates
${_downgrade_file}) FILES
else() ${_downgrade_file})
message(FATAL_ERROR "${_downgrade_file} is not a downgrade file") else()
endif() message(FATAL_ERROR "${_downgrade_file} is not a downgrade file")
endforeach() endif()
endforeach()
endif()
endif() endif()
# Function to replace @MODULE_PATHNAME@ in source files, producing an output # Function to replace @MODULE_PATHNAME@ in source files, producing an output

2
sql/updates/2.4.2--2.4.1.sql Normal file
View File

@ -0,0 +1,2 @@
-- No script modifications necessary for this downgrade