Merge pull request #56 from szhajdu/v3-fix-last-insert-id-sqlsrv

[bugfix] #49 Fix last insert id return type in case of dblib (3.x)

Author: szhajdu

.github/workflows/main.yml

@@ -31,20 +31,35 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2019-latest
+        env:
+          SA_PASSWORD: P@ssw0rd
+          ACCEPT_EULA: 'Y'
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'P@ssw0rd' -d master -Q 'SELECT COUNT(*) FROM master.dbo.spt_values;'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     strategy:
       matrix:
         php: [8.0, 8.1, 8.2]
 
     steps:
+    - name: Create default database for sqlsrv as image does not support it
+      run: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'P@ssw0rd' -Q 'CREATE DATABASE codeception_test'
+
     - name: Checkout code
       uses: actions/checkout@v2
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        extensions: pdo, pgsql, mysql, sqlite
+        extensions: pdo, pgsql, mysql, sqlite, sqlsrv, pdo_sqlsrv, pdo_dblib
         coverage: none
 
     - name: Validate composer.json and composer.lock
@@ -56,5 +71,11 @@ jobs:
     - name: Run test suite
       run: php vendor/bin/codecept run
       env:
-        PGPASSWORD: postgres
         MYSQL_HOST: 127.0.0.1
+        MYSQL_DB: codeception_test
+        PG_HOST: 127.0.0.1
+        PG_DB: codeception_test
+        PG_PASSWORD: postgres
+        MSSQL_HOST: 127.0.0.1
+        MSSQL_DB: codeception_test
+        MSSQL_PASSWORD: P@ssw0rd

docker-compose.yml

@@ -7,20 +7,46 @@ services:
       context: .
       dockerfile: ./php81.Dockerfile
     environment:
-      MYSQL_DSN: "mysql:host=host.docker.internal;port=3102;dbname=codeception"
-      MYSQL_USER: root
+      MYSQL_HOST: host.docker.internal
+      MYSQL_DB: codeception
       MYSQL_PASSWORD: codeception
+      PG_HOST: host.docker.internal
+      PG_DB: codeception
+      PG_PASSWORD: codeception
+      MSSQL_HOST: host.docker.internal
+      MSSQL_DB: codeception
+      MSSQL_PASSWORD: 'P@ssw0rd'
       XDEBUG_MODE: "debug"
       XDEBUG_CONFIG: "client_host=host.docker.internal; client_port=9000; mode=debug; start_wih_request=1"
       PHP_IDE_CONFIG: "serverName=codeception-module-db" # the name must be the same as in your PHP -> Server -> "name" field
     volumes:
       - ".:/var/www/html"
 
-  mariadb105:
-    image: mariadb:10.5
+  mysql:
+    image: mysql:5.7
     environment:
-      MARIADB_ROOT_PASSWORD: codeception
-      MARIADB_DATABASE: codeception
+      MYSQL_ROOT_PASSWORD: codeception
+      MYSQL_DATABASE: codeception
     ports:
-      - "3102:3306"
+      - "3306:3306"
+
+  postgres:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: codeception
+      POSTGRES_DB: codeception
+    ports:
+      - "5432:5432"
+
+  mssql:
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    environment:
+      SA_PASSWORD: 'P@ssw0rd'
+      MSSQL_DATABASE: codeception
+      ACCEPT_EULA: 'Y'
+    ports:
+      - "1433:1433"
+    volumes:
+      - ./tests/data/scripts:/scripts:ro
+    entrypoint: [ "/bin/bash", "-c", "/scripts/mssql.sh" ]
 

php81.Dockerfile

@@ -1,33 +1,29 @@
 FROM php:8.1-cli
 
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
+
 RUN apt-get update && \
     apt-get install -y \
         unzip \
         wget \
         git \
         zlib1g-dev \
         libzip-dev \
-		mariadb-client-10.5
-
-RUN docker-php-ext-install pdo pdo_mysql && docker-php-ext-enable pdo pdo_mysql
-RUN docker-php-ext-install mysqli && docker-php-ext-enable mysqli
-RUN docker-php-ext-install zip
-
-RUN pecl install xdebug-3.1.5 && \
-    echo zend_extension=xdebug.so > $PHP_INI_DIR/conf.d/xdebug.ini
+        libpq-dev \
+        mariadb-client-10.5
+
+RUN install-php-extensions \
+    pdo_mysql-stable \
+    pdo_pgsql-stable \
+    pdo_dblib-stable \
+    pdo_sqlsrv-5.11.0 \
+    pgsql-stable \
+    zip-stable \
+    xdebug-3.1.5
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 WORKDIR /var/www/html
 
-COPY composer.json .
-COPY composer.lock .
-
-RUN composer install --no-autoloader
-
-COPY . .
-
-RUN composer dump-autoload -o
-
 ENTRYPOINT ["tail"]
 CMD ["-f", "/dev/null"]

