Merge branch 'hotfix/292'

Close #292 Fixes #291
zendframework · Dec 11, 2017 · 1651abb · 1651abb
2 parents 69118aa + 983fce2
commit 1651abb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.9.2 - TBD
+## 2.9.2 - 2017-12-11
 
 ### Added
 
@@ -22,7 +22,11 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#292](https://github.com/zendframework/zend-db/pull/292) ensures that you may
+  reference bound parameter names using a leading colon (`:`) character when
+  using the PDO adapter. (The leading colon is not technically necessary, as the
+  adapter will prefix for you; however, this ensures portability with vanilla
+  PDO.)
 
 ## 2.9.1 - 2017-12-07
 

diff --git a/src/Adapter/Driver/Pdo/Pdo.php b/src/Adapter/Driver/Pdo/Pdo.php
@@ -304,6 +304,7 @@ public function getPrepareType()
     public function formatParameterName($name, $type = null)
     {
         if ($type === null && ! is_numeric($name) || $type == self::PARAMETERIZATION_NAMED) {
+            $name = ltrim($name, ':');
             // @see https://bugs.php.net/bug.php?id=43130
             if (preg_match('/[^a-zA-Z0-9_]/', $name)) {
                 throw new Exception\RuntimeException(sprintf(

diff --git a/test/Adapter/Driver/Pdo/PdoTest.php b/test/Adapter/Driver/Pdo/PdoTest.php
@@ -53,6 +53,7 @@ public function getParamsAndType()
             [ '123foo', Pdo::PARAMETERIZATION_NAMED, ':123foo' ],
             [ 1, Pdo::PARAMETERIZATION_NAMED, ':1' ],
             [ '1', Pdo::PARAMETERIZATION_NAMED, ':1' ],
+            [ ':foo', null, ':foo' ],
         ];
     }