Testing community changes

.github/composite-actions/build-extensions/action.yml

@@ -32,11 +32,10 @@ runs:
         cd contrib/babelfishpg_money
         make -j 4 && make install
         cd ../babelfishpg_common
-        PG_CPPFLAGS='-DENABLE_SPATIAL_TYPES' make -j 4
-        PG_CPPFLAGS='-DENABLE_SPATIAL_TYPES' make install
+        make -j 4 && make install
         cd ../babelfishpg_tds
         make -j 4 && make install
         cd ../babelfishpg_tsql
-        PG_CPPFLAGS='-I/usr/include -DENABLE_TDS_LIB -DENABLE_SPATIAL_TYPES' SHLIB_LINK='-lsybdb -L/usr/lib64' make
-        PG_CPPFLAGS='-I/usr/include -DENABLE_TDS_LIB -DENABLE_SPATIAL_TYPES' SHLIB_LINK='-lsybdb -L/usr/lib64' make install
+        PG_CPPFLAGS='-I/usr/include -DENABLE_TDS_LIB' SHLIB_LINK='-lsybdb -L/usr/lib64' make
+        PG_CPPFLAGS='-I/usr/include -DENABLE_TDS_LIB' SHLIB_LINK='-lsybdb -L/usr/lib64' make install
       shell: bash

.github/composite-actions/install-dependencies/action.yml

@@ -9,7 +9,7 @@ runs:
         curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
         sudo apt-get update --fix-missing -y
-        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python3-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libsybdb5 freetds-dev freetds-common gdal-bin libgdal-dev libgeos-dev 
+        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python3-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libsybdb5 freetds-dev freetds-common
         sudo apt install -y ccache
         sudo /usr/sbin/update-ccache-symlinks
         echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc

.github/composite-actions/setup-base-version/action.yml

@@ -59,31 +59,6 @@ runs:
         sudo make USE_PGXS=1 PG_CONFIG=~/${{ inputs.install_dir }}/bin/pg_config install
       shell: bash
 
-    - name: Build PostGIS Extension
-      run: |
-        cd ..
-        export CC='ccache gcc'
-        export CMAKE_C_COMPILER_LAUNCHER=ccache
-        export CMAKE_CXX_COMPILER_LAUNCHER=ccache 
-        sudo apt-get install wget
-        wget http://postgis.net/stuff/postgis-3.4.0.tar.gz
-        tar -xvzf postgis-3.4.0.tar.gz
-        wget https://download.osgeo.org/proj/proj-9.2.1.tar.gz
-        tar -xvzf proj-9.2.1.tar.gz
-        cd proj-9.2.1
-        if [ ! -d "build" ]; then
-          mkdir build
-        fi
-        cd build
-        cmake -DCMAKE_INSTALL_LIBDIR="lib/x86_64-linux-gnu" -DCMAKE_INSTALL_PREFIX="/usr" ..
-        cmake --build .
-        sudo cmake --build . --target install
-        cd ../../postgis-3.4.0
-        ./configure --without-protobuf --without-raster --with-pgconfig=$HOME/${{ inputs.install_dir }}/bin/pg_config
-        make USE_PGXS=1 PG_CONFIG=~/${{ inputs.install_dir }}/bin/pg_config
-        sudo make USE_PGXS=1 PG_CONFIG=~/${{ inputs.install_dir }}/bin/pg_config install
-      shell: bash
-
     # Not used composite action install-extension here since, in the previous step it has 
     # checked out a branch/tag which may not have the updated install-extension composite action
     - name: Install extensions

.github/composite-actions/setup-new-version/action.yml

@@ -44,16 +44,9 @@ runs:
       with:
         install_dir: ${{ inputs.pg_new_dir }}
 
-    - name: Build PostGIS Extension
-      id: build-postgis-extension
-      if: always() && steps.build-tds_fdw-extension.outcome == 'success'
-      uses: ./.github/composite-actions/build-postgis-extension
-      with:
-        install_dir: ${{ inputs.pg_new_dir }}
-
     - name: Setup new data directory
       id: setup-new-datadir
-      if: always() && steps.build-postgis-extension.outcome == 'success'
+      if: always() && steps.build-tds_fdw-extension.outcome == 'success'
       run: |
         cd ~
         ~/${{ inputs.pg_new_dir }}/bin/initdb -D ~/${{ inputs.pg_new_dir }}/data

.github/workflows/code-coverage.yml

@@ -89,11 +89,6 @@ jobs:
         if: ${{ startsWith(matrix.branch, 'BABEL_3_') && (steps.build-extensions.outcome == 'success') }}
         uses: ./.github/composite-actions/build-tds_fdw-extension
 
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: ${{ startsWith(matrix.branch, 'BABEL_3_') && (steps.build-tds_fdw-extension.outcome == 'success') }}
-        uses: ./.github/composite-actions/build-postgis-extension
-
       - name: Install Extensions
         id: install-extensions
         if: always() && steps.build-extensions.outcome == 'success'

