hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3358 from lonvia/pg-module-for-pg16

Browse Source 
Fix compilation of legacy module for PostgreSQL 16
This commit is contained in:
Sarah Hoffmann
2024-03-07 11:39:24 +01:00
committed by GitHub
parent e929693cae edb1eec46d
commit 11ced26025
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci-tests.yml vendored
View File

@@ -134,6 +134,10 @@ jobs:
needs: create-archive needs: create-archive
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy:
matrix:
postgresql: ["13", "16"]
steps: steps:
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
@@ -149,11 +153,13 @@ jobs:
- uses: ./Nominatim/.github/actions/setup-postgresql - uses: ./Nominatim/.github/actions/setup-postgresql
with: with:
postgresql-version: 13 postgresql-version: ${{ matrix.postgresql }}
postgis-version: 3 postgis-version: 3
- name: Install Postgresql server dev - name: Install Postgresql server dev
run: sudo apt-get install postgresql-server-dev-13 run: sudo apt-get install postgresql-server-dev-$PGVER
env:
PGVER: ${{ matrix.postgresql }}
- uses: ./Nominatim/.github/actions/build-nominatim - uses: ./Nominatim/.github/actions/build-nominatim
with: with:

2
module/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
# just use the pgxs makefile # just use the pgxs makefile
foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "15" "14" "13" "12" "11" "10" "9.6") foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "16" "15" "14" "13" "12" "11" "10" "9.6")
list(APPEND PG_CONFIG_HINTS list(APPEND PG_CONFIG_HINTS
"/usr/pgsql-${suffix}/bin") "/usr/pgsql-${suffix}/bin")
endforeach() endforeach()

6
module/nominatim.c
View File

@@ -11,10 +11,12 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include <utfasciitable.h> #include <utfasciitable.h>
#ifdef PG_MODULE_MAGIC #if PG_MAJORVERSION_NUM > 15
PG_MODULE_MAGIC; #include "varatt.h"
#endif #endif
PG_MODULE_MAGIC;
Datum transliteration( PG_FUNCTION_ARGS ); Datum transliteration( PG_FUNCTION_ARGS );
Datum gettokenstring( PG_FUNCTION_ARGS ); Datum gettokenstring( PG_FUNCTION_ARGS );
void str_replace(char* buffer, int* len, int* changes, char* from, int fromlen, char* to, int tolen, int); void str_replace(char* buffer, int* len, int* changes, char* from, int fromlen, char* to, int tolen, int);