MFB: PDO:FETCH_KEY_PAIR

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index e8c447a7ba845f00c617d916c6c17a125307a1b8..4925ddde014706a767406ad373b035e3aa702489 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1328,6 +1328,7 @@ void pdo_dbh_init(TSRMLS_D)
        REGISTER_PDO_CLASS_CONST_LONG("FETCH_FUNC", (long)PDO_FETCH_FUNC);
        REGISTER_PDO_CLASS_CONST_LONG("FETCH_GROUP",(long)PDO_FETCH_GROUP);
        REGISTER_PDO_CLASS_CONST_LONG("FETCH_UNIQUE",(long)PDO_FETCH_UNIQUE);
+       REGISTER_PDO_CLASS_CONST_LONG("FETCH_KEY_PAIR",(long)PDO_FETCH_KEY_PAIR);
        REGISTER_PDO_CLASS_CONST_LONG("FETCH_CLASSTYPE",(long)PDO_FETCH_CLASSTYPE);
 #if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1
        REGISTER_PDO_CLASS_CONST_LONG("FETCH_SERIALIZE",(long)PDO_FETCH_SERIALIZE);

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 1159865883e7406f2ddae5a1529cd85b9c335118..5ac70e9b1d5ad8d268d88b018388077db6acdadb 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -896,6 +896,21 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
                                }
                                break;
 
+                       case PDO_FETCH_KEY_PAIR:
+                               if (stmt->column_count != 2) {
+                                       pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO::FETCH_KEY_PAIR fetch mode requires the result set to contain extactly 2 columns." TSRMLS_CC);
+                                       return 0;
+                               }
+
+                               if (!return_all) {
+                                       ALLOC_HASHTABLE(return_value->value.ht);
+                                       zend_hash_init(return_value->value.ht, 1, NULL, ZVAL_PTR_DTOR, 0);
+                                       Z_TYPE_P(return_value) = IS_ARRAY;
+                               } else {
+                                       array_init(return_value);
+                               }
+                               break;
+
                        case PDO_FETCH_COLUMN:
                                if (stmt->fetch.column >= 0 && stmt->fetch.column < stmt->column_count) {
                                        fetch_value(stmt, return_value, stmt->fetch.column, NULL TSRMLS_CC);
@@ -1019,6 +1034,25 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
                                case PDO_FETCH_ASSOC:
                                        add_assoc_zval(return_value, stmt->columns[i].name, val);
                                        break;
+                                       
+                               case PDO_FETCH_KEY_PAIR:
+                                       {
+                                               zval *tmp;
+                                               MAKE_STD_ZVAL(tmp);
+                                               fetch_value(stmt, tmp, ++i, NULL TSRMLS_CC);
+                                               
+                                               if (Z_TYPE_P(val) == IS_STRING) {
+                                                       zend_symtable_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(val), Z_STRLEN_P(val) + 1, &tmp, sizeof(zval *), NULL);
+                                               } else if (Z_TYPE_P(val) = IS_LONG) {
+                                                       zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_P(val), tmp, sizeof(tmp), NULL);
+                                               } else {
+                                                       convert_to_string(val);
+                                                       zend_symtable_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(val), Z_STRLEN_P(val) + 1, &tmp, sizeof(zval *), NULL);
+                                               }
+                                               zval_dtor(val);
+                                               FREE_ZVAL(val);
+                                       }
+                                       break;
 
                                case PDO_FETCH_USE_DEFAULT:
                                case PDO_FETCH_BOTH:

diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index 4685b0b403dc8e95edbaf9f57e521795b07d8a7b..5e61f3c2d05b2c4fbea2eb13affb447af5668cdf 100755 (executable)
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -91,6 +91,7 @@ enum pdo_fetch_type {
        PDO_FETCH_INTO,         /* fetch row into an existing object */
        PDO_FETCH_FUNC,         /* fetch into function and return its result */
        PDO_FETCH_NAMED,    /* like PDO_FETCH_ASSOC, but can handle duplicate names */
+       PDO_FETCH_KEY_PAIR,     /* fetch into an array where the 1st column is a key and all subsequent columns are values */
        PDO_FETCH__MAX /* must be last */
 };