Merge branch 'develop'

Author: michalbundyra

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.11.0 - TBD
+
+### Added
+
+- [#336](https://github.com/zendframework/zend-db/pull/336) adds `InsertIgnore` class for "INSERT IGNORE" usage (usable in `MySQL` platform).
+
+- [#356](https://github.com/zendframework/zend-db/pull/356) adds support for `IN (NULL)` for empty value-set.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#146](https://github.com/zendframework/zend-db/pull/146) fixes setting correct value for `lastInsertValue` pre-insert in `SequenceFeature`.
+
 ## 2.10.2 - TBD
 
 ### Added
@@ -26,8 +50,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ## 2.10.1 - 2019-12-31
 
-### Added
-
 - Nothing.
 
 ### Changed

src/Sql/InsertIgnore.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-db for the canonical source repository
+ * @copyright Copyright (c) 2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-db/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Db\Sql;
+
+class InsertIgnore extends Insert
+{
+    /**
+     * @var array Specification array
+     */
+    protected $specifications = [
+        self::SPECIFICATION_INSERT => 'INSERT IGNORE INTO %1$s (%2$s) VALUES (%3$s)',
+        self::SPECIFICATION_SELECT => 'INSERT IGNORE INTO %1$s %2$s %3$s',
+    ];
+}

src/Sql/Predicate/In.php

@@ -125,9 +125,13 @@ public function getExpressionData()
             }
             $countValues = count($values);
             $valuePlaceholders = $countValues > 0 ? array_fill(0, $countValues, '%s') : [];
+            $inValueList = implode(', ', $valuePlaceholders);
+            if ('' === $inValueList) {
+                $inValueList = 'NULL';
+            }
             $specification = vsprintf(
                 $this->specification,
-                [$identifierSpecFragment, '(' . implode(', ', $valuePlaceholders) . ')']
+                [$identifierSpecFragment, '(' . $inValueList . ')']
             );
         }
 

src/TableGateway/Feature/SequenceFeature.php

@@ -47,6 +47,8 @@ public function __construct($primaryKeyField, $sequenceName)
      */
     public function preInsert(Insert $insert)
     {
+        $this->tableGateway->lastInsertValue = $this->lastSequenceId();
+
         $columns = $insert->getRawState('columns');
         $values = $insert->getRawState('values');
         $key = array_search($this->primaryKeyField, $columns);
@@ -70,9 +72,7 @@ public function preInsert(Insert $insert)
      */
     public function postInsert(StatementInterface $statement, ResultInterface $result)
     {
-        if ($this->sequenceValue !== null) {
-            $this->tableGateway->lastInsertValue = $this->sequenceValue;
-        }
+        $this->tableGateway->lastInsertValue = $this->sequenceValue;
     }
 
     /**