src/Codeception/Lib/Driver/Db.php

@@ -250,7 +250,7 @@ public function deleteQueryByCriteria(string $tableName, array $criteria): void
 
     public function lastInsertId(string $tableName): string
     {
-        return $this->getDbh()->lastInsertId();
+        return (string)$this->getDbh()->lastInsertId();
     }
 
     public function getQuotedName(string $name): string

tests/data/dumps/mssql.sql

@@ -0,0 +1,76 @@
+CREATE TABLE [dbo].[groups] (
+    [id] INT NOT NULL IDENTITY(1,1),
+    [name] VARCHAR(100) NULL,
+    [enabled] BIT NULL,
+    [created_at] DATETIME NOT NULL CONSTRAINT DF_groups_created_at DEFAULT GETDATE(),
+    CONSTRAINT PK_groups PRIMARY KEY CLUSTERED ([id] ASC)
+);
+
+INSERT INTO [dbo].[groups]([name],[enabled],[created_at])
+VALUES
+    ('coders', 1, '2012-02-01 21:17:50'),
+    ('jazzman', 0, '2012-02-01 21:18:40');
+
+
+CREATE TABLE [dbo].[users] (
+    [id] INT NOT NULL IDENTITY(1,1),
+    [uuid] BINARY(16) NULL,
+    [name] VARCHAR(30) NULL,
+    [email] VARCHAR(255) NULL,
+    [is_active] BIT NOT NULL CONSTRAINT DF_users_is_active DEFAULT 1,
+    [created_at] DATETIME NOT NULL CONSTRAINT DF_users_created_at DEFAULT GETDATE(),
+    CONSTRAINT PK_users PRIMARY KEY CLUSTERED ([id] ASC)
+);
+
+INSERT INTO [dbo].[users]([uuid],[name],[email],[is_active],[created_at])
+VALUES
+    (0x11edc34b01d972fa9c1d0242ac120006, 'davert', '[email protected]', 1, '2012-02-01 21:17:04'),
+    (null, 'nick', '[email protected]', 1, '2012-02-01 21:17:15'),
+    (null, 'miles', '[email protected]', 1, '2012-02-01 21:17:25'),
+    (null, 'bird', '[email protected]', 0, '2012-02-01 21:17:39');
+
+
+CREATE TABLE [dbo].[permissions] (
+    [id] INT NOT NULL IDENTITY(1,1),
+    [user_id] INT NULL,
+    [group_id] INT NULL,
+    [role] VARCHAR(30) NULL,
+    CONSTRAINT PK_permissions PRIMARY KEY CLUSTERED ([id] ASC),
+    CONSTRAINT FK_permissions FOREIGN KEY ([group_id]) REFERENCES [dbo].[groups] ([id]) ON DELETE CASCADE,
+    CONSTRAINT FK_users FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([id]) ON DELETE CASCADE
+);
+
+INSERT INTO [dbo].[permissions]([user_id],[group_id],[role])
+VALUES
+    (1,1,'member'),
+    (2,1,'member'),
+    (3,2,'member'),
+    (4,2,'admin');
+
+
+CREATE TABLE [dbo].[order] (
+    [id] INT NOT NULL IDENTITY(1,1),
+    [name] VARCHAR(255) NOT NULL,
+    [status] VARCHAR(255) NOT NULL,
+    CONSTRAINT PK_order PRIMARY KEY CLUSTERED ([id] ASC)
+);
+
+INSERT INTO [dbo].[order]([name],[status]) VALUES ('main', 'open');
+
+
+CREATE TABLE [dbo].[composite_pk] (
+    [group_id] INT NOT NULL,
+    [id] INT NOT NULL,
+    [status] VARCHAR(255) NOT NULL,
+    CONSTRAINT PK_composite_pk PRIMARY KEY CLUSTERED ([group_id] ASC, [id] ASC)
+);
+
+CREATE TABLE [dbo].[no_pk] (
+    [status] varchar(255) NOT NULL
+);
+
+CREATE TABLE [dbo].[empty_table] (
+    [id] int NOT NULL IDENTITY(1,1),
+    [field] varchar(255),
+    CONSTRAINT [PK_empty_table] PRIMARY KEY CLUSTERED ([id])
+);

tests/data/scripts/mssql.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+/opt/mssql/bin/sqlservr &
+/scripts/wait-for-it.sh 127.0.0.1:1433
+
+for i in {1..50};
+do
+    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -Q "CREATE DATABASE $MSSQL_DATABASE;"
+    if [ $? -eq 0 ]
+    then
+        echo "database created"
+        break
+    else
+        echo "not ready yet..."
+        sleep 1
+    fi
+done
+
+sleep infinity # Keep the container running forever