Revert "test(mssql): add support for running tests against ms sql server (#91…"

This reverts commit aa94494.

Author: Alexandre-T

.github/phpunit.mssql2019.xml

@@ -79,22 +79,12 @@ jobs:
           SA_PASSWORD: mainExtendedToMoreThan8Chars
         ports:
           - 2017:1433
-      mssql-2019:
-        # Docker Hub image
-        image: mcr.microsoft.com/mssql/server:2019-latest
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: mainExtendedToMoreThan8Chars
-        ports:
-          - 2019:1433
-      mssql-2022:
-        # Docker Hub image
-        image: mcr.microsoft.com/mssql/server:2022-latest
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: mainExtendedToMoreThan8Chars
-        ports:
-          - 2022:1433
+        # Set health checks to wait until mssql-server has started
+#        options: >-
+#          --health-cmd="/opt/mssql-tools/bin/sqlcmd -S http://localhost:2017 -U sa -P mainExtendedToMoreThan8Chars -Q 'SELECT 1'"
+#          --health-interval 10s
+#          --health-timeout 5s
+#          --health-retries 5
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -131,22 +121,6 @@ jobs:
       - name: Show libraries
         run: composer show
 
-      - name: Install sqlclient for mssql
-        uses: potatoqualitee/[email protected]
-        with:
-          install: sqlclient
-
-      # Create the main databases
-      - name: Create the main database for mssql-2017
-        run: sqlcmd -S localhost,2017 -U sa -P mainExtendedToMoreThan8Chars -Q "CREATE DATABASE main;"
-
-      - name: Create the main database for mssql-2019
-        run: sqlcmd -S localhost,2019 -U sa -P mainExtendedToMoreThan8Chars -Q "CREATE DATABASE main;"
-
-      - name: Create the main database for mssql-2022
-        run: sqlcmd -S localhost,2022 -U sa -P mainExtendedToMoreThan8Chars -Q "CREATE DATABASE main;"
-
-      # Run the tests
       - name: Run test suite and with coverage for codeclimate for PHP 8.3 and doctrine/orm ^3.1 only
         if: ${{ env.HAS_CC_SECRET == 'true' }}
         uses: paambaati/[email protected]
@@ -292,30 +266,6 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-      mssql-2017:
-        # Docker Hub image
-        image: mcr.microsoft.com/mssql/server:2017-latest
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: mainExtendedToMoreThan8Chars
-        ports:
-          - 2017:1433
-      mssql-2019:
-        # Docker Hub image
-        image: mcr.microsoft.com/mssql/server:2019-latest
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: mainExtendedToMoreThan8Chars
-        ports:
-          - 2019:1433
-      mssql-2022:
-        # Docker Hub image
-        image: mcr.microsoft.com/mssql/server:2022-latest
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: mainExtendedToMoreThan8Chars
-        ports:
-          - 2022:1433
     steps:
       -   name: Checkout code
           uses: actions/checkout@v4
@@ -349,17 +299,6 @@ jobs:
       -   name: Force doctrine/orm library to ${{ matrix.orm }}
           run: composer --prefer-stable require doctrine/orm:${{ matrix.orm }} --with-all-dependencies
 
-      # Create the main databases
-      - name: Create the main database for mssql-2017
-        run: sqlcmd -S localhost,2017 -U sa -P mainExtendedToMoreThan8Chars -Q "CREATE DATABASE main;"
-
-      - name: Create the main database for mssql-2019
-        run: sqlcmd -S localhost,2019 -U sa -P mainExtendedToMoreThan8Chars -Q "CREATE DATABASE main;"
-
-      - name: Create the main database for mssql-2022
-        run: sqlcmd -S localhost,2022 -U sa -P mainExtendedToMoreThan8Chars -Q "CREATE DATABASE main;"
-
-      # Run the tests
       -   name: Run test suite for forks or version without code coverage
           run: composer run-script test
 

.github/phpunit.mssql2022.xml

