PHPC-158: Split queryFlags bitmask option into specific options

Author: bjori

php_phongo.c

@@ -999,13 +999,21 @@ bool phongo_query_init(php_phongo_query_t *query, zval *filter, zval *options TS
 	array_init(zquery);
 
 	if (options) {
-		/* TODO: Ensure batchSize, limit, and skip are 32-bit. Should we ensure
-		 * that queryFlags is a valid mongoc_query_flags_t combination? */
+		/* TODO: Ensure batchSize, limit, and skip are 32-bit  */
 		query->batch_size = php_array_fetchc_long(options, "batchSize");
-		query->flags = php_array_fetchc_long(options, "queryFlags");
 		query->limit = php_array_fetchc_long(options, "limit");
 		query->skip = php_array_fetchc_long(options, "skip");
 
+		query->flags = 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("tailable"))        ? MONGOC_QUERY_TAILABLE_CURSOR   : 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("slaveOk"))         ? MONGOC_QUERY_SLAVE_OK          : 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("oplogReplay"))     ? MONGOC_QUERY_OPLOG_REPLAY      : 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("noCursorTimeout")) ? MONGOC_QUERY_NO_CURSOR_TIMEOUT : 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("awaitData"))       ? MONGOC_QUERY_AWAIT_DATA        : 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("exhaust"))         ? MONGOC_QUERY_EXHAUST           : 0;
+		query->flags |= php_array_fetchl_bool(options, ZEND_STRS("partial"))         ? MONGOC_QUERY_PARTIAL           : 0;
+
+
 		if (php_array_existsc(options, "modifiers")) {
 			zval *modifiers = php_array_fetchc(options, "modifiers");
 

src/MongoDB/Query.c

@@ -176,15 +176,6 @@ PHP_MINIT_FUNCTION(Query)
 	memcpy(&php_phongo_handler_query, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_query.get_debug_info = php_phongo_query_get_debug_info;
 
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NONE"), MONGOC_QUERY_NONE TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_TAILABLE_CURSOR"), MONGOC_QUERY_TAILABLE_CURSOR TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_SLAVE_OK"), MONGOC_QUERY_SLAVE_OK TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_OPLOG_REPLAY"), MONGOC_QUERY_OPLOG_REPLAY TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_NO_CURSOR_TIMEOUT"), MONGOC_QUERY_NO_CURSOR_TIMEOUT TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_AWAIT_DATA"), MONGOC_QUERY_AWAIT_DATA TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_EXHAUST"), MONGOC_QUERY_EXHAUST TSRMLS_CC);
-	zend_declare_class_constant_long(php_phongo_query_ce, ZEND_STRL("FLAG_PARTIAL"), MONGOC_QUERY_PARTIAL TSRMLS_CC);
-
 	return SUCCESS;
 }
 /* }}} */