[Git][debian-gis-team/pgsql-ogr-fdw][upstream] New upstream version 1.1.4

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / pgsql-ogr-fdw


Commits:
03109975 by Bas Couwenberg at 2023-07-19T05:21:33+02:00
New upstream version 1.1.4
- - - - -


3 changed files:

- .github/workflows/ci.yml
- Makefile
- ogr_fdw.c


Changes:

=====================================
.github/workflows/ci.yml
=====================================
@@ -5,50 +5,67 @@
 name: "CI"
 on:
   push:
-    branches-ignore:
-      - 'master'
+#    branches-ignore:
+#      - 'master'
   pull_request: ~
 
 jobs:
   linux:
-    runs-on: ubuntu-latest
-
-    env:
-      PGVER: 14
+    name: "CI"
+    strategy:
+        fail-fast: false
+        matrix:
+          ci:
+          - { PGVER: 13 }
+          - { PGVER: 14 }
+          - { PGVER: 15 }
+          - { PGVER: 16 }
 
+    runs-on: ubuntu-latest
     steps:
 
     - name: 'Check Out'
-      uses: actions/checkout at v2
+      uses: actions/checkout at v3
+
+    - name: 'Raise Priority for apt.postgresql.org'
+      run: |
+        cat << EOF >> ./pgdg.pref
+        Package: *
+        Pin: release o=apt.postgresql.org
+        Pin-Priority: 600
+        EOF
+        sudo mv ./pgdg.pref /etc/apt/preferences.d/
+        sudo apt update
 
     - name: 'Install GDAL'
       run: |
-        sudo add-apt-repository ppa:ubuntugis/ppa
-        sudo apt-get update
         sudo apt-get install libgdal-dev
 
     - name: 'Install PostgreSQL'
       run: |
-        sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-        wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+        sudo apt-get purge postgresql-*
+        sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg-snapshot main ${{ matrix.ci.PGVER }}" > /etc/apt/sources.list.d/pgdg.list'
+        curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
         sudo apt-get update
-        sudo apt-get -y install postgresql-$PGVER postgresql-server-dev-$PGVER
+        sudo apt-get -y install postgresql-${{ matrix.ci.PGVER }} postgresql-server-dev-${{ matrix.ci.PGVER }}
 
     - name: 'Start PostgreSQL'
       run: |
+        export PGVER=${{ matrix.ci.PGVER }}
         export PGDATA=/var/lib/postgresql/$PGVER/main
         export PGETC=/etc/postgresql/$PGVER/main
         export PGBIN=/usr/lib/postgresql/$PGVER/bin
-        # sudo su postgres -c "$PGBIN/pg_ctl --pgdata $PGDATA stop"
-        # sudo $PGBIN/pg_ctlcluster $PGVER main stop
+        export RUNNER_USER=`whoami`
+        # make sure postgres user can access data files
+        sudo chmod -R 755 /home/${RUNNER_USER}
         sudo cp ./ci/pg_hba.conf $PGETC/pg_hba.conf
-        sudo su postgres -c "$PGBIN/pg_ctl --pgdata $PGDATA start -o '-c config_file=$PGETC/postgresql.conf -p 5432'"
+        sudo systemctl stop postgresql
+        sudo pg_ctlcluster $PGVER main start
+        sudo pg_lsclusters
 
     - name: 'Build & Test'
       run: |
-        export PATH=/usr/lib/postgresql/$PGVER/bin/:$PATH
-        make
+        export PATH=/usr/lib/postgresql/${{ matrix.ci.PGVER }}/bin/:$PATH
+        PG_CFLAGS=-Werror make
         sudo make install
         PGUSER=postgres make installcheck || (cat regression.diffs && /bin/false)
-
-


=====================================
Makefile
=====================================
@@ -45,7 +45,7 @@ endif
 # substitution for @abs_srcdir@ until we can drop older
 # version support
 # https://github.com/postgres/postgres/commit/d1029bb5a26cb84b116b0dee4dde312291359f2a
-PG15 := $(shell [ $(PG_VERSION_NUM) -ge 90500 ] && echo yes)
+PG15 := $(shell [ $(PG_VERSION_NUM) -ge 150000 ] && echo yes)
 ifeq ($(PG15),yes)
 
 sql/%.sql: input/%.source


=====================================
ogr_fdw.c
=====================================
@@ -1559,7 +1559,11 @@ ogrLookupGeometryFunctionOid(const char* proname)
 		return InvalidOid;
 	}
 
+#if PG_VERSION_NUM < 160000
 	names = stringToQualifiedNameList(proname);
+#else
+	names = stringToQualifiedNameList(proname,NULL);
+#endif
 #if PG_VERSION_NUM < 90400
 	clist = FuncnameGetCandidates(names, -1, NIL, false, false);
 #elif PG_VERSION_NUM < 140000



View it on GitLab: https://salsa.debian.org/debian-gis-team/pgsql-ogr-fdw/-/commit/03109975151fb12526703e3e5d5f51727550ddcd

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgsql-ogr-fdw/-/commit/03109975151fb12526703e3e5d5f51727550ddcd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230719/b8900e45/attachment-0001.htm>