@@ -44,26 +44,17 @@
         "test": [
             "phpunit --configuration phpunit.mysql5.7.xml",
             "phpunit --configuration phpunit.mysql8.0.xml",
-            "phpunit --configuration phpunit.pgsql.xml",
-            "phpunit --configuration phpunit.mssql2017.xml",
-            "phpunit --configuration phpunit.mssql2019.xml",
-            "phpunit --configuration phpunit.mssql2022.xml"
+            "phpunit --configuration phpunit.pgsql.xml"
         ],
         "test-coverage": [
             "phpunit --configuration phpunit.mysql5.7.xml --coverage-php .phpunit.cache/code-coverage/mysql5.7.cov",
             "phpunit --configuration phpunit.mysql8.0.xml --coverage-php .phpunit.cache/code-coverage/mysql8.0.cov",
             "phpunit --configuration phpunit.pgsql.xml --coverage-php .phpunit.cache/code-coverage/pgsql.cov",
-            "phpunit --configuration phpunit.mssql2017.xml --coverage-php .phpunit.cache/code-coverage/mssql2017.cov",
-            "phpunit --configuration phpunit.mssql2019.xml --coverage-php .phpunit.cache/code-coverage/mssql2019.cov",
-            "phpunit --configuration phpunit.mssql2022.xml --coverage-php .phpunit.cache/code-coverage/mssql2022.cov",
             "phpcov merge --clover .phpunit.cache/code-coverage/clover.xml .phpunit.cache/code-coverage/"
         ],
         "test-mysql5.7": "phpunit --configuration phpunit.mysql5.7.xml",
         "test-mysql8.0": "phpunit --configuration phpunit.mysql8.0.xml",
-        "test-pgsql": "phpunit --configuration phpunit.pgsql.xml",
-        "test-mssql2017": "phpunit --configuration phpunit.mssql2017.xml",
-        "test-mssql2019": "phpunit --configuration phpunit.mssql2019.xml",
-        "test-mssql2022": "phpunit --configuration phpunit.mssql2022.xml"
+        "test-pgsql": "phpunit --configuration phpunit.pgsql.xml"
     },
     "autoload": {
         "psr-0": {

.github/workflows/full.yaml

@@ -19,6 +19,3 @@ docker exec spatial-php8 cp docker/phpunit*.xml .
 docker exec spatial-php8 composer test-mysql5
 docker exec spatial-php8 composer test-mysql8
 docker exec spatial-php8 composer test-pgsql
-docker exec spatial-php8 composer test-mssql2017
-docker exec spatial-php8 composer test-mssql2019
-docker exec spatial-php8 composer test-mssql2022

composer.json

@@ -40,43 +40,6 @@ services:
       MYSQL_PORT: 3306
     ports:
       - "3380:3306"
-  database-mssql2017:
-    build:
-      context: ./mssql
-      args:
-        IMAGE_TAG: "2017-latest"
-        USER_NAME: "root"
-    container_name: "spatial-mssql2017"
-    restart: always
-    environment:
-      ACCEPT_EULA: Y
-      MSSQL_SA_PASSWORD: mainExtendedToMoreThan8Chars
-    ports:
-      - "1433:1433"
-  database-mssql2019:
-    build:
-      context: ./mssql
-      args:
-        IMAGE_TAG: "2019-latest"
-    container_name: "spatial-mssql2019"
-    restart: always
-    environment:
-      ACCEPT_EULA: Y
-      MSSQL_SA_PASSWORD: mainExtendedToMoreThan8Chars
-    ports:
-       - "1434:1433"
-  database-mssql2022:
-    build:
-      context: ./mssql
-      args:
-        IMAGE_TAG: "2022-latest"
-    container_name: "spatial-mssql2022"
-    restart: always
-    environment:
-      ACCEPT_EULA: Y
-      MSSQL_SA_PASSWORD: mainExtendedToMoreThan8Chars
-    ports:
-      - "1435:1433"
   service_doc:
     container_name: "spatial-doc"
     build:

docker/README.md

@@ -1,16 +1,9 @@
 FROM php:8.1-fpm-alpine
 
-#Install the package(s)
-#for Microsoft ODBC driver for SQL Server see https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-linux-ver15#alpine-linux
-RUN apk --update --no-cache add bash git postgresql-dev mysql-dev unixodbc-dev autoconf gcc make g++ &&\
-        cd /tmp && \
-        curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_18.3.2.1-1_amd64.apk && \
-        curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_18.3.1.1-1_amd64.apk && \
-        apk add --allow-untrusted msodbcsql18_18.3.2.1-1_amd64.apk && \
-        apk add --allow-untrusted mssql-tools18_18.3.1.1-1_amd64.apk && \
-        docker-php-ext-install pdo_pgsql pdo_mysql && \
-        pecl install pcov pdo_sqlsrv-5.11.1 sqlsrv-5.11.1  && \
-        docker-php-ext-enable pcov pdo_pgsql pdo_mysql pdo_sqlsrv sqlsrv
+RUN apk --update --no-cache add bash git postgresql-dev mysql-dev autoconf gcc make g++ \
+        && docker-php-ext-install pdo_pgsql pdo_mysql  \
+        && pecl install pcov \
+        && docker-php-ext-enable pcov pdo_pgsql pdo_mysql
 
 #Install composer
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer