Fix issue with non-emulated prepared statements on MySQL

.github/workflows/ci.yml

@@ -37,6 +37,9 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+        emulate-prepares:
+          - "ON"
+          - "OFF"
 
     services:
       mysql:
@@ -66,6 +69,7 @@ jobs:
         run: vendor/bin/phpunit
         env:
           ENGINE: PDO_MYSQL
+          EMULATE_PREPARES: ${{ matrix.emulate-prepares }}
         if: ${{ matrix.php-version != '8.0' }}
 
       - name: Run PHPUnit with coverage
@@ -74,6 +78,7 @@ jobs:
           vendor/bin/phpunit --coverage-clover build/logs/clover.xml
         env:
           ENGINE: PDO_MYSQL
+          EMULATE_PREPARES: ${{ matrix.emulate-prepares }}
         if: ${{ matrix.php-version == '8.0' }}
 
       - name: Upload coverage report to Coveralls
@@ -90,6 +95,9 @@ jobs:
       matrix:
         php-version:
           - "8.0"
+        emulate-prepares:
+          - "ON"
+          - "OFF"
 
     services:
       mariadb:
@@ -121,6 +129,7 @@ jobs:
           vendor/bin/phpunit --coverage-clover build/logs/clover.xml
         env:
           ENGINE: PDO_MYSQL
+          EMULATE_PREPARES: ${{ matrix.emulate-prepares }}
 
       - name: Upload coverage report to Coveralls
         run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.5.1](https://github.com/brick/geo/releases/tag/0.5.1) - 2021-04-20
+
+🐛 **Fixes**
+
+- Fixed bug with PDO MySQL when using non-emulated prepared statements
+
 ## [0.5.0](https://github.com/brick/geo/releases/tag/0.5.0) - 2021-03-05
 
 🐛 **Fixes**

phpunit-bootstrap.php

@@ -37,10 +37,14 @@
     } else {
         switch ($engine) {
             case 'PDO_MYSQL':
+                $emulatePrepares = getenv('EMULATE_PREPARES') === 'ON';
+
                 echo 'Using PDOEngine for MySQL' . PHP_EOL;
+                echo 'with emulated prepares ' . ($emulatePrepares ? 'ON' : 'OFF') . PHP_EOL;
 
                 $pdo = new PDO('mysql:host=127.0.0.1;port=3306', 'root', '');
                 $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, $emulatePrepares);
 
                 $pdo->exec('DROP DATABASE IF EXISTS geo_tests');
                 $pdo->exec('DROP DATABASE IF EXISTS geo_tests_tmp');

src/Engine/PDOEngine.php

@@ -98,7 +98,7 @@ protected function executeQuery(string $query, array $parameters) : array
     protected function getGeomFromWKBSyntax(): string
     {
         if ($this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME) === 'mysql') {
-            return 'ST_GeomFromWKB(_binary ?, ?)';
+            return 'ST_GeomFromWKB(BINARY ?, ?)';
         }
 
         return parent::getGeomFromWKBSyntax();