.github/workflows/dotnet-tests.yml

@@ -27,15 +27,10 @@ jobs:
         id: build-extensions
         if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
-
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-extensions.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
 
       - name: Install Extensions
         id: install-extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
 
       - name: Install MSSQL Tools

.github/workflows/isolation-tests.yml

@@ -32,15 +32,10 @@ jobs:
         id: build-extensions
         if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
-
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-extensions.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
 
       - name: Install Extensions
         id: install-extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
 
       - name: Install Python

.github/workflows/jdbc-tests-with-parallel-query.yml

@@ -35,14 +35,9 @@ jobs:
         if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/build-tds_fdw-extension
 
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-tds_fdw-extension.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
-
       - name: Install Extensions
         id: install-extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-tds_fdw-extension.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
         with:
           parallel_query_mode: true

.github/workflows/jdbc-tests.yml

@@ -35,14 +35,9 @@ jobs:
         if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/build-tds_fdw-extension
 
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-tds_fdw-extension.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
-
       - name: Install Extensions
         id: install-extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
 
       - name: Run JDBC Tests

.github/workflows/major-version-upgrade.yml

@@ -44,37 +44,10 @@ jobs:
         with:
           repository: babelfish-for-postgresql/babelfish_extensions
           ref: ${{env.EXTENSION_BRANCH_FROM}}
-
-      - name: Build PostGIS Extension using ${{env.EXTENSION_BRANCH_FROM}}
-        id: build-postgis-extension-old
-        if: always() && steps.compile-antlr.outcome == 'success'
-        run: |
-          cd ..
-          export CC='ccache gcc'
-          export CMAKE_C_COMPILER_LAUNCHER=ccache
-          export CMAKE_CXX_COMPILER_LAUNCHER=ccache 
-          sudo apt-get install wget
-          wget http://postgis.net/stuff/postgis-3.4.0.tar.gz
-          tar -xvzf postgis-3.4.0.tar.gz
-          wget https://download.osgeo.org/proj/proj-9.2.1.tar.gz
-          tar -xvzf proj-9.2.1.tar.gz
-          cd proj-9.2.1
-          if [ ! -d "build" ]; then
-            mkdir build
-          fi
-          cd build
-          cmake -DCMAKE_INSTALL_LIBDIR="lib/x86_64-linux-gnu" -DCMAKE_INSTALL_PREFIX="/usr" ..
-          cmake --build .
-          sudo cmake --build . --target install
-          cd ../../postgis-3.4.0
-          ./configure --without-protobuf --without-raster --with-pgconfig=$HOME/psql_source/bin/pg_config
-          make USE_PGXS=1 PG_CONFIG=~/psql_source/bin/pg_config
-          sudo make USE_PGXS=1 PG_CONFIG=~/psql_source/bin/pg_config install
-        shell: bash
 
       - name: Build Extensions using ${{env.EXTENSION_BRANCH_FROM}}
         id: build-extensions-old
-        if: always() && steps.build-postgis-extension-old.outcome == 'success'
+        if: always() && steps.compile-antlr.outcome == 'success'
         run: |
           export PG_CONFIG=~/${{env.OLD_INSTALL_DIR}}/bin/pg_config
           export PG_SRC=~/work/babelfish_extensions/postgresql_modified_for_babelfish
@@ -141,16 +114,9 @@ jobs:
         with:
           install_dir: ${{env.NEW_INSTALL_DIR}}
 
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-tds_fdw-extension.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
-        with:
-          install_dir: ${{env.NEW_INSTALL_DIR}}
-
       - name: Setup new data directory
         id: setup-new-datadir
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-tds_fdw-extension.outcome == 'success'
         run: |
           cd ~
           ~/${{env.NEW_INSTALL_DIR}}/bin/initdb -D ~/${{env.NEW_INSTALL_DIR}}/data

.github/workflows/minor-version-upgrade.yml

@@ -35,36 +35,9 @@ jobs:
           repository: babelfish-for-postgresql/babelfish_extensions
           ref: ${{env.EXTENSION_VER_FROM}}
 
-      - name: Build PostGIS Extension using ${{env.EXTENSION_VER_FROM}}
-        id: build-postgis-extension-old
-        if: always() && steps.compile-antlr.outcome == 'success'
-        run: |
-          cd ..
-          export CC='ccache gcc'
-          export CMAKE_C_COMPILER_LAUNCHER=ccache
-          export CMAKE_CXX_COMPILER_LAUNCHER=ccache 
-          sudo apt-get install wget
-          wget http://postgis.net/stuff/postgis-3.4.0.tar.gz
-          tar -xvzf postgis-3.4.0.tar.gz
-          wget https://download.osgeo.org/proj/proj-9.2.1.tar.gz
-          tar -xvzf proj-9.2.1.tar.gz
-          cd proj-9.2.1
-          if [ ! -d "build" ]; then
-            mkdir build
-          fi
-          cd build
-          cmake -DCMAKE_INSTALL_LIBDIR="lib/x86_64-linux-gnu" -DCMAKE_INSTALL_PREFIX="/usr" ..
-          cmake --build .
-          sudo cmake --build . --target install
-          cd ../../postgis-3.4.0
-          ./configure --without-protobuf --without-raster --with-pgconfig=$HOME/psql/bin/pg_config
-          make USE_PGXS=1 PG_CONFIG=~/psql/bin/pg_config
-          sudo make USE_PGXS=1 PG_CONFIG=~/psql/bin/pg_config install
-        shell: bash
-
       - name: Set env variables and build extensions using ${{env.EXTENSION_VER_FROM}}
         id: build-extensions-older
-        if: always() && steps.build-postgis-extension-old.outcome == 'success'
+        if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
 
       - name: Build tds_fdw Extension
@@ -97,13 +70,8 @@ jobs:
         id: build-extensions-newer
         uses: ./.github/composite-actions/build-extensions
 
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-extensions-newer.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
-
       - name: Update extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions-newer.outcome == 'success'
         run: |
           cd ~
           ~/psql/bin/pg_ctl -D ~/psql/data/ -l logfile restart

.github/workflows/odbc-tests.yml

@@ -27,15 +27,10 @@ jobs:
         id: build-extensions
         if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
-
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-extensions.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
 
       - name: Install Extensions
         id: install-extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
 
       - name: Install SQL Server ODBC Driver

.github/workflows/python-tests.yml

@@ -27,15 +27,10 @@ jobs:
         id: build-extensions
         if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
-
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-extensions.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
 
       - name: Install Extensions
         id: install-extensions
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions.outcome == 'success'
         uses: ./.github/composite-actions/install-extensions
 
       - name: Install Python

.github/workflows/tap-tests.yml

@@ -51,36 +51,9 @@ jobs:
         with:
           install_dir: ${{env.OLD_INSTALL_DIR}}
 
-      - name: Build PostGIS Extension using ${{env.EXTENSION_BRANCH_OLD}}
-        id: build-postgis-extension-old
-        if: always() && steps.compile-antlr.outcome == 'success'
-        run: |
-          cd ..
-          export CC='ccache gcc'
-          export CMAKE_C_COMPILER_LAUNCHER=ccache
-          export CMAKE_CXX_COMPILER_LAUNCHER=ccache 
-          sudo apt-get install wget
-          wget http://postgis.net/stuff/postgis-3.4.0.tar.gz
-          tar -xvzf postgis-3.4.0.tar.gz
-          wget https://download.osgeo.org/proj/proj-9.2.1.tar.gz
-          tar -xvzf proj-9.2.1.tar.gz
-          cd proj-9.2.1
-          if [ ! -d "build" ]; then
-            mkdir build
-          fi
-          cd build
-          cmake -DCMAKE_INSTALL_LIBDIR="lib/x86_64-linux-gnu" -DCMAKE_INSTALL_PREFIX="/usr" ..
-          cmake --build .
-          sudo cmake --build . --target install
-          cd ../../postgis-3.4.0
-          ./configure --without-protobuf --without-raster --with-pgconfig=$HOME/psql_source/bin/pg_config
-          make USE_PGXS=1 PG_CONFIG=~/psql_source/bin/pg_config
-          sudo make USE_PGXS=1 PG_CONFIG=~/psql_source/bin/pg_config install
-        shell: bash
-
       - name: Build Extensions using ${{env.EXTENSION_BRANCH_OLD}}
         id: build-extensions-old
-        if: always() && steps.build-postgis-extension-old.outcome == 'success'
+        if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
         with:
           install_dir: ${{env.OLD_INSTALL_DIR}}
@@ -106,16 +79,9 @@ jobs:
         with:
           install_dir: ${{env.NEW_INSTALL_DIR}}
 
-      - name: Build PostGIS Extension
-        id: build-postgis-extension
-        if: always() && steps.build-extensions-new.outcome == 'success'
-        uses: ./.github/composite-actions/build-postgis-extension
-        with:
-          install_dir: ${{env.NEW_INSTALL_DIR}}
-
       - name: Run TAP Tests
         id: tap
-        if: always() && steps.build-postgis-extension.outcome == 'success'
+        if: always() && steps.build-extensions-new.outcome == 'success'
         timeout-minutes: 5
         run: |
           export PG_CONFIG=~/${{env.NEW_INSTALL_DIR}}/bin/pg_config