Merge remote-tracking branch 'remotes/origin/wl-10882-bulk-refactorings' into master-itch

Author: marinesovitch

mysqlx_collection.cc

@@ -298,17 +298,15 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_collection, getSchema)
 {
 	st_mysqlx_collection* object{nullptr};
 	XMYSQLND_SESSION session;
-	MYSQLND_CSTRING schema_name = {nullptr, 0};
 	zval* object_zv{nullptr};
 
 	DBG_ENTER("mysqlx_collection::getSchema");
 
 	if (FAILURE == util::zend::parse_method_parameters(
 				execute_data,
-				getThis(), "Os",
+				getThis(), "O",
 				&object_zv,
-				mysqlx_collection_class_entry,
-				&(schema_name.s), &(schema_name.l))) {
+				mysqlx_collection_class_entry)) {
 		DBG_VOID_RETURN;
 	}
 
@@ -323,8 +321,9 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_collection, getSchema)
 	}
 
 	if(session != nullptr) {
+		MYSQLND_STRING& schema_name{ object->collection->data->schema->data->schema_name };
 		XMYSQLND_SCHEMA * schema = session->m->create_schema_object(
-					session, schema_name);
+					session, mnd_str2c(schema_name));
 		if (schema) {
 			mysqlx_new_schema(return_value, schema);
 		} else {

mysqlx_table.cc

@@ -289,17 +289,15 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_table, getSchema)
 {
 	st_mysqlx_table* object{nullptr};
 	XMYSQLND_SESSION session;
-	MYSQLND_CSTRING schema_name{nullptr, 0};
 	zval* object_zv{nullptr};
 
 	DBG_ENTER("mysqlx_collection::getSchema");
 
 	if (FAILURE == util::zend::parse_method_parameters(
 				execute_data,
-				getThis(), "Os",
+				getThis(), "O",
 				&object_zv,
-				mysqlx_table_class_entry,
-				&(schema_name.s), &(schema_name.l))) {
+				mysqlx_table_class_entry)) {
 		DBG_VOID_RETURN;
 	}
 
@@ -314,8 +312,9 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_table, getSchema)
 	}
 
 	if(session != nullptr) {
+		MYSQLND_STRING& schema_name{ object->table->data->schema->data->schema_name };
 		XMYSQLND_SCHEMA * schema = session->m->create_schema_object(
-					session, schema_name);
+					session, mnd_str2c(schema_name));
 		if (schema) {
 			mysqlx_new_schema(return_value, schema);
 		} else {

tests/collection.phpt

@@ -17,7 +17,7 @@ mysqlx Collection
 	expect_eq($coll->count(), 16);
 
 	try {
-	        $schema = $coll->getSchema($db);
+		$schema = $coll->getSchema();
 		expect_eq($schema->getName(),$db);
 		expect_true($schema->existsInDatabase());
 		$coll2 = $schema->getCollection('test_collection');

tests/table.phpt

@@ -17,8 +17,8 @@ mysqlx Table
 	expect_eq($table->count(), 12);
 	expect_true($table->existsInDatabase());
 
-        try {
-	        $schema = $table->getSchema($db);
+	try {
+		$schema = $table->getSchema();
 		expect_eq($schema->getName(),$db);
 		expect_true($schema->existsInDatabase());
 		$table2 = $schema->getTable('test_table');