From 74dd417dfeffeac5ffbcd89981954d137166cf74 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 19 Mar 2006 19:04:32 +0000 Subject: [PATCH] - Simplify, default mode transfer also in prepare --- ext/pdo/pdo_dbh.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index be6b4c1f2c..6b53b4c05c 100755 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -566,7 +566,7 @@ static PHP_METHOD(PDO, prepare) /* unconditionally keep this for later reference */ stmt->query_string = estrndup(statement, statement_len); stmt->query_stringlen = statement_len; - stmt->default_fetch_type = PDO_FETCH_BOTH; + stmt->default_fetch_type = dbh->default_fetch_type; stmt->dbh = dbh; /* give it a reference to me */ zend_objects_store_add_ref(getThis() TSRMLS_CC); @@ -981,12 +981,7 @@ static PHP_METHOD(PDO, query) stmt->query_string = estrndup(statement, statement_len); stmt->query_stringlen = statement_len; - if (ZEND_NUM_ARGS() == 1 && dbh->default_fetch_type) { - stmt->default_fetch_type = dbh->default_fetch_type; - } else { - stmt->default_fetch_type = PDO_FETCH_BOTH; - } - + stmt->default_fetch_type = dbh->default_fetch_type; stmt->active_query_string = stmt->query_string; stmt->active_query_stringlen = statement_len; stmt->dbh = dbh; -- 2.50.1