Merge pull request #703

jmikola · jmikola · commit a0810850da7b · 2017-12-12T15:59:58.000-05:00
diff --git a/php_phongo.c b/php_phongo.c
@@ -602,7 +602,7 @@ static int phongo_execute_parse_options(mongoc_client_t* client, int server_id,
 				if (!process_read_concern(*driver_option, mongoc_opts TSRMLS_CC)) {
 					return false;
 				}
-			} else if ((!strcasecmp(string_key, "readPreference")) && (type == PHONGO_COMMAND_READ)) {
+			} else if ((!strcasecmp(string_key, "readPreference")) && (type == PHONGO_COMMAND_READ || type == PHONGO_COMMAND_RAW)) {
 				if (!process_read_preference(*driver_option, mongoc_opts, zreadPreference, client, server_id TSRMLS_CC)) {
 					return false;
 				}
diff --git a/tests/server/server-executeCommand-002.phpt b/tests/server/server-executeCommand-002.phpt
@@ -66,7 +66,7 @@ object(stdClass)#%d (%d) {
     }
   }
   ["cursor"]=>
-  object(stdClass)#16 (0) {
+  object(stdClass)#%d (%d) {
   }%A
 }
 Set profile level to 0 successfully: yes

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ static int phongo_execute_parse_options(mongoc_client_t* client, int server_id,`
`602`	`602`	`if (!process_read_concern(*driver_option, mongoc_opts TSRMLS_CC)) {`
`603`	`603`	`return false;`
`604`	`604`	`}`
`605`		`- } else if ((!strcasecmp(string_key, "readPreference")) && (type == PHONGO_COMMAND_READ)) {`
	`605`	`+ } else if ((!strcasecmp(string_key, "readPreference")) && (type == PHONGO_COMMAND_READ \|\| type == PHONGO_COMMAND_RAW)) {`
`606`	`606`	`if (!process_read_preference(*driver_option, mongoc_opts, zreadPreference, client, server_id TSRMLS_CC)) {`
`607`	`607`	`return false;`
`608`	`608`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ object(stdClass)#%d (%d) {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`["cursor"]=>`
`69`		`- object(stdClass)#16 (0) {`
	`69`	`+ object(stdClass)#%d (%d) {`
`70`	`70`	`}%A`
`71`	`71`	`}`
`72`	`72`	`Set profile level to 0 successfully: yes`