Skip to content

Commit

Permalink
Remove some missed PG13 references and update docs
Browse files Browse the repository at this point in the history
  • Loading branch information
svenklemm committed May 15, 2024
1 parent 009d970 commit fa7cd6d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 24 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,13 @@ if(WIN32)
find_path(
PG_PATH postgres.exe
PATHS "C:/PostgreSQL" "C:/Program Files/PostgreSQL"
PATH_SUFFIXES bin 13/bin 14/bin 15/bin
PATH_SUFFIXES bin 14/bin 15/bin 16/bin
DOC "The path to a PostgreSQL installation")
elseif(UNIX)
find_path(
PG_PATH postgres
PATHS $ENV{HOME} /opt/local/pgsql /usr/local/pgsql /usr/lib/postgresql
PATH_SUFFIXES bin 13/bin 14/bin 15/bin
PATH_SUFFIXES bin 14/bin 15/bin 16/bin
DOC "The path to a PostgreSQL installation")
endif()

Expand Down Expand Up @@ -349,10 +349,10 @@ message(

# Ensure that PostgreSQL version is supported and consistent with src/compat.h
# version check
if((${PG_VERSION_MAJOR} LESS "13")
if((${PG_VERSION_MAJOR} LESS "14")
OR (${PG_VERSION_MAJOR} GREATER "16")
AND NOT (${EXPERIMENTAL}))
message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 13, 14, 15 and 16")
message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 14, 15 and 16")
endif()

# Get PostgreSQL configuration from pg_config
Expand Down
14 changes: 7 additions & 7 deletions docs/BuildSource.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ See the Releases tab for the latest release.

**Prerequisites**:

- A standard PostgreSQL 13.2+, 14, or 15 installation with development
environment (header files) (e.g., `postgresql-server-dev-13` package
- A standard PostgreSQL 14, 15 or 16 installation with development
environment (header files) (e.g., `postgresql-server-dev-16` package
for Linux, Postgres.app for MacOS)
- C compiler (e.g., gcc or clang)
- [CMake](https://cmake.org/) version 3.4 or greater

```bash
git clone [email protected]:timescale/timescaledb.git
cd timescaledb
# Find the latest release and checkout, e.g. for 2.5.0:
git checkout 2.5.0
# Find the latest release and checkout, e.g. for 2.15.0:
git checkout 2.15.0
# Bootstrap the build system
./bootstrap
# To build the extension
Expand All @@ -42,7 +42,7 @@ See the Releases tab for the latest release.

**Prerequisites**:

- A standard [PostgreSQL 13.2+, 14 or 15 64-bit installation](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads#windows)
- A standard [PostgreSQL 14, 15 or 16 64-bit installation](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads#windows)
- OpenSSL for Windows
- Microsoft Visual Studio 2017 with CMake and Git components
- OR Visual Studio 2015/2016 with [CMake](https://cmake.org/) version 3.4 or greater and Git
Expand All @@ -58,8 +58,8 @@ be built in the following way:
git clone [email protected]:timescale/timescaledb.git
cd timescaledb

# Find the latest release and checkout, e.g. for 2.5.0:
git checkout 2.5.0
# Find the latest release and checkout, e.g. for 2.15.0:
git checkout 2.15.0
# Bootstrap the build system
bootstrap.bat
# To build the extension from command line
Expand Down
19 changes: 6 additions & 13 deletions test/sql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set(TEST_FILES
cursor.sql
ddl.sql
ddl_errors.sql
ddl_extra.sql
delete.sql
debug_utils.sql
drop_extension.sql
Expand Down Expand Up @@ -52,10 +53,12 @@ set(TEST_FILES
tablespace.sql
triggers.sql
truncate.sql
trusted_extension.sql
update.sql
upsert.sql
util.sql
vacuum.sql
vacuum_parallel.sql
version.sql
license.sql)

Expand Down Expand Up @@ -114,25 +117,15 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
endif()
endif(CMAKE_BUILD_TYPE MATCHES Debug)

if((${PG_VERSION_MAJOR} GREATER_EQUAL "13"))
list(APPEND TEST_FILES trusted_extension.sql vacuum_parallel.sql)
endif()

if((${PG_VERSION_MAJOR} GREATER_EQUAL "14"))
list(APPEND TEST_FILES ddl_extra.sql)
endif()

if((${PG_VERSION_MAJOR} GREATER_EQUAL "15"))
list(APPEND TEST_FILES merge.sql)
list(APPEND TEST_TEMPLATES ts_merge.sql.in)
endif()

# pg_dump_unprivileged.sql was fixed by an upstream change to pg_dump in 13.14,
# 14.11, 15.6, and 16.2
if(((${PG_VERSION_MAJOR} EQUAL "13") AND (${PG_VERSION_MINOR} GREATER_EQUAL "14"
# pg_dump_unprivileged.sql was fixed by an upstream change to pg_dump in 14.11,
# 15.6, and 16.2
if(((${PG_VERSION_MAJOR} EQUAL "14") AND (${PG_VERSION_MINOR} GREATER_EQUAL "11"
))
OR ((${PG_VERSION_MAJOR} EQUAL "14") AND (${PG_VERSION_MINOR} GREATER_EQUAL
"11"))
OR ((${PG_VERSION_MAJOR} EQUAL "15") AND (${PG_VERSION_MINOR} GREATER_EQUAL
"6"))
OR ((${PG_VERSION_MAJOR} EQUAL "16") AND (${PG_VERSION_MINOR} GREATER_EQUAL
Expand Down

0 comments on commit fa7cd6d

Please sign in to comment.