Merge branch 'hotfix/304'

Close #304 Fixes #35
zendframework · Mar 27, 2018 · 4a30298 · 4a30298
2 parents 288be25 + de1dc8c
commit 4a30298
Show file tree

Hide file tree

Showing 179 changed files with 629 additions and 230 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,49 +10,71 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="satooshi/php-coveralls"
-    - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_HOSTNAME=localhost
-    - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_PASSWORD=
-    - TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_HOSTNAME=localhost
 
 matrix:
   include:
     - php: 5.6
       env:
         - DEPS=lowest
     - php: 5.6
+      services:
+        - mysql
       env:
         - DEPS=locked
         - LEGACY_DEPS="phpunit/phpunit"
+        - TEST_INTEGRATION=true
+        - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
     - php: 5.6
       env:
         - DEPS=latest
     - php: 7.0
       env:
         - DEPS=lowest
     - php: 7.0
+      services:
+        - mysql
       env:
         - DEPS=locked
         - LEGACY_DEPS="phpunit/phpunit"
+        - TEST_INTEGRATION=true
+        - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
     - php: 7.0
       env:
         - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
     - php: 7.1
+      services:
+        - mysql
       env:
         - DEPS=locked
         - CS_CHECK=true
         - TEST_COVERAGE=true
+        - TEST_INTEGRATION=true
+        - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
     - php: 7.1
       env:
         - DEPS=latest
     - php: 7.2
       env:
         - DEPS=lowest
     - php: 7.2
+      services:
+        - mysql
       env:
         - DEPS=locked
+        - TEST_INTEGRATION=true
+        - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
+    - php: 7.2
+      services:
+        - postgresql
+      addons:
+        postgresql: "9.6"
+      env:
+        - DEPS=locked
+        - TEST_INTEGRATION=true
+        - TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL=true
     - php: 7.2
       env:
         - DEPS=latest
@@ -69,11 +91,10 @@ install:
   - stty cols 120 && composer show
 
 before_script:
-  - .ci/mysql_fixtures_travis.sh
-  - .ci/pgsql_fixtures.sh
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
+  - if [[ $TEST_INTEGRATION == 'true' ]]; then composer test-integration ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:

diff --git a/composer.json b/composer.json
@@ -41,7 +41,8 @@
             "test/autoload.php"
         ],
         "psr-4": {
-            "ZendTest\\Db\\": "test/"
+            "ZendTest\\Db\\": "test/unit",
+            "ZendIntegrationTest\\Db\\": "test/integration"
         }
     },
     "config": {
@@ -64,8 +65,9 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit --colors=always",
+        "test": "phpunit --colors=always --testsuite \"unit test\"",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "test-integration" : "phpunit --colors=always --testsuite \"integration test\"",
         "upload-coverage": "coveralls -v"
     }
 }
diff --git a/phpcs.xml b/phpcs.xml
@@ -2,7 +2,7 @@
 <ruleset name="Zend Framework coding standard">
     <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml" />
     <rule ref="PSR1.Files.SideEffects">
-        <exclude-pattern>*/test/Adapter/Driver/IbmDb2/StatementTest.php</exclude-pattern>
+        <exclude-pattern>*/test/unit/Adapter/Driver/IbmDb2/StatementTest.php</exclude-pattern>
     </rule>
 
     <!-- Paths to check -->

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,8 +4,11 @@
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>
-        <testsuite name="zend-db Test Suite">
-            <directory>./test</directory>
+        <testsuite name="unit test">
+            <directory>./test/unit</directory>
+        </testsuite>
+        <testsuite name="integration test">
+            <directory>./test/integration</directory>
         </testsuite>
     </testsuites>
 
@@ -19,7 +22,7 @@
     </filter>
 
     <listeners>
-        <listener class="ZendTest\Db\IntegrationTestListener" file="./test/IntegrationTestListener.php" />
+        <listener class="ZendIntegrationTest\Db\IntegrationTestListener" file="./test/integration/IntegrationTestListener.php" />
     </listeners>
 
     <php>
@@ -29,9 +32,9 @@
 
         <!-- Integration Test Variables -->
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL" value="false" />
-        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="192.168.20.20" />
-        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_USERNAME" value="root" />
-        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="Password123" />
+        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="localhost" />
+        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_USERNAME" value="travis" />
+        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="" />
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL_DATABASE" value="zenddb_test" />
 
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_SQLSRV" value="false" />
@@ -53,9 +56,9 @@
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_IBMDB2_DATABASE" value="" />
 
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL" value="false" />
-        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="192.168.20.20" />
+        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="localhost" />
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_USERNAME" value="postgres" />
-        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_PASSWORD" value="postgres" />
+        <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_PASSWORD" value="" />
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_PGSQL_DATABASE" value="zenddb_test" />
 
         <env name="TESTS_ZEND_DB_ADAPTER_DRIVER_SQLITE_MEMORY" value="true" />

diff --git a/src/Sql/Insert.php b/src/Sql/Insert.php
@@ -10,12 +10,13 @@
 namespace Zend\Db\Sql;
 
 use Zend\Db\Adapter\Driver\DriverInterface;
+use Zend\Db\Adapter\Driver\Pdo\Pdo;
 use Zend\Db\Adapter\ParameterContainer;
 use Zend\Db\Adapter\Platform\PlatformInterface;
 
 class Insert extends AbstractPreparableSql
 {
-    /**#@+
+    /**
      * Constants
      *
      * @const
@@ -180,10 +181,16 @@ protected function processInsert(
 
         $columns = [];
         $values  = [];
+        $i       = 0;
 
         foreach ($this->columns as $column => $value) {
             $columns[] = $platform->quoteIdentifier($column);
             if (is_scalar($value) && $parameterContainer) {
+                // use incremental value instead of column name for PDO
+                // @see https://github.com/zendframework/zend-db/issues/35
+                if ($driver instanceof Pdo) {
+                    $column = 'c_' . $i++;
+                }
                 $values[] = $driver->formatParameterName($column);
                 $parameterContainer->offsetSet($column, $value);
             } else {

diff --git a/src/Sql/Update.php b/src/Sql/Update.php
@@ -12,6 +12,7 @@
 use Zend\Db\Adapter\ParameterContainer;
 use Zend\Db\Adapter\Platform\PlatformInterface;
 use Zend\Db\Adapter\Driver\DriverInterface;
+use Zend\Db\Adapter\Driver\Pdo\Pdo;
 use Zend\Stdlib\PriorityList;
 
 /**
@@ -186,9 +187,15 @@ protected function processSet(
         ParameterContainer $parameterContainer = null
     ) {
         $setSql = [];
+        $i      = 0;
         foreach ($this->set as $column => $value) {
             $prefix = $platform->quoteIdentifier($column) . ' = ';
             if (is_scalar($value) && $parameterContainer) {
+                // use incremental value instead of column name for PDO
+                // @see https://github.com/zendframework/zend-db/issues/35
+                if ($driver instanceof Pdo) {
+                    $column = 'c_' . $i++;
+                }
                 $setSql[] = $prefix . $driver->formatParameterName($column);
                 $parameterContainer->offsetSet($column, $value);
             } else {

diff --git a/test/Adapter/Platform/SqlServerIntegrationTest.php b/test/Adapter/Platform/SqlServerIntegrationTest.php