Fix queryString property handling

Author: kocsismate

ext/pdo/pdo_stmt.c

@@ -2262,7 +2262,9 @@ static zval *row_prop_read(zend_object *object, zend_string *name, int type, voi
 	ZEND_ASSERT(stmt);
 
 	ZVAL_NULL(rv);
-	if (is_numeric_string(ZSTR_VAL(name), ZSTR_LEN(name), &lval, NULL, 0) == IS_LONG)	{
+	if (zend_string_equals_literal(name, "queryString")) {
+		return zend_std_read_property(&stmt->std, name, type, cache_slot, rv);
+	} else if (is_numeric_string(ZSTR_VAL(name), ZSTR_LEN(name), &lval, NULL, 0) == IS_LONG) {
 		if (lval >= 0 && lval < stmt->column_count) {
 			fetch_value(stmt, rv, lval, NULL);
 		}
@@ -2275,9 +2277,6 @@ static zval *row_prop_read(zend_object *object, zend_string *name, int type, voi
 				return rv;
 			}
 		}
-		if (zend_string_equals_literal(name, "queryString")) {
-			return zend_std_read_property(&stmt->std, name, type, cache_slot, rv);
-		}
 	}
 
 	return rv;
@@ -2306,6 +2305,10 @@ static zval *row_dim_read(zend_object *object, zval *member, int type, zval *rv)
 			return &EG(uninitialized_zval);
 		}
 
+		if (zend_string_equals_literal(Z_STR_P(member), "queryString")) {
+			return zend_std_read_property(&stmt->std, Z_STR_P(member), type, NULL, rv);
+		}
+
 		/* TODO: replace this with a hash of available column names to column
 		 * numbers */
 		for (colno = 0; colno < stmt->column_count; colno++) {
@@ -2314,9 +2317,6 @@ static zval *row_dim_read(zend_object *object, zval *member, int type, zval *rv)
 				return rv;
 			}
 		}
-		if (zend_string_equals_literal(Z_STR_P(member), "queryString")) {
-			return zend_std_read_property(&stmt->std, Z_STR_P(member), type, NULL, rv);
-		}
 	}
 
 	return rv;

ext/pdo_sqlite/tests/bug44327_2.phpt

@@ -32,7 +32,7 @@ object(PDOStatement)#%d (1) {
 string(23) "select 1 as queryString"
 array(2) {
   ["queryString"]=>
-  int(1)
+  string(23) "select 1 as queryString"
   [0]=>
   int(1)
 }
@@ -45,6 +45,6 @@ object(PDOStatement)#%d (1) {
 string(23) "select 1 as queryString"
 object(PDORow)#%d (1) {
   ["queryString"]=>
-  int(1)
+  string(23) "select 1 as queryString"
 }
-int(1)
+string(23) "select 1 as queryString"