- Fixed Bug #34590 User defined PDOStatement class can't implement methods

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index be8ff2ee7134655a2279de3cd6c000e7cd4d1e14..4c091996eccb22753e19632a54f306764e942083 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1948,7 +1948,7 @@ static union _zend_function *dbstmt_method_get(
 
        lc_method_name = zend_u_str_tolower_dup(ztype, method_name, method_len);
 
-       if (zend_u_hash_find(&U_CLASS_ENTRY(pdo_dbstmt_ce)->function_table, ztype, lc_method_name, 
+       if (zend_u_hash_find(&Z_OBJCE_P(object)->function_table, ztype, lc_method_name, 
                        method_len+1, (void**)&fbc) == FAILURE) {
                pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(object TSRMLS_CC);
                /* not a pre-defined method, nor a user-defined method; check

diff --git a/ext/pdo/tests/pdo_029.phpt b/ext/pdo/tests/pdo_029.phpt
new file mode 100755 (executable)
index 0000000..c2663b1
--- /dev/null
+++ b/ext/pdo/tests/pdo_029.phpt
@@ -0,0 +1,125 @@
+--TEST--
+PDO Common: extending PDO (3)
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+
+$data = array(
+    array('10', 'Abc', 'zxy'),
+    array('20', 'Def', 'wvu'),
+    array('30', 'Ghi', 'tsr'),
+);
+
+class PDOStatementX extends PDOStatement
+{
+    public $dbh;
+    
+    protected function __construct($dbh)
+    {
+       $this->dbh = $dbh;
+       echo __METHOD__ . "()\n";
+    }
+    
+    function __destruct()
+    {
+       echo __METHOD__ . "()\n";
+    }
+    
+    function execute()
+    {
+       echo __METHOD__ . "()\n";
+               parent::execute();      
+    }
+}
+
+class PDODatabase extends PDO
+{
+    function __destruct()
+    {
+       echo __METHOD__ . "()\n";
+    }
+    
+    function query($sql)
+    {
+       echo __METHOD__ . "()\n";
+       $stmt = $this->prepare($sql, array(PDO::ATTR_STATEMENT_CLASS=>array('PDOStatementx', array($this))));
+       $stmt->setFetchMode(PDO::FETCH_ASSOC);
+       $stmt->execute();
+       return $stmt;
+    }
+}
+
+$db = PDOTest::factory('PDODatabase');
+var_dump(get_class($db));
+
+$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');
+
+$stmt = $db->prepare("INSERT INTO test VALUES(?, ?, ?)");
+var_dump(get_class($stmt));
+foreach ($data as $row) {
+    $stmt->execute($row);
+}
+
+unset($stmt);
+
+echo "===QUERY===\n";
+
+$stmt = $db->query('SELECT * FROM test');
+var_dump(get_class($stmt));
+var_dump(get_class($stmt->dbh));
+
+echo "===FOREACH===\n";
+
+foreach($stmt as $obj) {
+       var_dump($obj);
+}
+
+echo "===DONE===\n";
+exit(0);
+?>
+--EXPECT--
+string(11) "PDODatabase"
+string(12) "PDOStatement"
+===QUERY===
+PDODatabase::query()
+PDOStatementX::__construct()
+PDOStatementX::execute()
+string(13) "PDOStatementX"
+string(11) "PDODatabase"
+===FOREACH===
+array(3) {
+  ["id"]=>
+  string(2) "10"
+  ["val"]=>
+  string(3) "Abc"
+  ["val2"]=>
+  string(3) "zxy"
+}
+array(3) {
+  ["id"]=>
+  string(2) "20"
+  ["val"]=>
+  string(3) "Def"
+  ["val2"]=>
+  string(3) "wvu"
+}
+array(3) {
+  ["id"]=>
+  string(2) "30"
+  ["val"]=>
+  string(3) "Ghi"
+  ["val2"]=>
+  string(3) "tsr"
+}
+===DONE===
+PDODatabase::__destruct()
+PDOStatementX::__destruct()